Просмотр исходного кода

修改bug:
bug1168,私有应收 批量修改功能中导入修改本来就是不选择车辆直接导入,但是不点选车辆又点不了批量修改功能,可以把批量修改做成两个选的功能,一个选中修改一个导入修改

jiakai 1 месяц назад
Родитель
Сommit
0f42aed792

+ 1 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/importbatchmodify/InsPlyIncomeBatch.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.finance.vo.importbatchmodify;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.jzg.commons.entity.finance.po.InsPlyIncome;
 import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 7 - 6
commons/src/main/java/com/jzg/commons/entity/finance/vo/importbatchmodify/InsPlyIncomeExportVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 @Data
 @Schema(description = "财务应收表")
@@ -32,26 +33,26 @@ public class InsPlyIncomeExportVo implements Serializable {
 
     @Schema(description = "交强手续费比例")
     @ExcelProperty(value ="交强手续费比例", index = 4)
-    private String jqSuperviseCostsProportion;
+    private BigDecimal jqSuperviseCostsProportion;
 
     @Schema(description = "交强跟单费比例")
     @ExcelProperty(value = "交强跟单费比例", index = 5)
-    private String jqOtherCostsProportion;
+    private BigDecimal jqOtherCostsProportion;
 
     @Schema(description = "商业手续费比例")
     @ExcelProperty(value = "商业手续费比例", index = 6)
-    private String sySuperviseCostsProportion;
+    private BigDecimal sySuperviseCostsProportion;
 
     @Schema(description = "商业跟单费比例")
     @ExcelProperty(value = "商业跟单费比例", index = 7)
-    private String syOtherCostsProportion;
+    private BigDecimal syOtherCostsProportion;
 
     @Schema(description = "驾意手续费比例")
     @ExcelProperty(value = "驾意手续费比例", index = 8)
-    private String jySuperviseCostsProportion;
+    private BigDecimal jySuperviseCostsProportion;
 
     @Schema(description = "驾意跟单费比例")
     @ExcelProperty(value = "驾意跟单费比例", index = 9)
-    private String jyOtherCostsProportion;
+    private BigDecimal jyOtherCostsProportion;
 
 }

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

@@ -2283,15 +2283,15 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         InsPlyIncomeExportVo vo = new InsPlyIncomeExportVo();
         // 这里是参考样例,方便业务进行修改
         vo.setLicenseNo("样例:晋AK68H2");
-        vo.setJqPolicyNo("jq_2026年8月26日10:00:48");
-        vo.setSyPolicyNo("sy_2026年8月26日10:00:56");
-        vo.setJyPolicyNo("jy_2026年8月26日10:01:04");
-        vo.setJqSuperviseCostsProportion("10");
-        vo.setJqOtherCostsProportion("15");
-        vo.setSySuperviseCostsProportion("12");
-        vo.setSyOtherCostsProportion("11");
-        vo.setJySuperviseCostsProportion("13");
-        vo.setJyOtherCostsProportion("17");
+        vo.setJqPolicyNo("TEST-JQ-202608270001");
+        vo.setSyPolicyNo("TEST-SY-202608270001");
+        vo.setJyPolicyNo("TEST-JY-202608270001");
+        vo.setJqSuperviseCostsProportion(BigDecimalUtil.valueOf("10"));
+        vo.setJqOtherCostsProportion(BigDecimalUtil.valueOf("15"));
+        vo.setSySuperviseCostsProportion(BigDecimalUtil.valueOf("12"));
+        vo.setSyOtherCostsProportion(BigDecimalUtil.valueOf("11"));
+        vo.setJySuperviseCostsProportion(BigDecimalUtil.valueOf("13"));
+        vo.setJyOtherCostsProportion(BigDecimalUtil.valueOf("17"));
         exportVos.add(vo);
         // 调用动态导出
         return exportBaseService.upLoadFile(
@@ -2364,15 +2364,15 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
      */
     private HttpResult<String> validateBatch(List<InsPlyIncomeBatch> datas) {
         log.info("导入批量修改。 datas.size=[{}]", JSONUtil.toJsonStr(datas));
-        StringJoiner joiner = new StringJoiner(",","校验未通过: ","");
+        StringJoiner errorMsg = new StringJoiner(",","","");
         for (InsPlyIncomeBatch data : datas) {
             if(StrUtil.isEmpty(data.getOrderNo())){
-                joiner.add(String.format("车牌号为[%s]的记录根据保单号没有找到订单信息", data.getLicenseNo()));
+                errorMsg.add(String.format("车牌号为[%s]的记录根据保单号没有找到订单信息", data.getLicenseNo()));
                 continue;
             }
             InsPlyIncome insPlyIncome = data.getInsPlyIncome();
             if(insPlyIncome == null){
-                joiner.add(String.format("车牌号为[%s]的记录根据订单号[%s]没有找到应收记录", data.getLicenseNo(), data.getOrderNo()));
+                errorMsg.add(String.format("车牌号为[%s]的记录根据订单号[%s]没有找到应收记录", data.getLicenseNo(), data.getOrderNo()));
                 continue;
             }
         }
@@ -2383,12 +2383,12 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         }).toList();
         String s = this.validatePolicy(exts, "20");
         if(StrUtil.isNotEmpty(s)){
-            joiner.add(s);
+            errorMsg.add(s);
         }
-        if(StrUtil.isNotEmpty(joiner.toString())){
-            return HttpResult.ok();
+        if(StrUtil.isNotEmpty(errorMsg.toString())){
+            return HttpResult.error(errorMsg.toString());
         }
-        return HttpResult.error(joiner.toString());
+        return HttpResult.ok();
     }
 
     /**