Skip to content

A
amos-boot-biz
Commit 2d3b9313 authored by 李秀明's avatar 李秀明
Browse files
Options

驳回生成整改单代码提交

parent f5a53321
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 34 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/BasicGridAcceptancEnum.java
View file @ 2d3b9313
......@@ -14,10 +14,14 @@ public enum BasicGridAcceptancEnum {
并网管理端工程审核("hygf_bw2", "hygf_bw2"),
经销商工程提交验收("hygf_ys1", "hygf_ys1"),
管理端投融审核("hygf_ys2", "hygf_ys2"),
经销商投融整改("hygf_zg_tr", "hygf_zg_tr"),
管理端法务审核("hygf_ys3", "hygf_ys3"),
经销商法务整改("hygf_zg_fw", "hygf_zg_fw"),
管理端工程审核("hygf_ys4", "hygf_ys4"),
经销商工程整改("hygf_zg_gc", "hygf_zg_gc"),
管理端工程是否线下("hygf_ys5", "hygf_ys5"),
管理端工程线下验("hygf_ys6", "hygf_ys6");
管理端工程线下验("hygf_ys6", "hygf_ys6"),
经销商线下整改("hygf_zg_xx", "hygf_zg_xx");
/**
* 名称，描述
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java
View file @ 2d3b9313
......@@ -5,19 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.BasicGridAcceptancEnum;
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.Enum.*;
import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckItemMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfOnGridMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAcceptanceService;
import com.yeejoin.amos.boot.module.hygf.api.service.IHygfOnGridService;
import lombok.extern.slf4j.Slf4j;
......@@ -26,8 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.foundation.utils.DateUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
......@@ -47,6 +40,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
WorkflowImpl workflow;
@Autowired
AcceptanceCheckItemMapper acceptanceCheckItemMapper;
@Autowired
AcceptanceRectificationOrderMapper acceptanceRectificationOrderMapper;
private final String OK ="0";
private final String PASS ="1";
......@@ -141,52 +136,79 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
@Transactional
public void execute(AcceptanceCheckItem dto,String userId){
public void execute(AcceptanceCheckItem dto,String userId) {
//查询并网审批信息
BasicGridAcceptance basicGridAcceptanc= basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
String old= basicGridAcceptanc.getNextNodeKey();
if(OK.equals(dto.getApprovalStatus())){
if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
String nextNodeKey = basicGridAcceptanc.getNextNodeKey();
if (OK.equals(dto.getApprovalStatus())) {
if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
basicGridAcceptanc.setGridStatus(GridStatusEnum.YWC.getCode());
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待提交验收.getCode());
//并网时间
LambdaUpdateWrapper<HygfOnGrid> upq=new LambdaUpdateWrapper();
upq.eq(HygfOnGrid::getSequenceNbr,dto.getFonGridId());
LambdaUpdateWrapper<HygfOnGrid> upq = new LambdaUpdateWrapper();
upq.eq(HygfOnGrid::getSequenceNbr, dto.getFonGridId());
upq.set(HygfOnGrid::getGridConnectionTime, new Date());
onGridMapper.update(null,upq);
} else{
onGridMapper.update(null, upq);
} else {
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(basicGridAcceptanc.getNextNodeKey(),dto.getApprovalStatus()));
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
}
}else{
if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
} else {
if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
}else {
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(basicGridAcceptanc.getNextNodeKey(),dto.getApprovalStatus()));
}
// 投融/法务/工程/线下验收审核不通过
else if (
BasicGridAcceptancEnum.经销商投融整改.getCode().equals(nextNodeKey) ||
BasicGridAcceptancEnum.经销商法务整改.getCode().equals(nextNodeKey) ||
BasicGridAcceptancEnum.经销商工程整改.getCode().equals(nextNodeKey) ||
BasicGridAcceptancEnum.经销商线下整改.getCode().equals(nextNodeKey)
) {
AcceptanceRectificationOrder rectificationOrder = new AcceptanceRectificationOrder();
try {
rectificationOrder.setRectificationOrderCode("ZGD" + DateUtil.formatDate(new Date(), DateUtil.YMDHM));
rectificationOrder.setWorkOrderId(dto.getWorkOrderId());
rectificationOrder.setWorkOrderPowerStationId(dto.getWorkOrderPowerStationId());
rectificationOrder.setPeasantHouseholdId(dto.getPeasantHouseholdId());
rectificationOrder.setProblemDescription(dto.getComment());
rectificationOrder.setRectificationStatus(String.valueOf(RectificationStatusEnum.待整改.getCode()));
} catch (Exception e) {
throw new RuntimeException(e);
}
acceptanceRectificationOrderMapper.insert(rectificationOrder);
if (nextNodeKey.equals(BasicGridAcceptancEnum.经销商投融整改.getCode())) {
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.投融验收不通过.getCode());
} else if (nextNodeKey.equals(BasicGridAcceptancEnum.经销商法务整改.getCode())) {
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.法务验收不通过.getCode());
} else if (nextNodeKey.equals(BasicGridAcceptancEnum.经销商工程整改.getCode())) {
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.工程验收不通过.getCode());
} else {
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.线下验收不通过.getCode());
}
} else {
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
}
}
if(basicGridAcceptanc.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())){
if (nextNodeKey.equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
dto.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
dto.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
dto.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());
acceptanceCheckItemMapper.insert(dto);
}
//执行工作流
StandardDto standardDto=new StandardDto();
StandardDto standardDto = new StandardDto();
standardDto.setComment(dto.getComment());
standardDto.setResult(dto.getApprovalStatus());
standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
VariableDto variable=new VariableDto();
VariableDto variable = new VariableDto();
variable.setApprovalStatus(dto.getApprovalStatus());
variable.setComment(dto.getComment());
variable.setOperationTime(dto.getOperationTime());
variable.setOperator(dto.getOperator());
standardDto.setVariable(variable);
BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptanc,standardDto,userId);
BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptanc, standardDto, userId);
// if( BasicGridAcceptancEnum.管理端工程审核.getCode().equals(old)){
//
......@@ -211,7 +233,6 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
// }
basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
}
......
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