Skip to content

A
amos-boot-zx-biz
Commit 9c87d14f authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

26854 【智信户用(管理端)】迁移工作台相关代码

parent 161531ed
Hide whitespace changes
Inline Side-by-side
Showing with 348 additions and 298 deletions
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 @ 9c87d14f
...@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl; ...@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
...@@ -16,7 +15,6 @@ import lombok.extern.slf4j.Slf4j; ...@@ -16,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.DateUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.*; import java.util.*;
...@@ -25,278 +23,296 @@ import java.util.*; ...@@ -25,278 +23,296 @@ import java.util.*;
@Service @Service
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public class BasicGridAcceptanceServiceImpl public class BasicGridAcceptanceServiceImpl
extends BaseService<BasicGridAcceptanceDto, BasicGridAcceptance, BasicGridAcceptanceMapper> extends BaseService<BasicGridAcceptanceDto, BasicGridAcceptance, BasicGridAcceptanceMapper>
implements IBasicGridAcceptanceService { implements IBasicGridAcceptanceService {
@Autowired private final String OK = "0";
BasicGridAcceptanceMapper basicGridAcceptanceMapper; private final String PASS = "5";
@Autowired @Autowired
HygfOnGridMapper onGridMapper; BasicGridAcceptanceMapper basicGridAcceptanceMapper;
@Autowired @Autowired
PersonnelBusinessMapper personnelBusinessMapper; HygfOnGridMapper onGridMapper;
@Autowired @Autowired
WorkflowImpl workflow; PersonnelBusinessMapper personnelBusinessMapper;
@Autowired @Autowired
AcceptanceCheckItemMapper acceptanceCheckItemMapper; WorkflowImpl workflow;
@Autowired @Autowired
AcceptanceRectificationOrderMapper acceptanceRectificationOrderMapper; AcceptanceCheckItemMapper acceptanceCheckItemMapper;
@Autowired @Autowired
RegionalCompaniesMapper regionalCompaniesMapper; AcceptanceRectificationOrderMapper acceptanceRectificationOrderMapper;
@Autowired @Autowired
WorkOrderMapper workOrderMapper; RegionalCompaniesMapper regionalCompaniesMapper;
@Autowired
WorkOrderMapper workOrderMapper;
@Autowired
PeasantHouseholdMapper peasantHouseholdMapper;
@Autowired
private CommonServiceImpl commonService;
@Autowired public Page<BasicGridAcceptanceDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
PeasantHouseholdMapper peasantHouseholdMapper; String projectAddress, String powerStationCode, String ownersName, String gridStatus,
@Autowired String gridConnectionTime, String formType) throws Exception {
private CommonServiceImpl commonService; PageHelper.startPage(current, size);
Map<String, Object> map = new HashMap<>();
private final String OK = "0"; Date date = null;
private final String PASS = "5";
public Page<BasicGridAcceptanceDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
String projectAddress, String powerStationCode, String ownersName, String gridStatus,
String gridConnectionTime, String formType) throws Exception {
PageHelper.startPage(current, size);
Map<String, Object> map = new HashMap<>();
Date date = null;
// if (StringUtils.isNotEmpty(gridConnectionTime)) { // if (StringUtils.isNotEmpty(gridConnectionTime)) {
// date = DateUtil.formatStringToDate(gridConnectionTime, "yyyy-MM-dd HH:mm:ss"); // date = DateUtil.formatStringToDate(gridConnectionTime, "yyyy-MM-dd HH:mm:ss");
// } // }
map.put("projectAddress", projectAddress); map.put("projectAddress", projectAddress);
map.put("powerStationCode", powerStationCode); map.put("powerStationCode", powerStationCode);
map.put("ownersName", ownersName); map.put("ownersName", ownersName);
map.put("gridStatus", gridStatus); map.put("gridStatus", gridStatus);
map.put("gridConnectionTime", gridConnectionTime); map.put("gridConnectionTime", gridConnectionTime);
map.put("formType", formType); map.put("formType", formType);
map.put("regionCompanyId", regionCompanyId); map.put("regionCompanyId", regionCompanyId);
map.put("amosDealerId", amosDealerId); map.put("amosDealerId", amosDealerId);
List<BasicGridAcceptanceDto> list = basicGridAcceptanceMapper.selectPageList(map); List<BasicGridAcceptanceDto> list = basicGridAcceptanceMapper.selectPageList(map);
PageInfo<BasicGridAcceptanceDto> page = new PageInfo(list); PageInfo<BasicGridAcceptanceDto> page = new PageInfo(list);
Page<BasicGridAcceptanceDto> pageNew = new Page<>(); Page<BasicGridAcceptanceDto> pageNew = new Page<>();
pageNew.setCurrent(current); pageNew.setCurrent(current);
pageNew.setTotal(page.getTotal()); pageNew.setTotal(page.getTotal());
pageNew.setSize(size); pageNew.setSize(size);
pageNew.setRecords(page.getList()); pageNew.setRecords(page.getList());
return pageNew; return pageNew;
} }
public HygfOnGrid saveEntity(HygfOnGrid grid) { public HygfOnGrid saveEntity(HygfOnGrid grid) {
if (grid.getSequenceNbr() != null) { if (grid.getSequenceNbr() != null) {
onGridMapper.updateById(grid); onGridMapper.updateById(grid);
} else { } else {
onGridMapper.insert(grid); onGridMapper.insert(grid);
} }
return grid; return grid;
} }
@Transactional @Transactional
public HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) { public HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper
.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>() .selectOne(new LambdaQueryWrapper<BasicGridAcceptance>()
.eq(BasicGridAcceptance::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId())); .eq(BasicGridAcceptance::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
basicGridAcceptance.setGridStatus(GridStatusEnum.DSH.getCode()); basicGridAcceptance.setGridStatus(GridStatusEnum.DSH.getCode());
if (grid.getType() != null && "1".equals(grid.getType())) { if (grid.getType() != null && "1".equals(grid.getType())) {
// 执行工作流 // 执行工作流
StandardDto standardDto = new StandardDto(); StandardDto standardDto = new StandardDto();
standardDto.setTaskId(basicGridAcceptance.getNextTaskId()); standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
workflow.standard(basicGridAcceptance, standardDto, userId); workflow.standard(basicGridAcceptance, standardDto, userId);
} else { } else {
// 调用工作流执行第一个节点 // 调用工作流执行第一个节点
ProcessDto processDto = new ProcessDto(); ProcessDto processDto = new ProcessDto();
processDto.setProcessDefinitionKey("hygf_bwys"); processDto.setProcessDefinitionKey("hygf_bwys");
processDto.setBusinessKey(String.valueOf(basicGridAcceptance.getSequenceNbr())); processDto.setBusinessKey(String.valueOf(basicGridAcceptance.getSequenceNbr()));
StartProcessDto startProcessDto = new StartProcessDto(); StartProcessDto startProcessDto = new StartProcessDto();
List<ProcessDto> process = new ArrayList<>(); List<ProcessDto> process = new ArrayList<>();
process.add(processDto); process.add(processDto);
startProcessDto.setProcess(process); startProcessDto.setProcess(process);
workflow.startProcess(basicGridAcceptance, startProcessDto, userId); workflow.startProcess(basicGridAcceptance, startProcessDto, userId);
// 线上验收 // 线上验收
LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网中.getCode()); up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网中.getCode());
long idsk = basicGridAcceptance.getPeasantHouseholdId(); long idsk = basicGridAcceptance.getPeasantHouseholdId();
up.eq(PeasantHousehold::getSequenceNbr, idsk); up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up); peasantHouseholdMapper.update(null, up);
} }
if (grid.getSequenceNbr() != null) { if (grid.getSequenceNbr() != null) {
onGridMapper.updateById(grid); onGridMapper.updateById(grid);
} else { } else {
onGridMapper.insert(grid); onGridMapper.insert(grid);
} }
basicGridAcceptanceMapper.updateById(basicGridAcceptance); basicGridAcceptanceMapper.updateById(basicGridAcceptance);
//发起待办 //发起待办
// commonService.buildTaskModel(buildBWYSTaskModel(grid, basicGridAcceptance)); // commonService.buildTaskModel(buildBWYSTaskModel(grid, basicGridAcceptance));
return grid; return grid;
} }
private List<TaskModelDto> buildBWYSTaskModel(HygfOnGrid grid, BasicGridAcceptance basicGridAcceptance) { private List<TaskModelDto> buildBWYSTaskModel(HygfOnGrid grid, BasicGridAcceptance basicGridAcceptance) {
List<TaskModelDto> taskModelDtoList = new ArrayList<>(); List<TaskModelDto> taskModelDtoList = new ArrayList<>();
TaskModelDto taskModelDto = new TaskModelDto(); TaskModelDto taskModelDto = new TaskModelDto();
taskModelDto.setFlowCode(basicGridAcceptance.getNextTaskId()); taskModelDto.setFlowCode(basicGridAcceptance.getNextTaskId());
taskModelDto.setFlowCreateDate(new Date()); taskModelDto.setFlowCreateDate(new Date());
taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode()); taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName()); taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
taskModelDto.setPageType(null); taskModelDto.setPageType(null);
taskModelDto.setExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds()); taskModelDto.setExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
taskModelDto.setModel(grid); taskModelDto.setModel(grid);
taskModelDto.setRelationId(basicGridAcceptance.getInstanceId()); taskModelDto.setRelationId(basicGridAcceptance.getInstanceId());
taskModelDto.setRoutePath(null); taskModelDto.setRoutePath(null);
taskModelDto.setStartUserId(basicGridAcceptance.getRecUserId()); taskModelDto.setStartUserId(basicGridAcceptance.getRecUserId());
taskModelDto.setStartUser(basicGridAcceptance.getRecUserName()); taskModelDto.setStartUser(basicGridAcceptance.getRecUserName());
taskModelDto.setStartDate(basicGridAcceptance.getRecDate()); taskModelDto.setStartDate(basicGridAcceptance.getRecDate());
taskModelDto.setStartUserCompanyName(null); taskModelDto.setStartUserCompanyName(null);
taskModelDto.setTaskName(basicGridAcceptance.getNextNodeName()); taskModelDto.setTaskName(basicGridAcceptance.getNextNodeName());
taskModelDto.setTaskCode(String.valueOf(basicGridAcceptance.getWorkOrderId())); taskModelDto.setTaskCode(String.valueOf(basicGridAcceptance.getWorkOrderId()));
taskModelDto.setTaskType(BusinessTypeEnum.HYGF_BWYS.getCode()); taskModelDto.setTaskType(BusinessTypeEnum.HYGF_BWYS.getCode());
taskModelDto.setTaskTypeLabel(BusinessTypeEnum.HYGF_BWYS.getName()); taskModelDto.setTaskTypeLabel(BusinessTypeEnum.HYGF_BWYS.getName());
taskModelDto.setTaskStatus(TaskStatusEnum.UNDERWAY.getValue()); taskModelDto.setTaskStatus(TaskStatusEnum.UNDERWAY.getValue());
taskModelDto.setTaskStatusLabel(TaskStatusEnum.UNDERWAY.getName()); taskModelDto.setTaskStatusLabel(TaskStatusEnum.UNDERWAY.getName());
// taskModelDto.setTaskDesc(); // taskModelDto.setTaskDesc();
// taskModelDto.setTaskContent(); // taskModelDto.setTaskContent();
taskModelDto.setNextExecuteUser(basicGridAcceptance.getNextExecutorIds()); taskModelDto.setNextExecuteUser(basicGridAcceptance.getNextExecutorIds());
taskModelDtoList.add(taskModelDto); taskModelDtoList.add(taskModelDto);
return taskModelDtoList; return taskModelDtoList;
}
} public HygfOnGrid modifyEntity(HygfOnGrid grid) {
onGridMapper.updateById(grid);
return grid;
}
public HygfOnGrid modifyEntity(HygfOnGrid grid) { public Boolean deleteForBatch(Long[] sequenceNbrs) {
onGridMapper.updateById(grid); if (Objects.isNull(sequenceNbrs) || sequenceNbrs.length == 0) {
return grid; return false;
} }
Boolean bool = Boolean.TRUE;
Collection<HygfOnGrid> grids = onGridMapper.selectBatchIds(Arrays.asList(sequenceNbrs));
for (HygfOnGrid x : grids) {
x.setIsDelete(true);
int num = onGridMapper.updateById(x);
BasicGridAcceptance acceptance = basicGridAcceptanceMapper
.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>()
.eq(BasicGridAcceptance::getWorkOrderPowerStationId, x.getWorkOrderPowerStationId()));
acceptance.setIsDelete(true);
int count = basicGridAcceptanceMapper.updateById(acceptance);
if (0 == num || 0 == count) {
bool = Boolean.FALSE;
break;
}
}
return bool;
}
public Boolean deleteForBatch(Long[] sequenceNbrs) { @Transactional
if (Objects.isNull(sequenceNbrs) || sequenceNbrs.length == 0) { public void execute(AcceptanceCheckItem dto, String userId) {
return false; // 查询并网审批信息
} BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
Boolean bool = Boolean.TRUE; String nextNodeKey = basicGridAcceptanc.getNextNodeKey();
Collection<HygfOnGrid> grids = onGridMapper.selectBatchIds(Arrays.asList(sequenceNbrs)); if (OK.equals(dto.getApprovalStatus())) {
for (HygfOnGrid x : grids) { if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
x.setIsDelete(true); basicGridAcceptanc.setGridStatus(GridStatusEnum.YWC.getCode());
int num = onGridMapper.updateById(x); basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待提交验收.getCode());
BasicGridAcceptance acceptance = basicGridAcceptanceMapper // 并网时间
.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>() LambdaUpdateWrapper<HygfOnGrid> upq = new LambdaUpdateWrapper();
.eq(BasicGridAcceptance::getWorkOrderPowerStationId, x.getWorkOrderPowerStationId())); upq.eq(HygfOnGrid::getSequenceNbr, dto.getFonGridId());
acceptance.setIsDelete(true); upq.set(HygfOnGrid::getGridConnectionTime, new Date());
int count = basicGridAcceptanceMapper.updateById(acceptance); onGridMapper.update(null, upq);
if (0 == num || 0 == count) { // 并网完成
bool = Boolean.FALSE; LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
break; up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
} long idsk = basicGridAcceptanc.getPeasantHouseholdId();
} up.eq(PeasantHousehold::getSequenceNbr, idsk);
return bool; peasantHouseholdMapper.update(null, up);
}
@Transactional } else {
public void execute(AcceptanceCheckItem dto, String userId) {
// 查询并网审批信息
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());
upq.set(HygfOnGrid::getGridConnectionTime, new Date());
onGridMapper.update(null, upq);
// 并网完成
LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
long idsk = basicGridAcceptanc.getPeasantHouseholdId();
up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up);
} else { basicGridAcceptanc
.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
}
basicGridAcceptanc } else {
.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus())); if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
} basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, 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 {
WorkOrder workOrder = workOrderMapper.selectById(basicGridAcceptanc.getWorkOrderId());
RegionalCompanies regionalCompanies = regionalCompaniesMapper
.selectRegionName(workOrder.getRegionCompanyId());
String code = NumberUtil.getCode(CodeEnum.整改单.getCode(), regionalCompanies.getCompanyCode(),
regionalCompanies.getRegionalAddress());
rectificationOrder.setRectificationOrderCode(code);
rectificationOrder.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
rectificationOrder.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
rectificationOrder.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());
rectificationOrder.setProblemDescription(dto.getComment());
rectificationOrder.setRectificationStatus(String.valueOf(RectificationStatusEnum.待整改.getCode()));
} catch (Exception e) {
throw new RuntimeException(e);
}
acceptanceRectificationOrderMapper.insert(rectificationOrder);
basicGridAcceptanc
.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
} else {
basicGridAcceptanc
.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
}
}
} else { if (nextNodeKey.equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) { dto.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode()); dto.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus())); dto.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());
} acceptanceCheckItemMapper.insert(dto);
// 投融/法务/工程/线下验收审核不通过 }
else if (BasicGridAcceptancEnum.管理端投融审核.getCode().equals(nextNodeKey) // 执行工作流
|| BasicGridAcceptancEnum.管理端法务审核.getCode().equals(nextNodeKey) StandardDto standardDto = new StandardDto();
|| BasicGridAcceptancEnum.管理端工程审核.getCode().equals(nextNodeKey) standardDto.setComment(dto.getComment());
|| BasicGridAcceptancEnum.管理端工程线下验.getCode().equals(nextNodeKey)) { standardDto.setResult(dto.getApprovalStatus());
AcceptanceRectificationOrder rectificationOrder = new AcceptanceRectificationOrder(); standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
try { VariableDto variable = new VariableDto();
WorkOrder workOrder = workOrderMapper.selectById(basicGridAcceptanc.getWorkOrderId()); variable.setApprovalStatus(dto.getApprovalStatus());
RegionalCompanies regionalCompanies = regionalCompaniesMapper variable.setComment(dto.getComment());
.selectRegionName(workOrder.getRegionCompanyId()); variable.setOperationTime(dto.getOperationTime());
String code = NumberUtil.getCode(CodeEnum.整改单.getCode(), regionalCompanies.getCompanyCode(), variable.setOperator(dto.getOperator());
regionalCompanies.getRegionalAddress()); standardDto.setVariable(variable);
rectificationOrder.setRectificationOrderCode(code); BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptanc, standardDto, userId);
rectificationOrder.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
rectificationOrder.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
rectificationOrder.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());
rectificationOrder.setProblemDescription(dto.getComment());
rectificationOrder.setRectificationStatus(String.valueOf(RectificationStatusEnum.待整改.getCode()));
} catch (Exception e) {
throw new RuntimeException(e);
}
acceptanceRectificationOrderMapper.insert(rectificationOrder);
basicGridAcceptanc
.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
} else {
basicGridAcceptanc
.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
}
}
if (nextNodeKey.equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) { if (workBasicGridAcceptance.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
dto.setWorkOrderId(basicGridAcceptanc.getWorkOrderId()); // 线下验收
dto.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId()); LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
dto.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId()); up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.线下验收.getCode());
acceptanceCheckItemMapper.insert(dto); long idsk = basicGridAcceptanc.getPeasantHouseholdId();
} up.eq(PeasantHousehold::getSequenceNbr, idsk);
// 执行工作流 peasantHouseholdMapper.update(null, up);
StandardDto standardDto = new StandardDto(); }
standardDto.setComment(dto.getComment());
standardDto.setResult(dto.getApprovalStatus());
standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
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);
if (workBasicGridAcceptance.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) { // 验收完成
// 线下验收 System.out.println("验收完成===============================" + workBasicGridAcceptance.getNextTaskId());
LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>(); System.out.println("验收完成888888===============================" + workBasicGridAcceptance.getAcceptanceStatus());
up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.线下验收.getCode());
long idsk = basicGridAcceptanc.getPeasantHouseholdId();
up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up);
}
// 验收完成 if ("10".equals(workBasicGridAcceptance.getAcceptanceStatus())) {
System.out.println("验收完成===============================" + workBasicGridAcceptance.getNextTaskId()); // 更新状态
System.out.println("验收完成888888===============================" + workBasicGridAcceptance.getAcceptanceStatus()); LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.验收完成.getCode());
long idsk = basicGridAcceptanc.getPeasantHouseholdId();
up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up);
if ("10".equals(workBasicGridAcceptance.getAcceptanceStatus())) { }
// 更新状态
LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.验收完成.getCode());
long idsk = basicGridAcceptanc.getPeasantHouseholdId();
up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up);
} basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
//更新待办
// commonService.updateTaskModelNew(buildBWYSUpdateTaskModel(basicGridAcceptanc,dto));
}
basicGridAcceptanceMapper.updateById(workBasicGridAcceptance); private Map<String, Object> buildBWYSUpdateTaskModel(BasicGridAcceptance basicGridAcceptance, AcceptanceCheckItem acceptanceCheckItem) {
} Map<String, Object> map = new HashMap<>();
if (OK.equals(acceptanceCheckItem.getApprovalStatus())) {
map.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
} else {
map.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
map.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
map.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
map.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
}
map.put("model", acceptanceCheckItem);
map.put("relationId", basicGridAcceptance.getInstanceId());
return map;
}
} }
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java
View file @ 9c87d14f
...@@ -217,6 +217,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina ...@@ -217,6 +217,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
financingInfo.setFinancingCompaniesName(null); financingInfo.setFinancingCompaniesName(null);
this.updateById(financingInfo); this.updateById(financingInfo);
} }
//停止流程
// commonService.rollbackTask();
} }
@Override @Override
...@@ -313,8 +315,27 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina ...@@ -313,8 +315,27 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
financingRectificationOrder.setResponsibleUserPhone(params.getOrDefault("responsibleUserPhone", "").toString()); financingRectificationOrder.setResponsibleUserPhone(params.getOrDefault("responsibleUserPhone", "").toString());
financingRectificationOrderService.save(financingRectificationOrder); financingRectificationOrderService.save(financingRectificationOrder);
} }
//更新待办
// commonService.updateTaskModelNew(buildDZTRZUpdateTaskParams(params,financingAuditing));
}
private Map<String, Object> buildDZTRZUpdateTaskParams(Map<String, Object> params, FinancingAuditing financingAuditing) {
Map<String, Object> map = new HashMap<>();
if ("0".equals(params.get("approvalStatus"))) {
map.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
} else {
map.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
map.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
map.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
map.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
}
map.put("model", financingAuditing);
map.put("relationId", financingAuditing.getInstanceId());
return map;
} }
public List<Map<String, Object>> selectOrgList() { public List<Map<String, Object>> selectOrgList() {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java
View file @ 9c87d14f
...@@ -677,7 +677,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit ...@@ -677,7 +677,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
dealerReviewService.saveDealerReview(dealerReview, false, true, unitInfo.getName(), approvalStatue); dealerReviewService.saveDealerReview(dealerReview, false, true, unitInfo.getName(), approvalStatue);
this.saveOrUpdate(unitInfo); this.saveOrUpdate(unitInfo);
//更新待办
// commonService.updateTaskModelNew(buildJXSSHUpdateTaskModel(basicGridAcceptance, unitInfo, kv));
} catch (Exception e) { } catch (Exception e) {
...@@ -704,7 +705,6 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit ...@@ -704,7 +705,6 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
} }
// // 2.更新审核记录表 // // 2.更新审核记录表
// UnitInfo unitInfo=null; // UnitInfo unitInfo=null;
// try{ // try{
...@@ -815,6 +815,24 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit ...@@ -815,6 +815,24 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
return code; return code;
} }
private Map<String, Object> buildJXSSHUpdateTaskModel(BasicGridAcceptance basicGridAcceptance, UnitInfo unitInfo, Map<String, Object> params) {
Map<String, Object> map = new HashMap<>();
if ("0".equals(params.get("approvalStatus"))) {
map.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
} else {
map.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
map.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
map.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
map.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
}
map.put("model", unitInfo);
map.put("relationId", basicGridAcceptance.getInstanceId());
return map;
}
@Override @Override
public IPage<CompanyDto> getCompanyDto(CompanyDto dto) { public IPage<CompanyDto> getCompanyDto(CompanyDto dto) {
//列表数据组装 //列表数据组装
...@@ -921,67 +939,62 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit ...@@ -921,67 +939,62 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
commerceInfoMapper.updateById(commerceInfo); commerceInfoMapper.updateById(commerceInfo);
//区域公司 //区域公司
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>(); LambdaQueryWrapper<RegionalCompanies> qu = new LambdaQueryWrapper<>();
qu.eq(RegionalCompanies::getUnitId,unitInfo.getAmosCompanySeq()); qu.eq(RegionalCompanies::getUnitId, unitInfo.getAmosCompanySeq());
List<RegionalCompanies> oldList = regionalCompaniesMapper.selectList(qu); List<RegionalCompanies> oldList = regionalCompaniesMapper.selectList(qu);
regionalCompaniesMapper.delete(qu); regionalCompaniesMapper.delete(qu);
List<RegionalCompanies> regionalComp= new ArrayList<>(); List<RegionalCompanies> regionalComp = new ArrayList<>();
FeignClientResult<Collection<CompanyModel>> feignClientResult= Privilege.companyClient.querySubAgencyTree(regionalCompanies); FeignClientResult<Collection<CompanyModel>> feignClientResult = Privilege.companyClient.querySubAgencyTree(regionalCompanies);
List<CompanyModel> companyModel = (List<CompanyModel>)feignClientResult.getResult(); List<CompanyModel> companyModel = (List<CompanyModel>) feignClientResult.getResult();
List<String> lisd=unitInfo.getRegionalCompaniesSeq(); List<String> lisd = unitInfo.getRegionalCompaniesSeq();
if(oldList==null) {
oldList = new ArrayList<>();
}
if(companyModel!=null&&!companyModel.isEmpty()&&lisd!=null&&!lisd.isEmpty()){
for (Object aLong : lisd) {
RegionalCompanies oldRe = oldList.stream().filter(s -> Objects.equals(s.getRegionalCompaniesSeq().toString(), aLong.toString())).findFirst().orElse(null);
if(oldRe!= null) {
lisk.add(oldRe.getRegionalCompaniesCode());
regionalComp.add(oldRe);
}else {
for (CompanyModel compan : companyModel) {
if(compan.getSequenceNbr().longValue()==Long.valueOf(aLong.toString()).longValue()){
RegionalCompanies re= new RegionalCompanies(Long.valueOf(aLong.toString()), compan.getCompanyName(), compan.getOrgCode(), unitInfo.getAmosCompanySeq(),unitInfo.getSequenceNbr());
lisk.add(compan.getOrgCode());
regionalComp.add(re);
continue;
}
}
}
}
}
if (oldList == null) {
oldList = new ArrayList<>();
}
if (companyModel != null && !companyModel.isEmpty() && lisd != null && !lisd.isEmpty()) {
for (Object aLong : lisd) {
RegionalCompanies oldRe = oldList.stream().filter(s -> Objects.equals(s.getRegionalCompaniesSeq().toString(), aLong.toString())).findFirst().orElse(null);
if (oldRe != null) {
lisk.add(oldRe.getRegionalCompaniesCode());
regionalComp.add(oldRe);
} else {
for (CompanyModel compan : companyModel) {
if (compan.getSequenceNbr().longValue() == Long.valueOf(aLong.toString()).longValue()) {
RegionalCompanies re = new RegionalCompanies(Long.valueOf(aLong.toString()), compan.getCompanyName(), compan.getOrgCode(), unitInfo.getAmosCompanySeq(), unitInfo.getSequenceNbr());
lisk.add(compan.getOrgCode());
regionalComp.add(re);
continue;
}
}
}
}
}
regionalCompaniesService.saveBatch(regionalComp);
//修改管理员权限 regionalCompaniesService.saveBatch(regionalComp);
//管理员绑定角色权限
LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
uo.eq(StdUserEmpower::getAmosUserId,unitInfo.getAdminUserId());
StdUserEmpower stdUserEmpower= userEmpowerMapper.selectOne(uo);
if(stdUserEmpower!=null){ //修改管理员权限
stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId()); //管理员绑定角色权限
stdUserEmpower.setAmosOrgCode(lisk); LambdaQueryWrapper<StdUserEmpower> uo = new LambdaQueryWrapper();
userEmpowerMapper.updateById(stdUserEmpower); uo.eq(StdUserEmpower::getAmosUserId, unitInfo.getAdminUserId());
}else{ StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(uo);
stdUserEmpower=new StdUserEmpower();
stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
stdUserEmpower.setAmosOrgCode(lisk);
stdUserEmpower.setPermissionType("HYGF");
userEmpowerMapper.insert(stdUserEmpower);
}
if (stdUserEmpower != null) {
stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
stdUserEmpower.setAmosOrgCode(lisk);
userEmpowerMapper.updateById(stdUserEmpower);
} else {
stdUserEmpower = new StdUserEmpower();
stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
stdUserEmpower.setAmosOrgCode(lisk);
stdUserEmpower.setPermissionType("HYGF");
userEmpowerMapper.insert(stdUserEmpower);
}
return true; return true;
......
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