修改修改单位带来的一系列问题以及添加企业营收

zksy-admin/src/main/java/com/zksy/web/controller/basicData/CrmOverviewDataController.java

@@ -222,8 +222,31 @@ public class CrmOverviewDataController {
             case "dx9":
                 processElectricityBill(vos, q,CrmQuarterlyElectricityBill::getFourthQuarterConsumption, CheckResultVo::setDx9,LocalDate.now().getYear()-1);
                 break;
+            case "dy1":
+                processDy(vos, q,CrmServiceEnterpriseRevenue::getQ1Revenue, CheckResultVo::setDy1,LocalDate.now().getYear());
+                break;
+            case "dy2":
+                processDy(vos, q,CrmServiceEnterpriseRevenue::getQ2Revenue, CheckResultVo::setDy2,LocalDate.now().getYear());
+                break;
+            case "dy3":
+                processDy(vos, q,CrmServiceEnterpriseRevenue::getQ3Revenue, CheckResultVo::setDy3,LocalDate.now().getYear());
+                break;
+            case "dy4":
+                processDy(vos, q,CrmServiceEnterpriseRevenue::getQ4Revenue, CheckResultVo::setDy4,LocalDate.now().getYear());
+                break;
+            case "dy6":
+                processDy(vos, q,CrmServiceEnterpriseRevenue::getQ1Revenue, CheckResultVo::setDy6,LocalDate.now().getYear()-1);
+                break;
+            case "dy7":
+                processDy(vos, q,CrmServiceEnterpriseRevenue::getQ2Revenue, CheckResultVo::setDy7,LocalDate.now().getYear()-1);
+                break;
+            case "dy8":
+                processDy(vos, q,CrmServiceEnterpriseRevenue::getQ3Revenue, CheckResultVo::setDy8,LocalDate.now().getYear()-1);
+                break;
+            case "dy9":
+                processDy(vos, q,CrmServiceEnterpriseRevenue::getQ4Revenue, CheckResultVo::setDy9,LocalDate.now().getYear()-1);
+                break;
             default:
-                // 处理默认情况
                 break;
         }
     }
@@ -390,7 +413,7 @@ public class CrmOverviewDataController {
         vos.forEach(w1 -> Optional.ofNullable(map.get(w1.getUniCode()))
                 .map(String::trim)
                 .filter(q->!q.isEmpty())
-                .map(Long::parseLong)
+                .map(Double::valueOf)
                 .ifPresent(w1::setDr1));
     }
 
@@ -482,6 +505,27 @@ public class CrmOverviewDataController {
         });
     }
 
+    private void processDy(
+            List<CheckResultVo> vos,
+            String q,
+            Function<CrmServiceEnterpriseRevenue, String> function,
+            BiConsumer<CheckResultVo, String> consumer,
+            Integer year
+    ) {
+        CrmServiceEnterpriseRevenueMapper o = (CrmServiceEnterpriseRevenueMapper) strMapperMap.contianer.get(q);
+        LambdaQueryWrapper<CrmServiceEnterpriseRevenue> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CrmServiceEnterpriseRevenue::getRevenueYear, year.toString());
+        List<CrmServiceEnterpriseRevenue> value = o.selectList(wrapper);
+        Map<String, CrmServiceEnterpriseRevenue> map = value.stream()
+                .collect(Collectors.toMap(CrmServiceEnterpriseRevenue::getUnifiedSocialCreditCode, v -> v));
+        vos.forEach(w1 -> {
+            CrmServiceEnterpriseRevenue v = map.get(w1.getUniCode());
+            if (v != null) {
+                consumer.accept(w1, function.apply(v));
+            }
+        });
+    }
+
 
     private <T extends BaseMapper<R>, R> void processCommon(Object mapper, List<CheckResultVo> vos, Class<T> mapperClass,
                                                                Function<R, String> keyExtractor,

zksy-system/src/main/java/com/zksy/system/basicData/domain/CrmAccumulationFundSummary.java

@@ -52,11 +52,11 @@ private static final long serialVersionUID=1L;
                 @ExcelExport(value = "年度平均每月缴存人数")
     private Long avgMonthlyContributors;
 
-@ApiModelProperty(value = "年缴存总和（元）")
-    /** 年缴存总和（元） */
-                @ExcelImport(value = "年缴存总和（元）")
-                @ExcelExport(value = "年缴存总和（元）")
-    private Long totalContributions;
+@ApiModelProperty(value = "年缴存总和（万元）")
+    /** 年缴存总和（万元） */
+                @ExcelImport(value = "年缴存总和（万元）")
+                @ExcelExport(value = "年缴存总和（万元）")
+    private Double totalContributions;
 
 @ApiModelProperty(value = "最近缴存日期")
     /** 最近缴存日期 */

zksy-system/src/main/java/com/zksy/system/basicData/domain/vo/CheckResultVo.java

@@ -41,7 +41,7 @@ public class CheckResultVo {
     private String dp;
     private String dq;
     private long dr;
-    private long dr1;
+    private double dr1;
     private String ds = "无";
     private String dt = "无";
     private long du;
@@ -62,4 +62,12 @@ public class CheckResultVo {
     private String dx7;
     private String dx8;
     private String dx9;
+    private String dy1;
+    private String dy2;
+    private String dy3;
+    private String dy4;
+    private String dy6;
+    private String dy7;
+    private String dy8;
+    private String dy9;
 }

zksy-system/src/main/java/com/zksy/system/config/StrMapperMap.java

@@ -73,6 +73,14 @@ public class StrMapperMap {
         map.put("dx7",crmQuarterlyElectricityBillMapper);
         map.put("dx8",crmQuarterlyElectricityBillMapper);
         map.put("dx9",crmQuarterlyElectricityBillMapper);
+        map.put("dy1",crmServiceEnterpriseRevenueMapper);
+        map.put("dy2",crmServiceEnterpriseRevenueMapper);
+        map.put("dy3",crmServiceEnterpriseRevenueMapper);
+        map.put("dy4",crmServiceEnterpriseRevenueMapper);
+        map.put("dy6",crmServiceEnterpriseRevenueMapper);
+        map.put("dy7",crmServiceEnterpriseRevenueMapper);
+        map.put("dy8",crmServiceEnterpriseRevenueMapper);
+        map.put("dy9",crmServiceEnterpriseRevenueMapper);
         return map;
     }
     @Autowired
@@ -121,4 +129,6 @@ public class StrMapperMap {
     private CrmQuarterlyWaterUsageMapper crmQuarterlyWaterUsageMapper;
     @Autowired
     private CrmQuarterlyElectricityBillMapper crmQuarterlyElectricityBillMapper;
+    @Autowired
+    private CrmServiceEnterpriseRevenueMapper crmServiceEnterpriseRevenueMapper;
 }