增加 并网及验收操作日志

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationEngineeringInfoAllDto.java

@@ -21,6 +21,10 @@ public class PowerStationEngineeringInfoAllDto {
 
     ConstructionRecords constructionRecords;
 
+    ConstructionGirdRecords constructionGirdRecords;
+
+    ConstructionAcceptanceRecords acceptanceRecords;
+
     // 基本信息
     SurveyInformationDto surveyInformation;
 

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

@@ -66,7 +66,9 @@ public class AcceptanceCheckController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "新增并网验收节点", notes = "新增并网验收节点")
 	public ResponseModel<AcceptanceCheck> save(@RequestBody Map<String,Object> model) {
 
-	    return ResponseHelper.buildResponse(acceptanceCheckServiceImpl.saveAndCommit(model));
+		String realName = getSelectedOrgInfo().getUserModel().getRealName();
+		model.put("realName",realName);
+		return ResponseHelper.buildResponse(acceptanceCheckServiceImpl.saveAndCommit(model));
 	}
 
 	/**

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

@@ -86,7 +86,8 @@ public class BasicGridAcceptanceController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	@Transactional
 	public ResponseModel saveAndCommit(@RequestBody  HygfOnGrid dto) {
-		return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.saveAndCommit(dto,getUserId()));
+
+		return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.saveAndCommit(dto,getSelectedOrgInfo().getUserModel().getRealName()));
 	}
 
 	/**

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

@@ -333,7 +333,9 @@ public class WorkOrderController extends BaseController {
     @ApiOperation(httpMethod = "POST",value = "更新详情信息",   notes = "更新详情信息")
     @PostMapping(value = "/updateDetail")
     public ResponseModel updateDetail(@RequestBody PowerStationEngineeringInfoAllDto powerStationEngineeringInfoAllDto) {
-         workOrderServiceImpl.updateDetail(powerStationEngineeringInfoAllDto,getUserId());
+        String realName = getSelectedOrgInfo().getUserModel().getRealName();
+
+        workOrderServiceImpl.updateDetail(powerStationEngineeringInfoAllDto,realName);
         return ResponseHelper.buildResponse(null);
     }
 

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

@@ -55,7 +55,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
     AcceptanceCheckMapper acceptanceCheckMapper;
     @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
-
+    @Autowired
+    ConstructionAcceptanceRecordsServiceImpl acceptanceRecordsService;
 
 
     public Page<AcceptanceCheckDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
@@ -164,6 +165,11 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         this.update(null,update);
         //发起待办
 //		commonService.buildTaskModel(buildBWYSTaskModel(grid, basicGridAcceptance));
+
+        ConstructionAcceptanceRecords da = new ConstructionAcceptanceRecords(model.get("realName").toString(), "提交验收审核",
+                new Date(), "", basicGridRecord.getSequenceNbr(), basicGridRecord.getWorkOrderPowerStationId(),
+                basicGridRecord.getPeasantHouseholdId(), "");
+        acceptanceRecordsService.save(da);
         return basicGridRecord;
     }
 
@@ -214,6 +220,17 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         basicGridRecord.setAcceptanceCheckStatus(approvalStatus.equals("0")?GridStatusEnum.PQYYDSH.getCode():GridStatusEnum.WTG.getCode());
         basicGridRecord.setBasicGridNode(approvalStatus.equals("0")?"ys-area":null);
         this.updateById(basicGridRecord);
+
+        ConstructionAcceptanceRecords da = new ConstructionAcceptanceRecords();
+        da.setOperationTime(new Date());
+        da.setOperationContent("并网管理-经销商管理员审核-"+(approvalStatus.equals("0")?"通过":"驳回"));
+        da.setOperator(kv.get("operator"));
+        da.setOperationResults(approvalStatus.equals("0")?"通过":"驳回");
+        da.setAcceptanceId(basicGridRecord.getSequenceNbr());
+        da.setWorkOrderPowerStationId(basicGridRecord.getWorkOrderPowerStationId());
+        da.setPeasantHouseholdId(basicGridRecord.getPeasantHouseholdId());
+        da.setNotes(kv.get("comment"));
+        acceptanceRecordsService.save(da);
     }
 
 
@@ -227,9 +244,11 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
 
         AcceptanceCheck basicGridRecord = this.getBaseMapper().selectById(sequenceNbr);
         LambdaUpdateWrapper<AcceptanceCheck> up = new LambdaUpdateWrapper<>();
+        ConstructionAcceptanceRecords da = new ConstructionAcceptanceRecords();
         switch (status){
             case "ys-area":
                 up.set(AcceptanceCheck::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
+                da.setOperationContent("验收审核-片区运营审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
                 up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu,ys-tourong");
                 up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YSROLESDSH.getCode());
                 LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
@@ -250,6 +269,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                 break;
             case "ys-fawu":
                 up.set(AcceptanceCheck::getPowerStationLegalStatus,approvalStatus.equals("0")?"通过":"驳回");
+                da.setOperationContent("验收审核-法务审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
                 if (basicGridRecord.getPowerStationFinancingStatus() != null && basicGridRecord.getPowerStationFinancingStatus().equals("通过")&&approvalStatus.equals("0") ){
                     up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZCDSH.getCode());
                     this.wofkflowExcute(instanceId, approvalStatus , comment  );
@@ -281,6 +301,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                 break;
             case "ys-tourong":
                 up.set(AcceptanceCheck::getPowerStationFinancingStatus,approvalStatus.equals("0")?"通过":"驳回");
+                da.setOperationContent("验收审核-投融审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
                 if (basicGridRecord.getPowerStationLegalStatus() != null && basicGridRecord.getPowerStationLegalStatus().equals("通过")&&approvalStatus.equals("0") ){
                     up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZCDSH.getCode());
                     this.wofkflowExcute(instanceId, approvalStatus , comment  );
@@ -309,6 +330,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                 }
                 break;
             default:
+                da.setOperationContent("验收审核-资产审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
                 up.set(AcceptanceCheck::getPowerStationAssetsStatus,approvalStatus.equals("0")?"通过":"驳回");
                 up.set(AcceptanceCheck::getBasicGridNode,"all");
                 if (approvalStatus.equals("0")){
@@ -335,6 +357,15 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
             this.getBaseMapper().update(null,up);
         }
+
+        da.setOperationTime(new Date());
+        da.setOperator(kv.get("operator"));
+        da.setOperationResults(approvalStatus.equals("0")?"通过":"驳回");
+        da.setAcceptanceId(basicGridRecord.getSequenceNbr());
+        da.setWorkOrderPowerStationId(basicGridRecord.getWorkOrderPowerStationId());
+        da.setPeasantHouseholdId(basicGridRecord.getPeasantHouseholdId());
+        da.setNotes(kv.get("comment"));
+        acceptanceRecordsService.save(da);
         return CommonResponseNewUtil.success();
     }
 

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

@@ -81,6 +81,8 @@ public class BasicGridAcceptanceServiceImpl
 	BasicGridRecordServiceImpl basicGridRecordService;
 	@Autowired
 	AcceptanceCheckServiceImpl acceptanceCheckService;
+	@Autowired
+	ConstructionGirdRecordsServiceImpl constructionGirdRecords;
 
 	private final String OK = "0";
 	private final String PASS = "5";
@@ -181,7 +183,7 @@ public class BasicGridAcceptanceServiceImpl
 	}
 
 
-	public synchronized HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
+	public synchronized HygfOnGrid saveAndCommit(HygfOnGrid grid, String realName) {
 
 		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper()
 				.selectOne(new LambdaQueryWrapper<BasicGridRecord>()
@@ -241,6 +243,12 @@ public class BasicGridAcceptanceServiceImpl
 
 		update.eq(BaseEntity::getSequenceNbr,basicGridRecord.getSequenceNbr());
 		basicGridRecordService.update(null,update);
+
+
+		ConstructionGirdRecords da = new ConstructionGirdRecords(realName, "提交并网资料",
+				new Date(), "", basicGridRecord.getSequenceNbr(), basicGridRecord.getWorkOrderPowerStationId(),
+				basicGridRecord.getPeasantHouseholdId(), "");
+		constructionGirdRecords.save(da);
 		//发起待办
 //		commonService.buildTaskModel(buildBWYSTaskModel(grid, basicGridAcceptance));
 		return grid;
@@ -483,6 +491,17 @@ public class BasicGridAcceptanceServiceImpl
 		basicGridRecord.setGridStatus(approvalStatus.equals("0")?GridStatusEnum.PQYYDSH.getCode():GridStatusEnum.WTG.getCode());
 		basicGridRecord.setBasicGridNode(approvalStatus.equals("0")?"bw-area":null);
 		basicGridRecordService.updateById(basicGridRecord);
+		// 增加操作日志
+		ConstructionGirdRecords da = new ConstructionGirdRecords();
+		da.setOperationTime(new Date());
+		da.setOperationContent("并网管理-经销商管理员审核-"+(approvalStatus.equals("0")?"通过":"驳回"));
+		da.setOperator(kv.get("operator"));
+		da.setOperationResults(approvalStatus.equals("0")?"通过":"驳回");
+		da.setGridId(basicGridRecord.getSequenceNbr());
+		da.setWorkOrderPowerStationId(basicGridRecord.getWorkOrderPowerStationId());
+		da.setPeasantHouseholdId(basicGridRecord.getPeasantHouseholdId());
+		da.setNotes(kv.get("comment"));
+		constructionGirdRecords.save(da);
 	}
 
 
@@ -496,13 +515,15 @@ public class BasicGridAcceptanceServiceImpl
 		String approvalStatus = kv.get("approvalStatus");
 
 		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectById(sequenceNbr);
+		ConstructionGirdRecords da = new ConstructionGirdRecords();
+
 		LambdaUpdateWrapper<BasicGridRecord> up = new LambdaUpdateWrapper<>();
 		switch (status){
 			case "bw-area":
 				up.set(BasicGridRecord::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
 				up.set(BasicGridRecord::getBasicGridNode,"bw-design,bw-engineering");
 				up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
-				
+				da.setOperationContent("并网验收-片区运营审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
 				//如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
 				LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
 				query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
@@ -522,6 +543,7 @@ public class BasicGridAcceptanceServiceImpl
 				break;
 			case "bw-design":
 				up.set(BasicGridRecord::getPowerStationDesignStatus,approvalStatus.equals("0")?"通过":"驳回");
+				da.setOperationContent("并网验收-设计审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
 				if (basicGridRecord.getPowerStationEngineeringStatus() != null && basicGridRecord.getPowerStationEngineeringStatus().equals("通过")&&approvalStatus.equals("0") ){
 					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.YWC.getCode());
 					this.wofkflowExcute(instanceId, approvalStatus , comment  );
@@ -531,8 +553,6 @@ public class BasicGridAcceptanceServiceImpl
 					wrapper.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.并网完成.getCode());
 					wrapper.eq(BaseEntity::getSequenceNbr,basicGridRecord.getPeasantHouseholdId());
 					peasantHouseholdMapper.update(null,wrapper);
-
-
 					AcceptanceCheck acceptanceCheck = new AcceptanceCheck();
 					BeanUtils.copyProperties(basicGridRecord,acceptanceCheck);
 					acceptanceCheck.setSequenceNbr(null);
@@ -569,6 +589,7 @@ public class BasicGridAcceptanceServiceImpl
 				break;
 			default:
 				up.set(BasicGridRecord::getPowerStationEngineeringStatus,approvalStatus.equals("0")?"通过":"驳回");
+				da.setOperationContent("并网验收-工程审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
 				if (basicGridRecord.getPowerStationDesignStatus() != null && basicGridRecord.getPowerStationDesignStatus().equals("通过")&&approvalStatus.equals("0") ){
 					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.YWC.getCode());
 					this.wofkflowExcute(instanceId, approvalStatus , comment  );
@@ -623,6 +644,17 @@ public class BasicGridAcceptanceServiceImpl
 			up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
 			basicGridRecordService.getBaseMapper().update(null,up);
 		}
+
+
+
+		da.setOperationTime(new Date());
+		da.setOperator(kv.get("operator"));
+		da.setOperationResults(approvalStatus.equals("0")?"通过":"驳回");
+		da.setGridId(basicGridRecord.getSequenceNbr());
+		da.setWorkOrderPowerStationId(basicGridRecord.getWorkOrderPowerStationId());
+		da.setPeasantHouseholdId(basicGridRecord.getPeasantHouseholdId());
+		da.setNotes(kv.get("comment"));
+		constructionGirdRecords.save(da);
 		return CommonResponseNewUtil.success();
 	}
 

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

@@ -109,6 +109,10 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	@Autowired
 	ConstructionRecordsMapper constructionRecordsMapper;
 	@Autowired
+	ConstructionGirdRecordsMapper constructionGirdRecordsMapper;
+	@Autowired
+	ConstructionAcceptanceRecordsMapper constructionAcceptanceRecordsMapper;
+	@Autowired
 	BasicGridRecordMapper basicGridRecordMapper;
 	@Autowired
 	AcceptanceCheckMapper acceptanceCheckMapper;
@@ -874,7 +878,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		surveyInfoAllDto.setPowerStationEngineeringInfo(powerStationEngineeringInfo);
 		surveyInfoAllDto.setWorkOrder(workOrder);
 
-		// 施工自审
+		// 施工自审操作记录
 		LambdaQueryWrapper<ConstructionRecords> up5 = new LambdaQueryWrapper<ConstructionRecords>();
 		up5.eq(ConstructionRecords::getWorkOrderId, workOrderId);
 		up5.eq(ConstructionRecords::getWorkOrderPowerStationId, workOrderPowerStationId);
@@ -887,6 +891,16 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		LambdaQueryWrapper<BasicGridRecord> quv = new LambdaQueryWrapper<BasicGridRecord>();
 		quv.eq(BasicGridRecord::getPeasantHouseholdId, peasantHouseholdId);
 		BasicGridRecord basicGridAcceptance = basicGridRecordMapper.selectOne(quv);
+		if (Objects.nonNull(basicGridAcceptance)){
+			LambdaQueryWrapper<ConstructionGirdRecords> up8 = new LambdaQueryWrapper<ConstructionGirdRecords>();
+			up8.eq(ConstructionGirdRecords::getGridId, basicGridAcceptance.getSequenceNbr());
+			up8.eq(ConstructionGirdRecords::getWorkOrderPowerStationId, workOrderPowerStationId);
+			up8.orderByAsc(ConstructionGirdRecords::getRecDate);
+			List<ConstructionGirdRecords> li2 = constructionGirdRecordsMapper.selectList(up8);
+			ConstructionGirdRecords constructionGirdRecords = new ConstructionGirdRecords();
+			constructionGirdRecords.setConstructionRecordsList(li2);
+			surveyInfoAllDto.setConstructionGirdRecords(constructionGirdRecords);
+		}
 
 		// 审核意见
 		if (Objects.nonNull(basicGridAcceptance) && !StringUtils.isEmpty(basicGridAcceptance.getInstanceId())) {
@@ -939,7 +953,16 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			acceptanceCheck.setLegalOrders(legalOrders.size()>0?legalOrders:null);
 			acceptanceCheck.setPropertyOrders(propertyOrders.size()>0?propertyOrders:null);
 		}
-		
+		if (Objects.nonNull(acceptanceCheck)){
+			LambdaQueryWrapper<ConstructionAcceptanceRecords> up7 = new LambdaQueryWrapper<ConstructionAcceptanceRecords>();
+			up7.eq(ConstructionAcceptanceRecords::getAcceptanceId, workOrderId);
+			up7.eq(ConstructionAcceptanceRecords::getWorkOrderPowerStationId, workOrderPowerStationId);
+			up7.orderByAsc(ConstructionAcceptanceRecords::getRecDate);
+			List<ConstructionAcceptanceRecords> li1 = constructionAcceptanceRecordsMapper.selectList(up7);
+			ConstructionAcceptanceRecords constructionAcceptanceRecords = new ConstructionAcceptanceRecords();
+			constructionAcceptanceRecords.setConstructionRecordsList(li1);
+			surveyInfoAllDto.setAcceptanceRecords(constructionAcceptanceRecords);
+		}
 		surveyInfoAllDto.setAcceptanceCheck(acceptanceCheck);
 		// 审核意见
 		if (Objects.nonNull(acceptanceCheck) && !StringUtils.isEmpty(acceptanceCheck.getInstanceId())) {
@@ -1432,7 +1455,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	}
 
 	@Transactional(rollbackFor = Exception.class)
-	public void updateDetail(PowerStationEngineeringInfoAllDto powerStationEngineeringInfoAllDto,String userId) {
+	public void updateDetail(PowerStationEngineeringInfoAllDto powerStationEngineeringInfoAllDto,String realName) {
 		//更新施工信息
 		PowerStationConstructionData powerStationConstructionData = powerStationEngineeringInfoAllDto.getPowerStationConstructionData();
 		if(Objects.nonNull(powerStationConstructionData)){
@@ -1489,7 +1512,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			//提交并网
 			if(Objects.nonNull(hygfOnGrid) && powerStationEngineeringInfoAllDto.getFlowType() == 0) {
 				hygfOnGrid.setType("1");
-				basicGridAcceptanceService.saveAndCommit(hygfOnGrid,userId);
+				basicGridAcceptanceService.saveAndCommit(hygfOnGrid,realName);
 			}
 			//提交验收
 			AcceptanceCheck acceptanceCheck = powerStationEngineeringInfoAllDto.getAcceptanceCheck();
@@ -1497,6 +1520,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 				Map<String,Object> model =new HashMap<>();
 				model.put("type","1");
 				model.put("sequenceNbr",acceptanceCheck.getSequenceNbr());
+				model.put("realName",realName);
 				acceptanceCheckService.saveAndCommit(model);
 			}
 		}