Skip to content

A
amos-boot-biz
Commit d5feb64e authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

管道变更/单位变更

parent bbd598fc
Show whitespace changes
Inline Side-by-side
Showing with 173 additions and 264 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationManageMapper.java
View file @ d5feb64e
...@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage; import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
import com.yeejoin.amos.boot.module.jg.api.vo.IdxBizJgProjectContraptionVO;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo; import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.CertificateVo; import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.CertificateVo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -39,7 +39,7 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat ...@@ -39,7 +39,7 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
List<Map<String, String>> initVehicleUseRegCodeIntoRedis(@Param("year") String year); List<Map<String, String>> initVehicleUseRegCodeIntoRedis(@Param("year") String year);
Page<IdxBizJgProjectContraptionVO> queryForUnitByProjectContraptionPage(@Param("page") Page<IdxBizJgProjectContraptionVO> page, Page<IdxBizJgProjectContraption> queryForUnitByProjectContraptionPage(@Param("page") Page<IdxBizJgProjectContraption> page,
@Param("dto") Map<String, String> params, @Param("dto") Map<String, String> params,
@Param("sort") SortVo sortMap); @Param("sort") SortVo sortMap);
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/IdxBizJgProjectContraptionVO.java deleted 100644 → 0
View file @ bbd598fc
package com.yeejoin.amos.boot.module.jg.api.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@ApiModel(value = "IdxBizJgProjectContraptionVO", description = "装置VO实体类")
public class IdxBizJgProjectContraptionVO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
private String sequenceNbr;
@ApiModelProperty(value = "更新时间")
private Date recDate;
@ApiModelProperty(value = "工程装置名称")
private String projectContraption;
@ApiModelProperty(value = "工程装置编号")
private String projectContraptionNo;
@ApiModelProperty(value = "使用单位统一信用代码")
private String useUnitCreditCode;
@ApiModelProperty(value = "使用单位名称")
private String useUnitName;
@ApiModelProperty(value = "施工单位统一信用代码")
private String uscUnitCreditCode;
@ApiModelProperty(value = "施工单位名称")
private String uscUnitName;
@ApiModelProperty(value = "设备种类名称")
private String equListName;
@ApiModelProperty(value = "设备种类")
private String equList;
@ApiModelProperty(value = "设备类别名称")
private String equCategoryName;
@ApiModelProperty(value = "设备代码")
private String equCategory;
@ApiModelProperty(value = "设备品种名称")
private String equDefineName;
@ApiModelProperty(value = "设备品种")
private String equDefine;
@ApiModelProperty(value = "装置管道总长度(m)")
private Double pipelineLength;
@ApiModelProperty(value = "产品照片附件")
private String productPhoto;
@ApiModelProperty(value = "其他附件")
private String otherAccessories;
@ApiModelProperty(value = "属地监管单位代码")
private String orgCode;
@ApiModelProperty(value = "属地监管单位名称")
private String orgName;
@ApiModelProperty(value = "产品质量合格证明")
private String productQualificationCertificate;
@ApiModelProperty(value = "监管码")
private String supervisoryCode;
@ApiModelProperty(value = "使用登记证编号")
private String useRegistrationCode;
@ApiModelProperty(value = "数据来源（新增：0、导入：1、复制：复制数据的id 、jg:从监管加入的设备）")
private String dataSource;
@ApiModelProperty(value = "数据来源名称")
private String dataSourceName;
@ApiModelProperty(value = "使用地址")
private String fullAddress;
@ApiModelProperty(value = "工程装置设备代码")
private String equCode;
@ApiModelProperty(value = "设备使用地址")
private String equUseAddress;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml
View file @ d5feb64e
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
</select> </select>
<select id="queryForUnitByProjectContraptionPage" <select id="queryForUnitByProjectContraptionPage"
resultType="com.yeejoin.amos.boot.module.jg.api.vo.IdxBizJgProjectContraptionVO"> resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption">
SELECT SELECT
ibjpc.*,tjurm.equ_use_address ibjpc.*,tjurm.equ_use_address
FROM FROM
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java
View file @ d5feb64e
...@@ -6,10 +6,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo; ...@@ -6,10 +6,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
import com.yeejoin.amos.boot.module.jg.api.dto.ProjectContraptionChangeDataDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum; import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.vo.IdxBizJgProjectContraptionVO;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl; import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -301,11 +298,11 @@ public class JgUseRegistrationManageController extends BaseController { ...@@ -301,11 +298,11 @@ public class JgUseRegistrationManageController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/unitChangeByProjectContraption/page") @GetMapping(value = "/unitChangeByProjectContraption/page")
@ApiOperation(httpMethod = "GET", value = "单位变更选择工程/装置分页查询", notes = "单位变更选择工程/装置分页查询") @ApiOperation(httpMethod = "GET", value = "单位变更选择工程/装置分页查询", notes = "单位变更选择工程/装置分页查询")
public ResponseModel<Page<IdxBizJgProjectContraptionVO>> queryForUnitByProjectContraptionPage(@RequestParam Map<String, String> params, public ResponseModel<Page<IdxBizJgProjectContraption>> queryForUnitByProjectContraptionPage(@RequestParam Map<String, String> params,
@RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "sort", required = false) String sort,
@RequestParam(value = "current") int current, @RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) { @RequestParam(value = "size") int size) {
Page<IdxBizJgProjectContraptionVO> page = new Page<>(); Page<IdxBizJgProjectContraption> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
if (ValidationUtil.isEmpty(params.get("originalUseUnitCreditCode"))) { if (ValidationUtil.isEmpty(params.get("originalUseUnitCreditCode"))) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
View file @ d5feb64e
...@@ -459,161 +459,164 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -459,161 +459,164 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
* @param reginParams * @param reginParams
*/ */
private void dealProjectContraptionToUpdate(String submitType, JgChangeRegistrationUnitDto noticeDto, String op, ReginParams reginParams) { private void dealProjectContraptionToUpdate(String submitType, JgChangeRegistrationUnitDto noticeDto, String op, ReginParams reginParams) {
// // 字段转换 // 字段转换
// this.convertField(noticeDto); this.convertField(noticeDto);
// // 获取单位变更装置列表 // 获取单位变更装置列表
// List<Map<String, Object>> projectContraptionList = noticeDto.getProjectContraptionList(); List<Map<String, Object>> projectContraptionList = noticeDto.getProjectContraptionList();
// if (CollectionUtils.isEmpty(projectContraptionList)) { if (CollectionUtils.isEmpty(projectContraptionList)) {
// throw new BadRequest("工程/装置列表不能为空"); throw new BadRequest("工程/装置列表不能为空");
// } }
// //根据使用登记证查询设备 //根据使用登记证查询设备
// List<Long> registrationIdList = registrationList.stream().filter(v -> v.containsKey("sequenceNbr") && List<String> registrationNoList = new ArrayList<>(); //使用登记证编号
// ObjectUtils.isNotEmpty(v.get("sequenceNbr")) && canConvertToLong(v.get("sequenceNbr").toString())) Map<String,String> useRegistrationCodeMap = new HashMap<>();
// .map(v -> Long.parseLong(v.get("sequenceNbr").toString())).collect(Collectors.toList()); for (Map<String, Object> objectMap : projectContraptionList) {
// // 获取单位变更设备列表 if (objectMap.containsKey("useRegistrationCode") && ObjectUtils.isNotEmpty(objectMap.get("useRegistrationCode"))) {
// if (CollectionUtils.isEmpty(registrationIdList)) { registrationNoList.add(objectMap.get("useRegistrationCode").toString());
// throw new BadRequest("使用登记证不能为空"); useRegistrationCodeMap.put(objectMap.get("sequenceNbr").toString(),objectMap.get("useRegistrationCode").toString());
// } }
// List<JSONObject> deviceList = registrationManageService.queryEquByCertificateSeqList(registrationIdList); }
// // 获取单位变更设备列表 //查询装置下的管道信息
// if (CollectionUtils.isEmpty(deviceList)) { List<Map<String, Object>> deviceList = this.queryPipelineList(projectContraptionList);
// throw new BadRequest("使用登记证下无设备"); if(CollUtil.isEmpty(deviceList)){
// } throw new BadRequest("工程/装置下没有管道信息");
// ArrayList<String> roleListAll = new ArrayList<>(); }
// ArrayList<String> roleListNext = new ArrayList<>(); if (SUBMIT_TYPE_FLOW.equals(submitType)) { //放在最后面防止前面有异常
// if (SUBMIT_TYPE_FLOW.equals(submitType)) { //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
// // 发起流程 CompanyBo company = reginParams.getCompany();
// if (!StringUtils.hasText(noticeDto.getInstanceId())) { deviceList.forEach(jsonObject -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
// List<ProcessTaskDTO> processTasks = new ArrayList<>(); .equipRepeatUsedCheck(String.valueOf(jsonObject.get("record")),
// ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO(); CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
// List<ActWorkflowStartDTO> list = new ArrayList<>(); company.getCompanyCode().split("_")[
// ActWorkflowStartDTO dto = new ActWorkflowStartDTO(); 1
// dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY); ] :
// dto.setBusinessKey(String.valueOf(new Date().getTime())); company.getCompanyCode()));
// dto.setCompleteFirstTask(true); }
// list.add(dto); ArrayList<String> roleListAll = new ArrayList<>();
// actWorkflowBatchDTO.setProcess(list); ArrayList<String> roleListNext = new ArrayList<>();
// dto.setNextExecuteUserCompanyCode(noticeDto.getReceiveCompanyCode()); if (SUBMIT_TYPE_FLOW.equals(submitType)) {
// processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO); // 发起流程
// String instanceId = processTasks.get(0).getProcessInstance().getId(); if (!StringUtils.hasText(noticeDto.getInstanceId())) {
// String nextTaskId = processTasks.get(0).getNextTask().get(0).getId(); List<ProcessTaskDTO> processTasks = new ArrayList<>();
// String taskname = processTasks.get(0).getNextTask().get(0).getName(); ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
// this.buildRoleList(processTasks, roleListNext, roleListAll); List<ActWorkflowStartDTO> list = new ArrayList<>();
// List<WorkflowResultDto> workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(processTasks); ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
// String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds(); dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
// dto.setBusinessKey(String.valueOf(new Date().getTime()));
// JgChangeRegistrationUnit notice = new JgChangeRegistrationUnit(); dto.setCompleteFirstTask(true);
// BeanUtils.copyProperties(noticeDto, notice); list.add(dto);
// notice.setChangeCertificate(noticeDto.getChangeCertificate()); actWorkflowBatchDTO.setProcess(list);
// notice.setRemark(noticeDto.getRemark()); dto.setNextExecuteUserCompanyCode(noticeDto.getReceiveCompanyCode());
// if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) { processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
// notice.setInstanceStatus(notice.getInstanceStatus() + "," + roleListAll); String instanceId = processTasks.get(0).getProcessInstance().getId();
// } else { String nextTaskId = processTasks.get(0).getNextTask().get(0).getId();
// notice.setInstanceStatus(String.join(",", roleListAll)); String taskname = processTasks.get(0).getNextTask().get(0).getName();
// } this.buildRoleList(processTasks, roleListNext, roleListAll);
// notice.setInstanceId(instanceId); List<WorkflowResultDto> workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(processTasks);
// notice.setNextTaskId(nextTaskId); String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
// notice.setSupervisoryCode(noticeDto.getSupervisoryCode());
// notice.setPromoter(RequestContext.getExeUserId());
// notice.setNextExecutorIds(String.join(",", roleListNext));
// notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
// notice.setNextExecuteUserIds(nextUserIds);
// setNewUnitInfo(reginParams, notice);
// JgChangeRegistrationUnitMapper.updateById(notice);
// commonServiceImpl.deleteTasksByRelationId(notice.getSequenceNbr() + "");
// createTaskModel(notice, taskname, "1", nextUserIds);
// commonServiceImpl.saveExecuteFlowData2Redis(notice.getInstanceId(), buildInstanceRuntimeData(notice));
// } else {
// ArrayList<String> roleList = new ArrayList<>();
// String taskId = noticeDto.getNextTaskId();
// //组装信息
// TaskResultDTO task = new TaskResultDTO();
// task.setResultCode("approvalStatus");
// task.setTaskId(taskId);
// task.setComment("");
// HashMap<String, Object> map = new HashMap<>();
// map.put("approvalStatus", op);
// if (!ObjectUtils.isEmpty(noticeDto.getInstanceStatus()) &&
// (noticeDto.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject()) ||
// noticeDto.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack()))) {
// map.put("approvalStatus", "提交");
// }
// task.setVariable(map);
// //执行流程
// task.setNextExecuteUserCompanyCode(noticeDto.getReceiveCompanyCode());
// ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, task, op);
// JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
// BeanUtils.copyProperties(noticeDto, bean);
// String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
// String taskName1 = "";
// String nextTaskId = "";
// this.buildRoleList(Collections.singletonList(processTaskDTO), roleList, roleListAll);
// List<WorkflowResultDto> workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
// String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
// if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
// taskCode = processTaskDTO.getNextTask().get(0).getKey();
// taskName1 = processTaskDTO.getNextTask().get(0).getName();
// nextTaskId = processTaskDTO.getNextTask().get(0).getId();
// }
// bean.setNextExecutorIds(String.join(",", roleList));
// if (!ObjectUtils.isEmpty(bean.getInstanceStatus())) {
// bean.setInstanceStatus(bean.getInstanceStatus() + "," + String.join(",", roleList));
// } else {
// bean.setInstanceStatus(String.join(",", roleList));
// }
// bean.setNextTaskId(nextTaskId);
// bean.setPromoter(RequestContext.getExeUserId());
// bean.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
// executeOneStep(bean, taskName1, nextUserIds, op);
// bean.setNextExecuteUserIds(nextUserIds);
// setNewUnitInfo(reginParams, bean);
// JgChangeRegistrationUnitMapper.updateById(bean);
// commonServiceImpl.saveExecuteFlowData2Redis(bean.getInstanceId(), buildInstanceRuntimeData(bean));
// }
// } else {
// JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
// BeanUtils.copyProperties(noticeDto, bean);
// setNewUnitInfo(reginParams, bean);
// JgChangeRegistrationUnitMapper.updateById(bean);
// }
// List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
// deviceList.forEach(device -> {
// JgChangeRegistrationUnitEq unitEq = new JgChangeRegistrationUnitEq();
// if (device.containsKey("USE_ORG_CODE")) {
// unitEq.setRegistrationCertificate(device.getString("USE_ORG_CODE"));//使用登记证主键
// }
// if (device.containsKey("SEQUENCE_NBR")) {
// unitEq.setEquId(device.getString("SEQUENCE_NBR"));//设备主键
// }
// unitEq.setUnitChangeRegistrationId(noticeDto.getSequenceNbr().toString());//单位变更业务主键
// unitEq.setDeviceInfo(JSONObject.toJSONString(device));//设备信息json
// jgRelationEquipList.add(unitEq);
// });
// JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
// //登记类别
// jgRegistrationHistory.setRegistrationClass("单位变更登记");
// jgRegistrationHistory.setCurrentDocumentId(noticeDto.getApplyNo());
// //使用登记证历史数据
// jgRegistrationHistory.setChangeData(JSONObject.toJSONString(registrationList));
// //先删除之前设备关系数据，在插入最新设备关系数据
// registrationUnitEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgChangeRegistrationUnitEq>()
// .eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, noticeDto.getSequenceNbr()));
// registrationUnitEqService.saveBatch(jgRelationEquipList);
// //先删除之前未提交的历史使用登记证信息，在插入最新的使用登记证信息
// registrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
// .eq(JgRegistrationHistory::getCurrentDocumentId, noticeDto.getApplyNo()));
// registrationHistoryService.save(jgRegistrationHistory);
//
// if (SUBMIT_TYPE_FLOW.equals(submitType)) {
// //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
// CompanyBo company = reginParams.getCompany();
// deviceList.forEach(jsonObject -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
// .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")),
// CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
// company.getCompanyCode().split("_")[1] :
// company.getCompanyCode()));
// }
JgChangeRegistrationUnit notice = new JgChangeRegistrationUnit();
BeanUtils.copyProperties(noticeDto, notice);
notice.setChangeCertificate(noticeDto.getChangeCertificate());
notice.setRemark(noticeDto.getRemark());
if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
notice.setInstanceStatus(notice.getInstanceStatus() + "," + roleListAll);
} else {
notice.setInstanceStatus(String.join(",", roleListAll));
}
notice.setInstanceId(instanceId);
notice.setNextTaskId(nextTaskId);
notice.setSupervisoryCode(noticeDto.getSupervisoryCode());
notice.setPromoter(RequestContext.getExeUserId());
notice.setNextExecutorIds(String.join(",", roleListNext));
notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
notice.setNextExecuteUserIds(nextUserIds);
setNewUnitInfo(reginParams, notice);
JgChangeRegistrationUnitMapper.updateById(notice);
commonServiceImpl.deleteTasksByRelationId(notice.getSequenceNbr() + "");
createTaskModel(notice, taskname, "1", nextUserIds);
commonServiceImpl.saveExecuteFlowData2Redis(notice.getInstanceId(), buildInstanceRuntimeData(notice));
} else {
ArrayList<String> roleList = new ArrayList<>();
String taskId = noticeDto.getNextTaskId();
//组装信息
TaskResultDTO task = new TaskResultDTO();
task.setResultCode("approvalStatus");
task.setTaskId(taskId);
task.setComment("");
HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", op);
if (!ObjectUtils.isEmpty(noticeDto.getInstanceStatus()) &&
(noticeDto.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject()) ||
noticeDto.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack()))) {
map.put("approvalStatus", "提交");
}
task.setVariable(map);
//执行流程
task.setNextExecuteUserCompanyCode(noticeDto.getReceiveCompanyCode());
ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(taskId, task, op);
JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
BeanUtils.copyProperties(noticeDto, bean);
String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
String taskName1 = "";
String nextTaskId = "";
this.buildRoleList(Collections.singletonList(processTaskDTO), roleList, roleListAll);
List<WorkflowResultDto> workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
taskCode = processTaskDTO.getNextTask().get(0).getKey();
taskName1 = processTaskDTO.getNextTask().get(0).getName();
nextTaskId = processTaskDTO.getNextTask().get(0).getId();
}
bean.setNextExecutorIds(String.join(",", roleList));
if (!ObjectUtils.isEmpty(bean.getInstanceStatus())) {
bean.setInstanceStatus(bean.getInstanceStatus() + "," + String.join(",", roleList));
} else {
bean.setInstanceStatus(String.join(",", roleList));
}
bean.setNextTaskId(nextTaskId);
bean.setPromoter(RequestContext.getExeUserId());
bean.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
executeOneStep(bean, taskName1, nextUserIds, op);
bean.setNextExecuteUserIds(nextUserIds);
setNewUnitInfo(reginParams, bean);
JgChangeRegistrationUnitMapper.updateById(bean);
commonServiceImpl.saveExecuteFlowData2Redis(bean.getInstanceId(), buildInstanceRuntimeData(bean));
}
} else {
JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
BeanUtils.copyProperties(noticeDto, bean);
setNewUnitInfo(reginParams, bean);
JgChangeRegistrationUnitMapper.updateById(bean);
}
List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
deviceList.forEach(device -> {
JgChangeRegistrationUnitEq unitEq = new JgChangeRegistrationUnitEq();
if (device.containsKey("projectContraptionId")) {
String projectContraptionId = (String)device.get("projectContraptionId");
unitEq.setRegistrationCertificate(useRegistrationCodeMap.get(projectContraptionId));
unitEq.setProjectContraptionId(projectContraptionId);
}
if (device.containsKey("record")) {
unitEq.setEquId((String) device.get("record")); //设备主键
}
unitEq.setUnitChangeRegistrationId(noticeDto.getSequenceNbr().toString());//单位变更业务主键
unitEq.setDeviceInfo(JSON.toJSONString(device));//设备信息json
jgRelationEquipList.add(unitEq);
});
JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
//登记类别
jgRegistrationHistory.setRegistrationClass("单位变更登记");
jgRegistrationHistory.setCurrentDocumentId(noticeDto.getApplyNo());
//使用登记证历史数据
jgRegistrationHistory.setChangeData(JSON.toJSONString(projectContraptionList));
//先删除之前设备关系数据，在插入最新设备关系数据
registrationUnitEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgChangeRegistrationUnitEq>()
.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, noticeDto.getSequenceNbr()));
registrationUnitEqService.saveBatch(jgRelationEquipList);
//先删除之前未提交的历史使用登记证信息，在插入最新的使用登记证信息
registrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getCurrentDocumentId, noticeDto.getApplyNo()));
registrationHistoryService.save(jgRegistrationHistory);
} }
private void setNewUnitInfo(ReginParams reginParams, JgChangeRegistrationUnit notice) { private void setNewUnitInfo(ReginParams reginParams, JgChangeRegistrationUnit notice) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationManageServiceImpl.java
View file @ d5feb64e
package com.yeejoin.amos.boot.module.jg.biz.service.impl; package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -19,16 +18,15 @@ import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum; ...@@ -19,16 +18,15 @@ import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.*; import com.yeejoin.amos.boot.module.jg.api.mapper.*;
import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService; import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService; import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
import com.yeejoin.amos.boot.module.jg.api.vo.IdxBizJgProjectContraptionVO;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo; import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient; import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil; import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentCategoryEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentCategoryEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProjectContraptionMapper;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.queryparser.classic.QueryParser;
...@@ -872,10 +870,10 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr ...@@ -872,10 +870,10 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
* @param sort * @param sort
* @return * @return
*/ */
public Page<IdxBizJgProjectContraptionVO> queryForUnitByProjectContraptionPage(Page<IdxBizJgProjectContraptionVO> page, Map<String, String> params, String sort) { public Page<IdxBizJgProjectContraption> queryForUnitByProjectContraptionPage(Page<IdxBizJgProjectContraption> page, Map<String, String> params, String sort) {
SortVo sortMap = commonServiceImpl.sortFieldConversion(sort); SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
Page<IdxBizJgProjectContraptionVO> projectContraptionPage = this.baseMapper.queryForUnitByProjectContraptionPage(page, params, sortMap); Page<IdxBizJgProjectContraption> projectContraptionPage = this.baseMapper.queryForUnitByProjectContraptionPage(page, params, sortMap);
List<IdxBizJgProjectContraptionVO> records = projectContraptionPage.getRecords(); List<IdxBizJgProjectContraption> records = projectContraptionPage.getRecords();
if (!ValidationUtil.isEmpty(records)) { if (!ValidationUtil.isEmpty(records)) {
records.forEach(item -> { records.forEach(item -> {
BigDecimal pipelineLength = BigDecimal.valueOf(item.getPipelineLength()); BigDecimal pipelineLength = BigDecimal.valueOf(item.getPipelineLength());
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java
View file @ d5feb64e
...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ymt.api.entity; ...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -286,4 +287,10 @@ public class IdxBizJgProjectContraption extends BaseEntity { ...@@ -286,4 +287,10 @@ public class IdxBizJgProjectContraption extends BaseEntity {
*/ */
@TableField(exist = false) @TableField(exist = false)
private Boolean disableBasicButton; private Boolean disableBasicButton;
/**
* 设备使用地址
*/
@TableField(exist = false)
private String equUseAddress;
} }
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