电站管理-施工验收审核状态细分

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

@@ -11,6 +11,12 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum PowerStationProcessStateEnum {
     进行中("进行中", "0", "progress"),
+    设计待审核("设计待审核", "5", "design"),
+    投融待审核("投融待审核", "6", "tourong"),
+    法务待审核("法务待审核", "7", "fawu"),
+    典设图纸待上传("典设图纸待上传", "8", "dst"),
+    施工图纸待上传("施工图纸待上传", "9", "sgt"),
+    图纸待审校("图纸待审校", "10", "tzdsj"),
     通过("通过", "1", "0"),
     不通过("不通过", "2", "1"),
     完成("完成", "3", "complete"),

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

@@ -24,6 +24,7 @@ public enum WorkOrderEnum {
     审核中("审核中", "审核中"),
 
     待审核("待审核", "待审核"),
+    经销商工程待审核("经销商工程待审核", "经销商工程待审核"),
     片区运营待审核("片区运营待审核", "area"),
     设计待审核("设计待审核", "design"),
     工程待审核("工程待审核", "engineering"),

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

@@ -20,7 +20,10 @@
         <if test="map.regionalCompaniesName!=null and map.regionalCompaniesName!=''">
             and hph.regional_companies_name like concat(concat('%',#{map.regionalCompaniesName}),'%')
         </if>
-        <if test="map.processStatus != null and map.processStatus != ''">
+        <if test="map.processStatus != null and map.processStatus == '进行中'">
+            and hps.process_status not in ('不通过','完成');
+        </if>
+        <if test="map.processStatus != null and map.processStatus != '进行中'">
             and hps.process_status = #{map.processStatus}
         </if>
         <if test="map.province != null and map.province != ''">

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

@@ -5,10 +5,12 @@
     <select id="surveyStatusTotal" resultType="map">
         SELECT
         IFNULL(SUM(CASE WHEN ps.process_status = '不通过' THEN 1 ELSE 0 END),0)AS '未通过',
-        IFNULL(SUM(CASE WHEN ps.process_status = '进行中' AND ps.business_status = '通过' AND next_node_name = '设计上传典型图库' THEN 1 ELSE 0 END),0)  AS '已完成(法务审核)',
+        IFNULL(SUM(CASE WHEN ps.process_status = '典设图纸待上传'  THEN 1 ELSE 0 END),0)  AS '已完成(法务审核)',
+        IFNULL(SUM(CASE WHEN ps.process_status = '投融待审核'  THEN 1 ELSE 0 END),0)  AS '投融待审核',
+        IFNULL(SUM(CASE WHEN ps.process_status = '法务待审核'  THEN 1 ELSE 0 END),0)  AS '法务待审核',
+        IFNULL(SUM(CASE WHEN ps.process_status = '设计待审核'  THEN 1 ELSE 0 END),0)  AS '设计待审核',
         IFNULL(SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END),0)    AS completeTotal,
-        ROUND(COALESCE(SUM( CASE WHEN  ps.process_status = '完成'   THEN ei.real_scale ELSE 0 END ), 0), 2)  AS completeTotalrl,
-        IFNULL(SUM(CASE WHEN ps.process_status = '进行中' AND (ps.business_status IS NULL OR ps.design_status IS NULL OR ps.technology_status IS NULL  or  ps.business_status = '' OR ps.design_status = '' OR ps.technology_status = '') THEN 1 ELSE 0 END),0)    AS '进行中(审核)'
+        ROUND(COALESCE(SUM( CASE WHEN  ps.process_status = '完成'   THEN ei.real_scale ELSE 0 END ), 0), 2)  AS completeTotalrl
         FROM hygf_power_station ps
         LEFT JOIN hygf_peasant_household ph ON ps.peasant_household_id = ph.sequence_nbr
         LEFT JOIN hygf_work_order_power_station wps ON wps.peasant_household_id = ph.sequence_nbr
@@ -149,9 +151,7 @@
         WHEN power_station_construction_status = '未通过' THEN '未通过'
         WHEN power_station_construction_status = '施工中' or  power_station_construction_status = '待施工' THEN '施工资料上传'
         WHEN power_station_construction_status = '待登记' THEN '完工登记'
-        WHEN power_station_construction_status = '待审核' and  work_order_power_station_node is null THEN '完工自审'
         WHEN power_station_construction_status = '已完工' THEN '已完成'
-        WHEN power_station_construction_status = '待审核' and  work_order_power_station_node in ('engineering','design','area')   THEN '审核中'
         ELSE power_station_construction_status END )
         AS statusText,
         ROUND(COALESCE(SUM(ei.real_scale), 0), 2) AS realScale        FROM
@@ -575,7 +575,7 @@
         IFNULL( sum( CASE WHEN lc.STATUS = '农户已签署' THEN 1 ELSE 0 END ), 0 ) nhyqs,
         IFNULL( sum( CASE WHEN lc.STATUS = '未签署' THEN 1 ELSE 0 END ), 0 ) wqs,
         IFNULL( SUM( CASE WHEN ps.process_status = '不通过' THEN 1 ELSE 0 END ), 0 ) AS kcwtg,
-        IFNULL( SUM( CASE WHEN ps.process_status = '进行中' THEN 1 ELSE 0 END ), 0 ) AS kcjxz,
+        IFNULL( SUM( CASE WHEN ps.process_status != '不通过' and ps.process_status != '完成' THEN 1 ELSE 0 END ), 0 ) AS kcjxz,
         IFNULL( SUM( CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END ), 0 ) AS kcywc,
         IFNULL( SUM( CASE WHEN ps.process_status = '完成' THEN ei.real_scale ELSE 0 END ), 0 ) AS kcywcrl
         FROM

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

@@ -116,10 +116,10 @@
             and newHcr.firstConstructionDate <= #{dto.endTime}
         </if>
         <if test=' dto.type!=null and dto.type == "1"'>
-            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 == "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/PowerStationServiceImpl.java

@@ -302,13 +302,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 		if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode) && Objects.isNull(powerStation.getSjCreateTime())){
 			powerStation.setSjCreateTime(new Date());
 		}
