Skip to content

A
amos-boot-zx-biz
Commit 340e2c4a authored by chenzhao's avatar chenzhao
Browse files
Options

xiugaibug 验收优化

parent b2febf4d
Hide whitespace changes
Inline Side-by-side
Showing with 496 additions and 280 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/ArrivalStateeEnum.java
View file @ 340e2c4a
......@@ -28,6 +28,7 @@ public enum ArrivalStateeEnum {
施工中("施工中", "施工中"),
施工完成 ("施工完成", "施工完成"),
并网中("并网中", "并网中"),
验收中("验收中", "验收中"),
并网完成("并网完成", "并网完成"),
线上验收("线上验收", "线上验收"),
线下验收("线下验收", "线下验收"),
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceCheckDto.java
View file @ 340e2c4a
......@@ -52,4 +52,6 @@ public class AcceptanceCheckDto extends BaseDto {
@ApiModelProperty(value = "实例id")
private String instanceId;
private String acceptanceTime;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceCheck.java
View file @ 340e2c4a
......@@ -88,4 +88,11 @@ public class AcceptanceCheck extends BaseEntity {
private String rectificationStatus;
/**
* 验收时间
*/
@TableField("acceptance_time")
private String acceptanceTime;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml
View file @ 340e2c4a
......@@ -64,8 +64,8 @@
AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
</if>
<if test="map.type != null">
and ( hbga.grid_node is not null
or hbga.grid_node = 'all'
and ( hbga.basic_grid_node is not null
or hbga.basic_grid_node = 'all'
or hbga.power_station_area_status is not null
or hbga.power_station_design_status is not null
or hbga.power_station_engineering_status is not null
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceCheckController.java
View file @ 340e2c4a
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.AcceptanceCheckServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -113,4 +117,65 @@ public class AcceptanceCheckController extends BaseController {
public ResponseModel<List<AcceptanceCheckDto>> selectForList() {
return ResponseHelper.buildResponse(acceptanceCheckServiceImpl.queryForAcceptanceCheckList());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "验收-经销商管理", notes = "验收经销商管理")
@PostMapping(value = "/completeAdminAudit")
@Transactional
public ResponseModel completeAdminAudit( @RequestBody Map<String,String> kv) {
acceptanceCheckServiceImpl.completeAdminAudit(kv);
return ResponseHelper.buildResponse(null);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "验收管理审核", notes = "验收管理审核")
@PostMapping(value = "/completeAudit")
@Transactional
public ResponseModel completeAudit( @RequestBody Map<String,String> kv) {
return acceptanceCheckServiceImpl.completeAudit(kv);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "整改单下发", notes = "整改单下发")
@PostMapping(value = "/addRectification")
@Transactional
public ResponseModel addRectification( @RequestBody HygfRectificationOrder hygfReplenishment) {
return acceptanceCheckServiceImpl.addRectification(hygfReplenishment);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "整改单添加信息", notes = "整改单添加信息")
@PostMapping(value = "/nextTaskExcute")
@Transactional
public ResponseModel nextTaskExcute( @RequestBody HygfRectificationOrder hygfReplenishment) {
return acceptanceCheckServiceImpl.nextTaskExcute(hygfReplenishment);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "整改单审核", notes = "整改单审核")
@PostMapping(value = "/nextTaskAduit")
@Transactional
public ResponseModel nextTaskAduit( @RequestBody HygfRectificationOrder hygfReplenishment) {
return acceptanceCheckServiceImpl.nextTaskAduit(hygfReplenishment);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT",value = "整改单作废", notes = "整改单作废")
@PutMapping(value = "/rollback")
@Transactional
public ResponseModel rollback( @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
return acceptanceCheckServiceImpl.rollback(sequenceNbr);
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java
View file @ 340e2c4a
......@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.GridStatusEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceCheckAuditingDto;
......@@ -11,17 +12,23 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAuditingDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceCheckService;
import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceCheckDto;
import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
import com.yeejoin.amos.component.robot.BadRequest;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.*;
import java.util.stream.Collectors;
......@@ -38,12 +45,12 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
AcceptanceCheckAuditingServiceImpl acceptanceCheckAuditingService;
@Autowired
private WorkFlowService workFlowService;
// @Autowired
// AcceptanceCheckAuditingServiceImpl acceptanceCheckAuditingService;
// @Autowired
// RectificationOrderAuditingServiceImpl rectificationOrderAuditingService;
// @Autowired
// HygfRectificationOrderServiceImpl rectificationOrderService;
@Autowired
RectificationOrderAuditingServiceImpl rectificationOrderAuditingService;
@Autowired
HygfRectificationOrderServiceImpl rectificationOrderService;
@Autowired
PeasantHouseholdMapper peasantHouseholdMapper;
/**
......@@ -60,6 +67,76 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
return this.queryForList("" , false);
}
public synchronized HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
AcceptanceCheck basicGridRecord = this.getBaseMapper()
.selectOne(new LambdaQueryWrapper<AcceptanceCheck>()
.eq(AcceptanceCheck::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
LambdaUpdateWrapper<AcceptanceCheck> update = new LambdaUpdateWrapper<>();
update.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.JXSGLYDSH.getCode());
update.set(AcceptanceCheck::getBasicGridNode,"jxsAdmin");
if (grid.getType() != null && "1".equals(grid.getType())) {
// 执行工作流
this.wofkflowExcute(basicGridRecord.getInstanceId(),"0","重新验收");
update.set(AcceptanceCheck::getPowerStationAreaStatus,null);
update.set(AcceptanceCheck::getPowerStationLegalStatus,null);
update.set(AcceptanceCheck::getPowerStationFinancingStatus,null);
update.set(AcceptanceCheck::getPowerStationAssetsStatus,null);
} else {
//开启工作流 并执行一步
ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
List<ActWorkflowStartDTO> params = new ArrayList<>();
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey("AcceptanceCheck");
dto.setBusinessKey(String.valueOf(new Date().getTime()));
dto.setCompleteFirstTask(true);
HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", "0");
dto.setVariables(map);
params.add(dto);
actWorkflowBatchDTO.setProcess(params);
List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
AcceptanceCheckAuditingDto basicGridAuditingDto = new AcceptanceCheckAuditingDto();
BeanUtils.copyProperties(workflowResultDto, basicGridAuditingDto);
basicGridAuditingDto.setPeasantHouseholdId(grid.getPeasantHouseholdId());
basicGridAuditingDto.setPromoter(RequestContext.getExeUserId());
acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
update.set(AcceptanceCheck::getInstanceId,basicGridAuditingDto.getInstanceId());
// 线上验收
LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.验收中.getCode());
long idsk = basicGridRecord.getPeasantHouseholdId();
up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up);
}
//防止重复提交
// if (grid.getSequenceNbr() != null) {
// onGridMapper.updateById(grid);
// } else {
// onGridMapper.insert(grid);
// }
// LambdaQueryWrapper<HygfOnGrid> hog = new LambdaQueryWrapper<>();
// hog.eq(HygfOnGrid::getPeasantHouseholdId, grid.getPeasantHouseholdId());
// hygfOnGridServiceImpl.saveOrUpdate(grid,hog);
update.eq(BaseEntity::getSequenceNbr,basicGridRecord.getSequenceNbr());
this.update(null,update);
//发起待办
// commonService.buildTaskModel(buildBWYSTaskModel(grid, basicGridAcceptance));
return grid;
}
// 工作流执行一步
public void wofkflowExcute(String instanceId, String approvalStatus,String comment) {
LambdaQueryWrapper<AcceptanceCheckAuditing> query = new LambdaQueryWrapper<>();
......@@ -92,277 +169,340 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
}
//
//
//
// public void completeAdminAudit(Map<String,String> kv) {
// String instanceId = kv.get("instanceId");
// String sequenceNbr = kv.get("sequenceNbr");
// String comment = kv.get("comment");
// String approvalStatus = kv.get("approvalStatus");
//
// BasicGridRecord basicGridRecord = this.getBaseMapper().selectById(sequenceNbr);
// //执行工作流
// this.wofkflowExcute(instanceId, approvalStatus , comment);
// //修改并网数据状态
// basicGridRecord.setGridStatus(approvalStatus.equals("0")?GridStatusEnum.PQYYDSH.getCode():GridStatusEnum.WTG.getCode());
// basicGridRecord.setBasicGridNode("bw-area");
// basicGridRecordService.updateById(basicGridRecord);
// }
//
//
//
//
// public void completeAudit(Map<String,String> kv) {
// String instanceId = kv.get("instanceId");
// String sequenceNbr = kv.get("sequenceNbr");
// String comment = kv.get("comment");
// String status = kv.get("status");
// String approvalStatus = kv.get("approvalStatus");
//
// BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectById(sequenceNbr);
// 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());
// this.wofkflowExcute(instanceId, approvalStatus , comment );
// break;
// case "bw-design":
// up.set(BasicGridRecord::getPowerStationDesignStatus,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 );
// up.set(BasicGridRecord::getBasicGridNode,"all");
// }else if( null == basicGridRecord.getPowerStationEngineeringStatus() &&approvalStatus.equals("0") ) {
// up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
// up.set(BasicGridRecord::getGridStatus,GridStatusEnum.GCDSH.getCode());
// }else if (null != basicGridRecord.getPowerStationEngineeringStatus() && basicGridRecord.getPowerStationEngineeringStatus().equals("驳回")){
// throw new BadRequest("该流程已被工程人员审核驳回，请刷新列表");
// }else {
// this.wofkflowExcute(instanceId, approvalStatus , comment );
// }
// break;
// default:
// up.set(BasicGridRecord::getPowerStationEngineeringStatus,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 );
// up.set(BasicGridRecord::getBasicGridNode,"all");
// }else if( null == basicGridRecord.getPowerStationDesignStatus() &&approvalStatus.equals("0") ) {
// up.set(BasicGridRecord::getBasicGridNode,"bw-design");
// up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
// }else if (null != basicGridRecord.getPowerStationDesignStatus() && basicGridRecord.getPowerStationDesignStatus().equals("驳回")){
// throw new BadRequest("该流程已被设计人员审核驳回，请刷新列表");
// }else {
// this.wofkflowExcute(instanceId, approvalStatus , comment );
// }
// break;
// }
// if (approvalStatus.equals("1") ){
// up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
// up.set(BasicGridRecord::getBasicGridNode,null);
// up.set(BasicGridRecord::getGridStatus,GridStatusEnum.WTG.getCode());
// basicGridRecordService.getBaseMapper().update(null,up);
// }
// //修改并网数据状态
// if (StringUtils.isNotEmpty(sequenceNbr)){
// up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
// basicGridRecordService.getBaseMapper().update(null,up);
// }
// }
//
//
//
//
// public void addRectification(HygfRectificationOrder hygfRectificationOrder) {
//
// //查询当前并网数据
// LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
// BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
// if (!Objects.isNull(basicGridRecord)&&!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
// throw new BadRequest("当前流程发生变化，暂时无法操作，请刷新再试");
// }
//
// String addorSubmit = hygfRectificationOrder.getAddorSubmit();;
// LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
// if (!Objects.isNull(basicGridRecord) && null != basicGridRecord.getRectificationStatus() && !basicGridRecord.getRectificationStatus().contains(hygfRectificationOrder.getRectificationSource())){
// qu.set(BasicGridRecord::getRectificationStatus,basicGridRecord.getRectificationStatus()+","+hygfRectificationOrder.getRectificationSource());
// }else if (null == basicGridRecord.getRectificationStatus() ) {
// qu.set(BasicGridRecord::getRectificationStatus,hygfRectificationOrder.getRectificationSource());
// }
// //修改状态
// if (addorSubmit.equals("0")){
// qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
// }
// rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
// qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
// basicGridRecordService.update(null,qu);
//
// }
//
//
// public void nextTaskExcute(HygfRectificationOrder hygfRectificationOrder) {
// //查询当前并网数据
// LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
// BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
// if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
// hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.整改中.getCode());
// rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
// throw new BadRequest("当前流程发生变化，暂时无法操作，请刷新再试");
// }
//
// if (hygfRectificationOrder.getAddorSubmit().equals("0") ) {
//
// LambdaUpdateWrapper<BasicGridRecord> up = new LambdaUpdateWrapper<>();
// up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
// up.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
// basicGridRecordService.update(null,up);
// hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.待审核.getCode());
// }else {
// hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.整改中.getCode());
// }
// rectificationOrderAuditingService.nextTaskExcute(hygfRectificationOrder);
// }
//
// public void nextTaskAduit(HygfRectificationOrder hygfRectificationOrder) {
// String auditResult = hygfRectificationOrder.getAuditResult();
//
// //查询当前并网数据
// LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
// BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
//
// if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
// throw new BadRequest("当前流程发生变化，暂时无法操作，请刷新再试");
// }
//
// //修改整改单状态
// hygfRectificationOrder.setRectificationStatus(auditResult.equals("通过")?WorkOrderEnum.已完成.getCode():WorkOrderEnum.待整改.getCode());
// rectificationOrderAuditingService.nextTaskAduit(hygfRectificationOrder);
// //查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
// LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
// wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());
// wr.notIn(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待提交","已作废","已完成"));
// wr.ne(BaseEntity::getSequenceNbr,hygfRectificationOrder.getSequenceNbr());
// List<HygfRectificationOrder> list = rectificationOrderService.getBaseMapper().selectList(wr);
//
// //修改并网状态
// //片区不存在并行 无需复杂判断 工程与设计并行 需要做额外逻辑判断
// if (auditResult.equals("通过")){
// if (hygfRectificationOrder.getRectificationStatus().equals("bw-area")){
// LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
// qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
// qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.PQYYDSH.getCode());
// qu.set(BasicGridRecord::getRectificationStatus,null);
// basicGridRecordService.update(null,qu);
// }else {
// LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
// qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
// List<String> status = new ArrayList<>(Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
// status.remove(hygfRectificationOrder.getRectificationSource());
// if(status.size()<1){
// qu.set(BasicGridRecord::getRectificationStatus,null);
// basicGridRecord.setRectificationStatus(null);
// }else {
// qu.set(BasicGridRecord::getRectificationStatus,String.join(",",status));
// }
// if (CollectionUtil.isEmpty(list)) {
// //若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
// if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() )
// && Objects.isNull(basicGridRecord.getPowerStationEngineeringStatus())){
// basicGridRecord.setGridStatus(GridStatusEnum.ROLESDSH.getCode());
// }else if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() ) ){
// basicGridRecord.setGridStatus(GridStatusEnum.SJDSH.getCode());
// }else {
// basicGridRecord.setGridStatus(GridStatusEnum.GCDSH.getCode());
// }
// }else {
// List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
// qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
// }
// basicGridRecordService.update(null,qu);
// }
// }else {
// //驳回的时候 也需根据 工程或者设计 整改单状态修改并网状态
// LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
// qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
// if (CollectionUtil.isEmpty(list)) {
// List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
// qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
// }else {
// qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
// }
// basicGridRecordService.update(null,qu);
// }
//
// }
//
// public void rollback(Long sequenceNbr) {
// HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectById(sequenceNbr);
// //查询当前并网数据
// LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
// BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
// if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
// throw new BadRequest("当前流程发生变化，暂时无法操作，请刷新再试");
// }
// if (hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待提交.getCode()) ||
// hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待整改.getCode())){
// rectificationOrderAuditingService.rollback(sequenceNbr);
// LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
// qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
//
// List<String> status = new ArrayList<>(Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
// status.remove(hygfRectificationOrder.getRectificationSource());
// if(status.size()<1){
// qu.set(BasicGridRecord::getRectificationStatus,null);
// basicGridRecord.setRectificationStatus(null);
// }else {
// qu.set(BasicGridRecord::getRectificationStatus,String.join(",",status));
// }
// basicGridRecordService.getBaseMapper().update(null,qu);
//
// }else {
// throw new BadRequest("仅单据状态为待提交或待整改时方可作废");
// }
//
//
//
// if (hygfRectificationOrder.getRectificationSource().equals("bw-area")){
// basicGridRecord.setGridStatus(GridStatusEnum.PQYYDSH.getCode());
// }else {
//
// //查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
// LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
// wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());
// wr.notIn(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待提交","已作废","已完成"));
// wr.ne(BaseEntity::getSequenceNbr,hygfRectificationOrder.getSequenceNbr());
// List<HygfRectificationOrder> list = rectificationOrderService.getBaseMapper().selectList(wr);
//
// if (CollectionUtil.isEmpty(list)) {
// //若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
// if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() )
// && Objects.isNull(basicGridRecord.getPowerStationEngineeringStatus())){
// basicGridRecord.setGridStatus(GridStatusEnum.ROLESDSH.getCode());
// }else if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() ) ){
// basicGridRecord.setGridStatus(GridStatusEnum.SJDSH.getCode());
// }else {
// basicGridRecord.setGridStatus(GridStatusEnum.GCDSH.getCode());
// }
// }else {
// List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
// LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
// qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
// qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
// basicGridRecordService.update(null,qu);
// }
// }
// basicGridRecordService.updateById(basicGridRecord);
// }
public void completeAdminAudit(Map<String,String> kv) {
String instanceId = kv.get("instanceId");
String sequenceNbr = kv.get("sequenceNbr");
String comment = kv.get("comment");
String approvalStatus = kv.get("approvalStatus");
AcceptanceCheck basicGridRecord = this.getBaseMapper().selectById(sequenceNbr);
//执行工作流
this.wofkflowExcute(instanceId, approvalStatus , comment);
//修改并网数据状态
basicGridRecord.setAcceptanceCheckStatus(approvalStatus.equals("0")?GridStatusEnum.PQYYDSH.getCode():GridStatusEnum.WTG.getCode());
basicGridRecord.setBasicGridNode("ys-area");
this.updateById(basicGridRecord);
}
public ResponseModel completeAudit(Map<String,String> kv) {
String instanceId = kv.get("instanceId");
String sequenceNbr = kv.get("sequenceNbr");
String comment = kv.get("comment");
String status = kv.get("status");
String approvalStatus = kv.get("approvalStatus");
AcceptanceCheck basicGridRecord = this.getBaseMapper().selectById(sequenceNbr);
LambdaUpdateWrapper<AcceptanceCheck> up = new LambdaUpdateWrapper<>();
switch (status){
case "ys-area":
up.set(AcceptanceCheck::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu,ys-tourong");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ROLESDSH.getCode());
LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核"));
query.in(HygfRectificationOrder::getRectificationSource,Arrays.asList("ys-fawu","ys-tourong","ys-zichan"));
List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.getBaseMapper().selectList(query);
for (HygfRectificationOrder hygfRectificationOrder : hygfRectificationOrders) {
if (hygfRectificationOrder.getRectificationStatus().equals("待审核")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZGDSH.getCode());
break;
}
if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}
}
this.wofkflowExcute(instanceId, approvalStatus , comment );
break;
case "ys-fawu":
up.set(AcceptanceCheck::getPowerStationLegalStatus,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 );
up.set(AcceptanceCheck::getBasicGridNode,"ys-zichan");
}else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("ys-tourong")) ) ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.GCDSH.getCode());
}else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("ys-tourong") ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong");
LambdaQueryWrapper<HygfRectificationOrder> query2 = new LambdaQueryWrapper<>();
query2.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
query2.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待审核","待提交"));
query2.eq(HygfRectificationOrder::getRectificationSource,"ys-tourong");
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query2);
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.SJDSH.getCode());
}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}else {
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZGDSH.getCode());
}
}
else if (null != basicGridRecord.getPowerStationFinancingStatus() && basicGridRecord.getPowerStationFinancingStatus().equals("驳回")){
return CommonResponseNewUtil.failureMessage("该流程已被投融人员审核驳回，请刷新列表");
}else {
this.wofkflowExcute(instanceId, approvalStatus , comment );
}
break;
case "ys-tourong":
up.set(AcceptanceCheck::getPowerStationFinancingStatus,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 );
up.set(AcceptanceCheck::getBasicGridNode,"ys-zichan");
}else if( null == basicGridRecord.getPowerStationLegalStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("ys-fawu")) )) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.SJDSH.getCode());
}else if( null == basicGridRecord.getPowerStationLegalStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("ys-fawu") ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu");
LambdaQueryWrapper<HygfRectificationOrder> query1 = new LambdaQueryWrapper<>();
query1.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
query1.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待审核","待提交"));
query1.eq(HygfRectificationOrder::getRectificationSource,"ys-fawu");
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query1);
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.SJDSH.getCode());
}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}else {
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZGDSH.getCode());
}
} else if (null != basicGridRecord.getPowerStationLegalStatus() && basicGridRecord.getPowerStationLegalStatus().equals("驳回")){
return CommonResponseNewUtil.failureMessage("该流程已被法务人员审核驳回，请刷新列表");
}else {
this.wofkflowExcute(instanceId, approvalStatus , comment );
}
break;
default:
up.set(AcceptanceCheck::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
up.set(AcceptanceCheck::getBasicGridNode,"all");
up.set(AcceptanceCheck::getAcceptanceTime,new Date());
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YWC.getCode());
this.wofkflowExcute(instanceId, approvalStatus , comment );
}
if (approvalStatus.equals("1") ){
up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
up.set(AcceptanceCheck::getBasicGridNode,null);
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.WTG.getCode());
}
//修改验收数据状态
if (StringUtils.isNotEmpty(sequenceNbr)){
up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
this.getBaseMapper().update(null,up);
}
return CommonResponseNewUtil.success();
}
public ResponseModel addRectification(HygfRectificationOrder hygfRectificationOrder) {
if (hygfRectificationOrder.getSequenceNbr() != null ){
LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());
wr.notIn(HygfRectificationOrder::getRectificationStatus,Arrays.asList("已作废","已完成"));
wr.eq(HygfRectificationOrder::getRectificationSource,hygfRectificationOrder.getRectificationSource());
wr.ne(BaseEntity::getSequenceNbr,hygfRectificationOrder.getSequenceNbr());
List<HygfRectificationOrder> list = rectificationOrderService.getBaseMapper().selectList(wr);
if (CollectionUtil.isNotEmpty(list)){
return CommonResponseNewUtil.failureMessage("当前农户存在其他进行中的整改单,不可重新发起");
}
}
//查询当前并网数据
LambdaQueryWrapper<AcceptanceCheck> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(AcceptanceCheck::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
AcceptanceCheck basicGridRecord = this.getBaseMapper().selectOne(wrapper);
if (!Objects.isNull(basicGridRecord)&&!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
return CommonResponseNewUtil.failureMessage("当前流程发生变化，暂时无法操作，请刷新再试");
}
String addorSubmit = hygfRectificationOrder.getAddorSubmit();;
LambdaUpdateWrapper<AcceptanceCheck> qu = new LambdaUpdateWrapper();
qu.eq(AcceptanceCheck::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
if (!Objects.isNull(basicGridRecord) && null != basicGridRecord.getRectificationStatus() && !basicGridRecord.getRectificationStatus().contains(hygfRectificationOrder.getRectificationSource())){
qu.set(AcceptanceCheck::getRectificationStatus,basicGridRecord.getRectificationStatus()+","+hygfRectificationOrder.getRectificationSource());
this.update(null,qu);
}else if (!Objects.isNull(basicGridRecord) && null == basicGridRecord.getRectificationStatus() ) {
qu.set(AcceptanceCheck::getRectificationStatus,hygfRectificationOrder.getRectificationSource());
this.update(null,qu);
}
//修改状态
if (addorSubmit.equals("0")){
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
this.update(null,qu);
}
rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
return CommonResponseNewUtil.success();
}
public ResponseModel nextTaskExcute(HygfRectificationOrder hygfRectificationOrder) {
//查询当前并网数据
LambdaQueryWrapper<AcceptanceCheck> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(AcceptanceCheck::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
AcceptanceCheck basicGridRecord = this.getBaseMapper().selectOne(wrapper);
if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.整改中.getCode());
rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
return CommonResponseNewUtil.failureMessage("当前流程发生变化，暂时无法操作，请刷新再试");
}
if (hygfRectificationOrder.getAddorSubmit().equals("0") ) {
LambdaUpdateWrapper<AcceptanceCheck> up = new LambdaUpdateWrapper<>();
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZGDSH.getCode());
up.eq(AcceptanceCheck::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
this.update(null,up);
hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.待审核.getCode());
}else {
hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.整改中.getCode());
}
rectificationOrderAuditingService.nextTaskExcute(hygfRectificationOrder);
return CommonResponseNewUtil.success();
}
public ResponseModel nextTaskAduit(HygfRectificationOrder hygfRectificationOrder) {
String auditResult = hygfRectificationOrder.getAuditResult();
//查询当前并网数据
LambdaQueryWrapper<AcceptanceCheck> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(AcceptanceCheck::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
AcceptanceCheck basicGridRecord = this.getBaseMapper().selectOne(wrapper);
if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
return CommonResponseNewUtil.failureMessage("当前流程发生变化，暂时无法操作，请刷新再试");
}
//修改整改单状态
hygfRectificationOrder.setRectificationStatus(auditResult.equals("通过")?WorkOrderEnum.已完成.getCode():WorkOrderEnum.待整改.getCode());
rectificationOrderAuditingService.nextTaskAduit(hygfRectificationOrder);
//查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());
wr.notIn(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待提交","已作废","已完成"));
wr.ne(BaseEntity::getSequenceNbr,hygfRectificationOrder.getSequenceNbr());
List<HygfRectificationOrder> list = rectificationOrderService.getBaseMapper().selectList(wr);
//修改并网状态
//片区不存在并行 无需复杂判断 工程与设计并行 需要做额外逻辑判断
if (auditResult.equals("通过")){
if (hygfRectificationOrder.getRectificationSource().equals("ys-area")){
LambdaUpdateWrapper<AcceptanceCheck> qu = new LambdaUpdateWrapper();
qu.eq(AcceptanceCheck::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.PQYYDSH.getCode());
qu.set(AcceptanceCheck::getRectificationStatus,null);
this.update(null,qu);
}else if (hygfRectificationOrder.getRectificationSource().equals("ys-fawu") || hygfRectificationOrder.getRectificationSource().equals("ys-tourong")) {
LambdaUpdateWrapper<AcceptanceCheck> qu = new LambdaUpdateWrapper();
qu.eq(AcceptanceCheck::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
List<String> status = new ArrayList<>(Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
status.remove(hygfRectificationOrder.getRectificationSource());
if(status.size()<1){
qu.set(AcceptanceCheck::getRectificationStatus,null);
}else {
qu.set(AcceptanceCheck::getRectificationStatus,String.join(",",status));
}
if (CollectionUtil.isEmpty(list)) {
//若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() )
&& Objects.isNull(basicGridRecord.getPowerStationFinancingStatus())){
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ROLESDSH.getCode());
}else if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() ) ){
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.SJDSH.getCode());
}else {
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.GCDSH.getCode());
}
}else {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
}
this.update(null,qu);
}else {
LambdaUpdateWrapper<AcceptanceCheck> qu = new LambdaUpdateWrapper();
qu.eq(AcceptanceCheck::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZCDSH.getCode());
qu.set(AcceptanceCheck::getRectificationStatus,null);
this.update(null,qu);
}
}else {
//驳回的时候 也需根据 工程或者设计 整改单状态修改并网状态
LambdaUpdateWrapper<AcceptanceCheck> qu = new LambdaUpdateWrapper();
qu.eq(AcceptanceCheck::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
if (CollectionUtil.isEmpty(list)) {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
}else {
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}
this.update(null,qu);
}
return CommonResponseNewUtil.success();
}
public ResponseModel rollback(Long sequenceNbr) {
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectById(sequenceNbr);
//查询当前并网数据
LambdaQueryWrapper<AcceptanceCheck> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(AcceptanceCheck::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
AcceptanceCheck basicGridRecord = this.getBaseMapper().selectOne(wrapper);
if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
return CommonResponseNewUtil.failureMessage("当前流程发生变化，暂时无法操作，请刷新再试");
}
LambdaUpdateWrapper<AcceptanceCheck> qu = new LambdaUpdateWrapper();
qu.eq(AcceptanceCheck::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
if (hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待提交.getCode()) ||
hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待整改.getCode())){
rectificationOrderAuditingService.rollback(sequenceNbr);
List<String> status = new ArrayList<>(Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
status.remove(hygfRectificationOrder.getRectificationSource());
if(status.size()<1){
qu.set(AcceptanceCheck::getRectificationStatus,null);
}else {
qu.set(AcceptanceCheck::getRectificationStatus, String.join(",", status));
this.getBaseMapper().update(null, qu);
}
}else {
return CommonResponseNewUtil.failureMessage("仅单据状态为待提交或待整改时方可作废");
}
if (hygfRectificationOrder.getRectificationSource().equals("ys-area")){
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.PQYYDSH.getCode());
} else if (hygfRectificationOrder.getRectificationSource().equals("ys-fawu") || hygfRectificationOrder.getRectificationSource().equals("ys-tourong")){
//查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());
wr.notIn(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待提交","已作废","已完成"));
wr.ne(BaseEntity::getSequenceNbr,hygfRectificationOrder.getSequenceNbr());
List<HygfRectificationOrder> list = rectificationOrderService.getBaseMapper().selectList(wr);
if (CollectionUtil.isEmpty(list)) {
//若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() )
&& Objects.isNull(basicGridRecord.getPowerStationFinancingStatus())){
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ROLESDSH.getCode());
}else if (Objects.isNull(basicGridRecord.getPowerStationLegalStatus() ) ){
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.SJDSH.getCode());
}else {
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.GCDSH.getCode());
}
}else {
List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
}
}else {
qu.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZCDSH.getCode());
}
this.update(null,qu);
return CommonResponseNewUtil.success();
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment