Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622'

commons/src/main/java/com/jzg/commons/entity/dto/SysUserAccountPageParam.java

@@ -14,9 +14,12 @@ import java.time.LocalDate;
 @Data
 public class SysUserAccountPageParam extends PageRequest {
 
-    @Schema(description = "业务员")
+    @Schema(description = "业务员手机号")
     private String salesman;
 
+    @Schema(description = "业务员姓名")
+    private String salesmanName;
+
     @Schema(description = "业务员类型1.前线人员 2:后线人员 3:合伙人 4:工作室管理员 5:团队 6:个代 7：电销 8 渠道")
     private String attrType;
 

commons/src/main/java/com/jzg/commons/entity/finance/vo/InsPlyIncomeModify.java

@@ -0,0 +1,30 @@
+package com.jzg.commons.entity.finance.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+@Data
+public class InsPlyIncomeModify implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 3370738510742999157L;
+
+    @Schema(description = "序号")
+    private String incomeId;
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "交强保单号")
+    private String jqPolicyNo;
+
+    @Schema(description = "商业保单号")
+    private String syPolicyNo;
+
+    @Schema(description = "驾意保单号")
+    private String jyPolicyNo;
+
+    @Schema(description = "修改用户")
+    private String updateBy;
+}

commons/src/main/java/com/jzg/commons/entity/finance/vo/importbatchmodify/InsPlyIncomeExportVo.java

@@ -32,27 +32,27 @@ public class InsPlyIncomeExportVo implements Serializable {
     private String jyPolicyNo;
 
     @Schema(description = "交强手续费比例")
-    @ExcelProperty(value ="交强手续费比例", index = 4)
+    @ExcelProperty(value ="交强手续费比例,单位:百分比(%)", index = 4)
     private BigDecimal jqSuperviseCostsProportion;
 
     @Schema(description = "交强跟单费比例")
-    @ExcelProperty(value = "交强跟单费比例", index = 5)
+    @ExcelProperty(value = "交强跟单费比例,单位:百分比(%)", index = 5)
     private BigDecimal jqOtherCostsProportion;
 
     @Schema(description = "商业手续费比例")
-    @ExcelProperty(value = "商业手续费比例", index = 6)
+    @ExcelProperty(value = "商业手续费比例,单位:百分比(%)", index = 6)
     private BigDecimal sySuperviseCostsProportion;
 
     @Schema(description = "商业跟单费比例")
-    @ExcelProperty(value = "商业跟单费比例", index = 7)
+    @ExcelProperty(value = "商业跟单费比例,单位:百分比(%)", index = 7)
     private BigDecimal syOtherCostsProportion;
 
     @Schema(description = "驾意手续费比例")
-    @ExcelProperty(value = "驾意手续费比例", index = 8)
+    @ExcelProperty(value = "驾意手续费比例,单位:百分比(%)", index = 8)
     private BigDecimal jySuperviseCostsProportion;
 
     @Schema(description = "驾意跟单费比例")
-    @ExcelProperty(value = "驾意跟单费比例", index = 9)
+    @ExcelProperty(value = "驾意跟单费比例,单位:百分比(%)", index = 9)
     private BigDecimal jyOtherCostsProportion;
 
 }

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4Platform.java

@@ -37,15 +37,15 @@ public class ExcelContent4Platform implements InsuranceData {
     private String jyPolicyNo;
 
     @Schema(description = "交强险入口比例")
-    @ExcelProperty(value = "交强险入口比例", index = 4)
+    @ExcelProperty(value = "交强险入口比例,单位:百分比(%)", index = 4)
     private String jqInletRatio;
 
     @Schema(description = "商业险入口比例")
-    @ExcelProperty(value = "商业险入口比例", index = 5)
+    @ExcelProperty(value = "商业险入口比例,单位:百分比(%)", index = 5)
     private String syInletRatio;
 
     @Schema(description = "非车险入口比例")
-    @ExcelProperty(value = "非车险入口比例", index = 6)
+    @ExcelProperty(value = "非车险入口比例,单位:百分比(%)", index = 6)
     private String jyInletRatio;
 
 }

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4PrivateFollow.java

