修复电站统计bug

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TestController.java

@@ -78,7 +78,6 @@ public class TestController extends BaseController {
 		executorService.submit(this::dealSgTime);
 		executorService.submit(this::dealBwTime);
 		executorService.submit(this::dealYsTime);
-
 		// 关闭线程池
 		executorService.shutdown();
 		return CommonResponseNewUtil.success();

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

@@ -187,11 +187,19 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
 
         update.eq(BaseEntity::getSequenceNbr,basicGridRecord.getSequenceNbr());
         this.update(null,update);
-
+        Date date = new Date();
         ConstructionAcceptanceRecords da = new ConstructionAcceptanceRecords(model.get("realName").toString(), "提交验收审核",
-                new Date(), "", basicGridRecord.getSequenceNbr(), basicGridRecord.getWorkOrderPowerStationId(),
+                date , "", basicGridRecord.getSequenceNbr(), basicGridRecord.getWorkOrderPowerStationId(),
                 basicGridRecord.getPeasantHouseholdId(), "");
         acceptanceRecordsService.save(da);
+        AcceptanceCheck acceptanceCheck = this.getById(basicGridRecord.getSequenceNbr());
+        //添加验收时间
+        if(Objects.nonNull(acceptanceCheck) && Objects.isNull(acceptanceCheck.getYsCreateTime())){
+            LambdaUpdateWrapper<AcceptanceCheck> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.set(AcceptanceCheck::getYsCreateTime,date);
+            wrapper.eq(BaseEntity::getSequenceNbr,basicGridRecord.getSequenceNbr());
+            this.update(null,wrapper);
+        }
         return basicGridRecord;
     }
 

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

@@ -268,13 +268,22 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 
 		update.eq(BaseEntity::getSequenceNbr, basicGridRecord.getSequenceNbr());
 		basicGridRecordService.update(null, update);
-
-		ConstructionGirdRecords da = new ConstructionGirdRecords(realName, "提交并网资料", new Date(), "",
+		Date date = new Date();
+		ConstructionGirdRecords da = new ConstructionGirdRecords(realName, "提交并网资料", date, "",
 				basicGridRecord.getSequenceNbr(), basicGridRecord.getWorkOrderPowerStationId(),
 				basicGridRecord.getPeasantHouseholdId(), "");
 		constructionGirdRecords.save(da);
 
-        return grid;
+		//更新并网创建时间
+		BasicGridRecord gridRecord = basicGridRecordService.getBaseMapper().selectById(basicGridRecord.getSequenceNbr());
+		if(Objects.nonNull(gridRecord) && Objects.isNull(gridRecord.getBwCreateTime())){
+			LambdaUpdateWrapper<BasicGridRecord> wrapper = new LambdaUpdateWrapper<>();
+			wrapper.set(BasicGridRecord::getBwCreateTime, date);
+			wrapper.eq(BaseEntity::getSequenceNbr, basicGridRecord.getSequenceNbr());
+			basicGridRecordService.update(null, wrapper);
+		}
+
+		return grid;
 	}
 
 	public HygfOnGrid modifyEntity(HygfOnGrid grid) {
@@ -571,7 +580,6 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 			da.setOperationContent("并网验收-设计审核-" + (approvalStatus.equals("0") ? "通过" : "驳回"));
 			if (basicGridRecord.getPowerStationEngineeringStatus() != null
 					&& basicGridRecord.getPowerStationEngineeringStatus().equals("通过") && approvalStatus.equals("0")) {
-				up.set(BasicGridRecord::getBwEndTime,new Date());
 				up.set(BasicGridRecord::getGridStatus, GridStatusEnum.YWC.getCode());
 				this.wofkflowExcute(instanceId, approvalStatus, comment, BusinessWorkflowKey.设计审核.getCode());
 				up.set(BasicGridRecord::getBasicGridNode, "all");
@@ -588,7 +596,6 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 				acceptanceCheck.setInstanceId(null);
 				acceptanceCheck.setPowerStationAreaStatus(null);
 				acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
-				acceptanceCheck.setYsCreateTime(new Date());
 				acceptanceCheckService.saveOrUpdate(acceptanceCheck);
 
 			} else if (null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0")
@@ -624,7 +631,6 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 			da.setOperationContent("并网验收-工程审核-" + (approvalStatus.equals("0") ? "通过" : "驳回"));
 			if (basicGridRecord.getPowerStationDesignStatus() != null
 					&& basicGridRecord.getPowerStationDesignStatus().equals("通过") && approvalStatus.equals("0")) {
-				up.set(BasicGridRecord::getBwEndTime,new Date());
 				up.set(BasicGridRecord::getGridStatus, GridStatusEnum.YWC.getCode());
 				this.wofkflowExcute(instanceId, approvalStatus, comment, BusinessWorkflowKey.工程审核.getCode());
 				up.set(BasicGridRecord::getBasicGridNode, "all");
@@ -642,7 +648,6 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 				acceptanceCheck.setPowerStationAreaStatus(null);
 				acceptanceCheck.setInstanceId(null);
 				acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
-				acceptanceCheck.setYsCreateTime(new Date());
 				acceptanceCheckService.saveOrUpdate(acceptanceCheck);
 
 			} else if (null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0")
@@ -685,8 +690,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 			up.eq(BaseEntity::getSequenceNbr, sequenceNbr);
 			basicGridRecordService.getBaseMapper().update(null, up);
 		}
-
-		da.setOperationTime(new Date());
+		Date date = new Date();
+		da.setOperationTime(date);
 		da.setOperator(kv.get("operator"));
 		da.setOperationResults(approvalStatus.equals("0") ? "通过" : "驳回");
 		da.setGridId(basicGridRecord.getSequenceNbr());
@@ -694,6 +699,16 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 		da.setPeasantHouseholdId(basicGridRecord.getPeasantHouseholdId());
 		da.setNotes(kv.get("comment"));
 		constructionGirdRecords.save(da);
+		//更新并网结束时间
+		if (StringUtils.isNotEmpty(sequenceNbr)) {
+			BasicGridRecord gridRecord = basicGridRecordService.getBaseMapper().selectById(sequenceNbr);
+			if(Objects.nonNull(gridRecord) && GridStatusEnum.YWC.getCode().equals(gridRecord.getGridStatus())){
+				LambdaUpdateWrapper<BasicGridRecord> wrapper = new LambdaUpdateWrapper<>();
+				wrapper.set(BasicGridRecord::getBwEndTime, date);
+				wrapper.eq(BasicGridRecord::getSequenceNbr, sequenceNbr);
+				basicGridRecordService.getBaseMapper().update(null, wrapper);
+			}
+		}
 		return CommonResponseNewUtil.success();
 	}
 

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

@@ -299,12 +299,14 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 		PowerStationNodeEnum nodeByCode = PowerStationNodeEnum.getNodeByCode(nodeCode);
 		String result = String.valueOf(kv.get("approvalStatus"));
 		boolean flag = true;
+		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("");
-			powerStation.setSjCreateTime(new Date());
 			this.updateSeve(nodeCode, powerStation.getPeasantHouseholdId(), kv);
 		} else {
 

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

@@ -198,7 +198,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			workOrderPowerStation.setPeasantHouseholdId(peasantHousehold.getSequenceNbr());
 			workOrderPowerStation.setWorkOrderId(model.getSequenceNbr());
 			workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待施工.getCode());
