状态细分bug修复

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

@@ -89,8 +89,8 @@
 
     <select id="desionTotal" resultType="map">
         SELECT
-        SUM( CASE WHEN next_node_name = '经销商设计人员上传设计图' and process_status = '进行中'THEN 1 ELSE 0 END ) AS '典设图已上传',
-        SUM( CASE WHEN next_node_name = '设计图纸审核' and process_status = '进行中'THEN 1 ELSE 0 END ) AS '施工图已上传'
+        SUM( CASE WHEN next_node_name = '经销商设计人员上传设计图' and process_status = '施工图纸待上传'THEN 1 ELSE 0 END ) AS '典设图已上传',
+        SUM( CASE WHEN next_node_name = '设计图纸审核' and process_status = '图纸待审校'THEN 1 ELSE 0 END ) AS '施工图已上传'
         FROM
         `hygf_power_station`
         LEFT JOIN

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

@@ -119,7 +119,7 @@
             and  hygf_work_order_power_station.power_station_construction_status in ('待登记','未通过','已完工','经销商工程待审核')
         </if>
         <if test=' dto.type !=null and dto.type == "2"'>
-          and  hygf_work_order_power_station.power_station_construction_status IN ( '未通过', '已完工', '片区运营待审核','设计待审核','工程待审核', '待整改', '整改中','整改待审核' )
+          and  hygf_work_order_power_station.power_station_construction_status IN ( '未通过', '已完工','经销商工程待审核', '待整改', '整改中','整改待审核' )
         </if>
         <if test=' dto.type !=null and dto.type == "3" and dto.workOrderPowerStationNodes  !=null'>
                 and ( hygf_work_order_power_station.work_order_power_station_node  is not null

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

@@ -1210,7 +1210,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 
         if (constructionRecords.getOperationResults().equals("通过")) {
             // 修改电站状态
-            workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待审核.getName());
+            workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.片区运营待审核.getName());
             workOrderPowerStation.setWorkOrderPowerStationNode(WorkOrderEnum.片区运营待审核.getCode());
 			workOrderPowerStation.setPowerStationAreaStatus(null);
 			workOrderPowerStation.setPowerStationDesignStatus(null);