-		if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)
-				|| PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
-
-			powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
-			powerStation.setDrawingReview("");
-			this.updateSeve(nodeCode, powerStation.getPeasantHouseholdId(), kv);
-		} else {
 
 			if (VERIFY_RESULT_NO.equals(result)) {
 				powerStation.setProcessStatus(PowerStationProcessStateEnum.不通过.getName());
@@ -317,14 +310,23 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 			switch (nodeByCode) {
 				case 设计审核:
 					powerStation.setTechnologyStatus(resultObj.getName());
+					if (resultObj.getName().equals("通过")){
+						powerStation.setProcessStatus(PowerStationProcessStateEnum.投融待审核.getName());
+					}
 
 					break;
 				case 投融审核:
 					powerStation.setDesignStatus(resultObj.getName());
+					if (resultObj.getName().equals("通过")){
+						powerStation.setProcessStatus(PowerStationProcessStateEnum.法务待审核.getName());
+					}
+
 					break;
 				case 法务审核:
 					powerStation.setBusinessStatus(resultObj.getName());
-
+					if (resultObj.getName().equals("通过")){
+						powerStation.setProcessStatus(PowerStationProcessStateEnum.典设图纸待上传.getName());
+					}
 					if (VERIFY_RESULT_YES.equals(result)) {
 						LambdaUpdateWrapper<HouseholdContract> lambdaUw = new LambdaUpdateWrapper<>();
 						lambdaUw.eq(HouseholdContract::getPeasantHouseholdId, powerStation.getPeasantHouseholdId());
@@ -334,6 +336,16 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 					}
 
 					break;
+				case 设计上传图纸:
+					powerStation.setProcessStatus(PowerStationProcessStateEnum.施工图纸待上传.getName());
+					powerStation.setDrawingReview("");
+					this.updateSeve(nodeCode, powerStation.getPeasantHouseholdId(), kv);
+					break;
+				case 经销商上传图纸:
+					powerStation.setProcessStatus(PowerStationProcessStateEnum.图纸待审校.getName());
+					powerStation.setDrawingReview("");
+					this.updateSeve(nodeCode, powerStation.getPeasantHouseholdId(), kv);
+					break;
 				case 文件审核:
 					if (VERIFY_RESULT_YES.equals(result)) {
 						flag = false;
@@ -345,7 +357,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 				default:
 					break;
 			}
-		}
+
 		meg = "任务明细：" + nodeByCode + (VERIFY_RESULT_YES.equals(result) ? "通过" : "不通过");
 		// 2. 更新流程状态
 		String code = null;

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

@@ -104,9 +104,9 @@ public class StatisticsHomepageServiceImpl {
 
 
 
-        List<String> surveKeys = new ArrayList<>(Arrays.asList("未通过","未勘察","已完成(法务审核)","进行中(审核)"));
+        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("待登记","审核中","已完成","未通过","整改待审核" ,"待整改"));
@@ -210,18 +210,12 @@ public class StatisticsHomepageServiceImpl {
                         Map<String, Object> map = iterator.next();
                         workNum += (long) map.get("total");
                         stationRealScale += (double) map.get("realScale");
-                        if ("审核中".equals(map.get("statusText"))) {
-                            total += (long) map.get("total");
-                            realScale += (double) map.get("realScale");
-                            iterator.remove();
-                        }
                         if ("施工资料上传".equals(map.get("statusText"))) {
                             sgtotal += (long) map.get("total");
                             sgrealScale += (double) map.get("realScale");
                             iterator.remove();
                         }
                     }
-                    maps.add(MapBuilder.<String, Object>create().put("statusText","审核中").put("total",total).put("realScale",new BigDecimal(realScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
                     maps.add(MapBuilder.<String, Object>create().put("statusText","施工资料上传").put("total",sgtotal).put("realScale",new BigDecimal(sgrealScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
                     differenceValue(maps,workOrder);
                     resultMap.put("workOrder",maps);

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

@@ -433,7 +433,7 @@ public class SurveyInformationServiceImpl
 			powerStation.setOwnersName(peasantHousehold.getOwnersName());
 			powerStation.setProjectAddress(peasantHousehold.getProjectAddressName());
 			powerStation.setPeasantHouseholdId(String.valueOf(peasantHousehold.getSequenceNbr()));
-			powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
+			powerStation.setProcessStatus(PowerStationProcessStateEnum.设计待审核.getName());
 			powerStation.setServiceAgent(peasantHousehold.getDeveloperName());
 			// 获取流程信息
 			powerStation.setTaskId(basicGridAcceptance.getNextTaskId());

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

@@ -1135,7 +1135,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		}
 
 		// 修改电站状态
-		workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待审核.getCode());
+		workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.经销商工程待审核.getCode());
 		workOrderPowerStationMapper.updateById(workOrderPowerStation);
 		// 修改派工单状态PowerStationEngineeringInfo
 		LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
@@ -1311,7 +1311,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 				workOrderPowerStation.setPowerStationAreaStatus(approvalStatus.equals("0")?"通过":"驳回");
 				constructionRecords.setOperationContent("施工验收-片区运营审核-" +workOrderPowerStation.getPowerStationAreaStatus());
 				workOrderPowerStation.setWorkOrderPowerStationNode(WorkOrderEnum.工程待审核.getCode());
-				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待审核.getName());
+				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.工程待审核.getName());
 				taskKey = BusinessWorkflowKey.片区运营审核.getCode();
 				break;
 			case "design":
@@ -1325,7 +1325,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			default:
 				workOrderPowerStation.setPowerStationEngineeringStatus(approvalStatus.equals("0")?"通过":"驳回");
 				constructionRecords.setOperationContent("施工验收-工程审核-" + workOrderPowerStation.getPowerStationEngineeringStatus());
-				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待审核.getName());
+				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.设计待审核.getName());
 				workOrderPowerStation.setWorkOrderPowerStationNode(WorkOrderEnum.设计待审核.getCode());
 				taskKey = BusinessWorkflowKey.工程审核.getCode();
 				break;
@@ -1392,6 +1392,9 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			d.add(WorkOrderEnum.待施工.getCode());
 			d.add(WorkOrderEnum.待登记.getCode());
 			d.add(WorkOrderEnum.待审核.getCode());
+			d.add(WorkOrderEnum.片区运营待审核.getCode());
+			d.add(WorkOrderEnum.工程待审核.getCode());
+			d.add(WorkOrderEnum.设计待审核.getCode());
 			d.add(WorkOrderEnum.未通过.getCode());
 			qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d);
 			List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu1);