-			workOrderPowerStation.setSgCreateTime(new Date());
 			li.add(workOrderPowerStation);
 
 		}
@@ -248,7 +247,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			workOrderPowerStation.setPeasantHouseholdId(peasantHousehold.getSequenceNbr());
 			workOrderPowerStation.setWorkOrderId(model.getSequenceNbr());
 			workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待施工.getCode());
-			workOrderPowerStation.setSgCreateTime(new Date());
 			li.add(workOrderPowerStation);
 		}
 		workOrderPowerStationServiceImpl.saveBatch(li);
@@ -420,15 +418,24 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 
 		// 增加操作日志
 		if (powerStationConstructionData.getSequenceNbr() != null) {
+			Date date = new Date();
 			// 第一次点击“施工资料上传”按钮会生成一条数据
 			ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "编辑施工资料",
-					new Date(), "", powerStationConstructionData.getWorkOrderId(),
+					date, "", powerStationConstructionData.getWorkOrderId(),
 					powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
 			LambdaUpdateWrapper<ConstructionRecords> pcr = new LambdaUpdateWrapper<>();
 			pcr.eq(ConstructionRecords::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
 			pcr.eq(ConstructionRecords::getWorkOrderPowerStationId, powerStationConstructionData.getWorkOrderPowerStationId());
 			pcr.eq(ConstructionRecords::getOperationContent, "新增施工资料");// 自审不通过，重新上传的时候不要覆盖之前的数据
 			constructionRecordsServiceImpl.saveOrUpdate(da,pcr);
+			//添加施工开始时间
+			WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectById(powerStationConstructionData.getWorkOrderPowerStationId());
+			if(Objects.nonNull(workOrderPowerStation) && Objects.isNull(workOrderPowerStation.getSgCreateTime())){
+				LambdaUpdateWrapper<WorkOrderPowerStation> wrapper = new LambdaUpdateWrapper<>();
+				wrapper.set(WorkOrderPowerStation::getSgCreateTime, date);
+				wrapper.eq(WorkOrderPowerStation::getSequenceNbr, powerStationConstructionData.getWorkOrderPowerStationId());
+				workOrderPowerStationMapper.update(null,wrapper);
+			}
 
 		} else {
 			ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "新增施工资料",
@@ -1367,7 +1374,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
 			dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
 			dat.setGridStatus("1");
-			dat.setBwCreateTime(new Date());
 
 //				// 新增并网记录
 //				LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();