@@ -39,15 +39,15 @@ public class ExcelContent4PrivateFollow implements Serializable {
     private String jyPolicyNo;
 
     @Schema(description = "交强险跟单费比例")
-    @ExcelProperty(value = "交强险跟单费比例", index = 4)
+    @ExcelProperty(value = "交强险跟单费比例,单位:百分比(%)", index = 4)
     private String jqOtherCostsProportion;
 
     @Schema(description = "商业险跟单费比例")
-    @ExcelProperty(value = "商业险跟单费比例", index = 5)
+    @ExcelProperty(value = "商业险跟单费比例,单位:百分比(%)", index = 5)
     private String syOtherCostsProportion;
 
     @Schema(description = "非车险跟单费比例")
-    @ExcelProperty(value = "非车险跟单费比例", index = 6)
+    @ExcelProperty(value = "非车险跟单费比例,单位:百分比(%)", index = 6)
     private String jyOtherCostsProportion;
 
 }

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4PrivateSuperviseCar.java

@@ -34,12 +34,12 @@ public class ExcelContent4PrivateSuperviseCar implements InsuranceData {
     private String syPolicyNo;
 
     @Schema(description = "交强险手续费比例")
-    @ExcelProperty(value = "交强险手续费比例", index = 3)
+    @ExcelProperty(value = "交强险手续费比例,单位:百分比(%)", index = 3)
     private String jqSuperviseCostsProportion;
 
 
     @Schema(description = "商业险手续费比例")
-    @ExcelProperty(value = "商业险手续费比例", index = 4)
+    @ExcelProperty(value = "商业险手续费比例,单位:百分比(%)", index = 4)
     private String sySuperviseCostsProportion;
 
 

commons/src/main/java/com/jzg/commons/entity/finance/vo/importimcome/ExcelContent4PrivateSuperviseNoCar.java

@@ -31,7 +31,7 @@ public class ExcelContent4PrivateSuperviseNoCar implements InsuranceData {
 
 
     @Schema(description = "非车险手续费比例")
-    @ExcelProperty(value = "非车险手续费比例", index = 2)
+    @ExcelProperty(value = "非车险手续费比例,单位:百分比(%)", index = 2)
     private String jySuperviseCostsProportion;
 
 }

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersPolicy.java

@@ -5,10 +5,14 @@ import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serial;
+
 @Data
 @Schema(description = "保险订单保单信息")
 public class InsOrdersPolicy extends BaseModel {
 
+    @Serial
+    private static final long serialVersionUID = 6443063736847279808L;
     @TableId
     @Schema(description = "订单号")
     private String orderNo;

commons/src/main/java/com/jzg/commons/entity/vo/SysUserJzgInfoBankCardVo.java

@@ -20,6 +20,9 @@ public class SysUserJzgInfoBankCardVo extends PageRequest {
     @Schema(description = "业务员")
     private String salesman;
 
+    @Schema(description = "业务员姓名")
+    private String salesmanName;
+
     @Schema(description = "业务员id")
     private String userJzgInfoId;
 
@@ -68,4 +71,6 @@ public class SysUserJzgInfoBankCardVo extends PageRequest {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "管理人")
+    private String managerName;
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -1566,8 +1566,24 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Override
     public String exportDynamicFields(InsOrdersParamVO insOrdersParam) {
         log.info("导出订单列表。支持动态选择要导出的字段：导出车险订单=[{}]", JSONUtil.toJsonStr(insOrdersParam));
-        insOrdersParam.setSystemCode(baseController.getSystemCode());
-        List<OrderListVo> orderListVos = insOrdersMapper.queryOrderListAll(insOrdersParam);
+        // 分页无限大
+        insOrdersParam.getPage().setPages(1);
+        insOrdersParam.getPage().setSize(Integer.MAX_VALUE);
+        insOrdersParam.setPages(1);
+        insOrdersParam.setSize(Integer.MAX_VALUE);
+
+        String systemCode = "";
+        //如果是APP登录的话 则传递SystemCode的头部字段
+        if (baseController.getUserSystemCode().equals("APP")) {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            systemCode = request.getHeader("system_code");
+        } else {
+            systemCode = baseController.getUserSystemCode();
+        }
+        insOrdersParam.setSystemCode(systemCode);
+        Page<OrderListVo> orderListVoPage = queryMainOrderList(insOrdersParam);
+        List<OrderListVo> orderListVos = orderListVoPage.getRecords();
+
         log.info("导出订单列表，导出[{}]条记录", CollUtil.size(orderListVos));
         // 动态设置要导出的字段
         String exportDynamicFields = insOrdersParam.getExportDynamicFields();

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -195,6 +195,15 @@ public class ReceivableController {
         return receivableService.queryIncomeDatas(incomeDataVO);
     }
 
+    @PostMapping("updateInsPlyIncome")
+    @Operation(summary = "应收记录的修改")
+    public HttpResult<String> updateInsPlyIncome(InsPlyIncomeModify modifyParam){
+        String userName = baseController.getUserName();
+        log.info("应收记录的修改.useName=[{}],modifyParam=[{}]", userName, modifyParam);
+        modifyParam.setUpdateBy(userName);
+        return receivableService.updateInsPlyIncome(modifyParam);
+    }
+
     @PostMapping("getOtherReceivableList")
     @Operation(summary = "获取私有协议跟单费列表")
     public HttpResult<InsPlyIncomeVO> getOtherReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){

tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -534,4 +534,12 @@ public interface ReceivableService extends IService<InsPlyIncome> {
     void setDisableFlagForOtherReceivable(List<InsPlyIncome> records, String systemCode);
 
 
+    /**
+     * 应收记录的修改
+     *
+     * @param modifyParam 修改参数
+     * @author lipf
+     * @date 2026/8/28 9:34
+     */
+    HttpResult<String> updateInsPlyIncome(InsPlyIncomeModify modifyParam);
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -6973,5 +6973,41 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         }
         return result;
     }
+
+    /**
+     * 应收记录的修改
+     *
+     * @param modifyParam 修改参数
+     * @author lipf
+     * @date 2026/8/28 9:34
+     */
+    @Override
+    public HttpResult<String> updateInsPlyIncome(InsPlyIncomeModify modifyParam) {
+        String systemCode = baseController.getSystemCode();
+        if(StrUtil.isEmpty(modifyParam.getIncomeId())){
+            return HttpResult.error("应收订单序号为空");
+        }
+        InsPlyIncome insPlyIncome = baseMapper.selectById(modifyParam.getIncomeId());
+        if(insPlyIncome == null){
+            log.info("要修改的应收订单不存在。 incomeId=[{}]",modifyParam.getIncomeId());
+            return HttpResult.error("要修改的应收数据不存在");
+        }
+        InsOrdersPolicy insOrdersPolicy = insOrdersPolicyMapper.selectById(insPlyIncome.getOrderNo());
+        if(insOrdersPolicy == null){
+            String msg = String.format("编号为[%s]的订单不存在。数据异常", modifyParam.getIncomeId());
+            log.info(msg);
+            return HttpResult.error(msg);
+        }
+        InsOrdersPolicy policy = new InsOrdersPolicy();
+        policy.setOrderNo(insOrdersPolicy.getOrderNo());
+        policy.setJqPolicyNo(modifyParam.getJqPolicyNo());
+        policy.setSyPolicyNo(modifyParam.getSyPolicyNo());
+        policy.setJyPolicyNo(modifyParam.getJyPolicyNo());
+        policy.setUpdateBy(modifyParam.getUpdateBy());
+        policy.setUpdateTime(LocalDateTime.now());
+        insOrdersPolicyMapper.updateById(policy);
+        log.info("保险单号修改成功");
+        return null;
+    }
 }
 

tenant/organization/src/main/resources/mapper/SysUserAccountMapper.xml

@@ -65,6 +65,9 @@
             <if test="param.salesman != null and param.salesman != ''">
                 and (su.username = #{param.salesman} or su.mobile = #{param.salesman})
             </if>
+            <if test="param.salesmanName != null and param.salesmanName != null">
+                and suji.name = #{param.salesmanName}
+            </if>
             <if test="param.attrType != null ">
                 and suji.type_attr = #{param.attrType}
             </if>