状态细分bug修复

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/WorkOrderEnum.java

@@ -52,9 +52,9 @@ public enum WorkOrderEnum {
      */
     private String code;
 
-    public static ContractStatusEnum getNodeByCode(String code) {
-        ContractStatusEnum dealerReviewEnum = null;
-        for(ContractStatusEnum type: ContractStatusEnum.values()) {
+    public static WorkOrderEnum getNodeByCode(String code) {
+        WorkOrderEnum dealerReviewEnum = null;
+        for(WorkOrderEnum type: WorkOrderEnum.values()) {
             if (type.getCode().equals(code)) {
                 dealerReviewEnum = type;
                 break;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml

@@ -394,7 +394,7 @@
         SUM(CASE WHEN ph.construction_state = '待勘察' THEN 1 ELSE 0 END) AS wkc,
         SUM(CASE WHEN ps.process_status = '不通过' THEN 1 ELSE 0 END) AS kcwtg,
         '' AS kcwtgrl,
-        SUM(CASE WHEN ps.process_status = '进行中' THEN 1 ELSE 0 END) AS kcjxz,
+        SUM(CASE WHEN ps.process_status != '不通过' and ps.process_status != '完成'  THEN 1 ELSE 0 END) AS kcjxz,
         '' AS kcjxzrl,
         SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END) AS kcywc,
         ROUND(COALESCE(SUM(CASE WHEN ps.process_status = '完成' THEN ei.real_scale ELSE 0 END)/1000, 0), 2)  AS kcywcrl,

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/StatisticsHomepageServiceImpl.java

@@ -106,7 +106,7 @@ public class StatisticsHomepageServiceImpl {
 
         List<String> surveKeys = new ArrayList<>(Arrays.asList("未通过","未勘察","已完成(法务审核)","设计待审核","投融待审核","法务待审核"));
         List<String> contractKeys = new ArrayList<>(Arrays.asList("双方已签署","农户已签署","未签署","已作废"));
-        List<String> workOrder = new ArrayList<>(Arrays.asList("未通过","施工资料上传","完工登记","片区运营待审核","工程待审核","设计待审核","已完成","整改待审核" ,"待整改"));
+        List<String> workOrder = new ArrayList<>(Arrays.asList("未通过","施工资料上传","完工登记","经销商工程待审核","片区运营待审核","工程待审核","设计待审核","已完成","整改待审核" ,"待整改"));
         List<String> preparationMoneyKeys = new ArrayList<>(Arrays.asList("待发货","已收货","已发货"));
         List<String> desionKeys = new ArrayList<>(Arrays.asList("施工图已上传","典设图已上传"));
         List<String> gridKeys = new ArrayList<>(Arrays.asList("待登记","审核中","已完成","未通过","整改待审核" ,"待整改"));

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -1487,7 +1487,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		qu.eq(WorkOrderPowerStation::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
 
 		if (hygfRectificationOrder.getAuditResult().equals("通过")){
-			qu.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待审核.getCode());
+			qu.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.getNodeByCode(hygfRectificationOrder.getRectificationSource()).getName());
 			hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.已完成.getCode());
 		}else {
 			qu.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待整改.getCode());