Skip to content

A
amos-boot-biz
Commit ee1b533c authored by caotao's avatar caotao
Browse files
Options

驳回、撤回后再次保存增加判断

parent 2fa4dd89
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 50 deletions
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/JgChangeRegistrationReformServiceImpl.java
View file @ ee1b533c
...@@ -63,6 +63,22 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -63,6 +63,22 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
@Autowired @Autowired
ICmWorkflowService iCmWorkflowService; ICmWorkflowService iCmWorkflowService;
@Autowired @Autowired
IIdxBizJgTechParamsElevatorService iIdxBizJgTechParamsElevatorService;
@Autowired
IIdxBizJgTechParamsVehicleService iIdxBizJgTechParamsVehicleService;
@Autowired
IIdxBizJgTechParamsRopewayService iIdxBizJgTechParamsRopewayService;
@Autowired
IIdxBizJgTechParamsRidesService iIdxBizJgTechParamsRidesService;
@Autowired
IIdxBizJgTechParamsBoilerService iIdxBizJgTechParamsBoilerService;
@Autowired
IIdxBizJgTechParamsVesselService iIdxBizJgTechParamsVesselService;
@Autowired
IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
@Autowired
IIdxBizJgTechParamsLiftingService iIdxBizJgTechParamsLiftingService;
@Autowired
private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService; private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService;
@Autowired @Autowired
private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService; private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
...@@ -92,23 +108,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -92,23 +108,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
@Autowired @Autowired
private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper; private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
@Autowired
IIdxBizJgTechParamsElevatorService iIdxBizJgTechParamsElevatorService;
@Autowired
IIdxBizJgTechParamsVehicleService iIdxBizJgTechParamsVehicleService;
@Autowired
IIdxBizJgTechParamsRopewayService iIdxBizJgTechParamsRopewayService;
@Autowired
IIdxBizJgTechParamsRidesService iIdxBizJgTechParamsRidesService;
@Autowired
IIdxBizJgTechParamsBoilerService iIdxBizJgTechParamsBoilerService;
@Autowired
IIdxBizJgTechParamsVesselService iIdxBizJgTechParamsVesselService;
@Autowired
IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
@Autowired
IIdxBizJgTechParamsLiftingService iIdxBizJgTechParamsLiftingService;
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -187,39 +186,39 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -187,39 +186,39 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName()); jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName()); jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
jgRegistrationHistory.setStatus("new"); jgRegistrationHistory.setStatus("new");
if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))&&ObjectUtils.isEmpty(map.get("onlySave"))) { if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr")))); jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
this.getBaseMapper().updateById(jgChangeRegistrationReform); this.getBaseMapper().updateById(jgChangeRegistrationReform);
jgChangeRegistrationReform = this.getBaseMapper().selectById(jgChangeRegistrationReform.getSequenceNbr()); jgChangeRegistrationReform = this.getBaseMapper().selectById(jgChangeRegistrationReform.getSequenceNbr());
jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("applyNo")))); jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("applyNo"))));
jgRegistrationHistoryMapper.updateById(jgRegistrationHistory); jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
} else { } else {
//暂存处理 //暂存处理
// 业务管理设备信息保存 // 业务管理设备信息保存
JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq(); JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
jgChangeRegistrationReformEq.setEquId(equipId); jgChangeRegistrationReformEq.setEquId(equipId);
ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1); ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
if (!result.getResult().isEmpty()) { if (!result.getResult().isEmpty()) {
jgChangeRegistrationReform.setApplyNo(result.getResult().get(0)); jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
} else { } else {
throw new BadRequest("申请单编号生成失败,请稍后重试!"); throw new BadRequest("申请单编号生成失败,请稍后重试!");
} }
jgChangeRegistrationReform.setRegDate(new Date()); jgChangeRegistrationReform.setRegDate(new Date());
jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass()); jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass()); jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
this.save(jgChangeRegistrationReform); this.save(jgChangeRegistrationReform);
jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString()); jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq); jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
//当前单据id //当前单据id
jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo()); jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
jgRegistrationHistoryMapper.insert(jgRegistrationHistory); jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
//暂存时生成待办数据 //暂存时生成待办数据
List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, null)); List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, null));
commonServiceImpl.buildTaskModel(taskModelDtoList); commonServiceImpl.buildTaskModel(taskModelDtoList);
} }
if (!ObjectUtils.isEmpty(map.get("submit"))&&ObjectUtils.isEmpty(map.get("onlySave"))) { if (!ObjectUtils.isEmpty(map.get("submit"))) {
String instanceId = ""; String instanceId = "";
if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getSequenceNbr()) && !ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceId())) { if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getSequenceNbr()) && !ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceId())) {
// 如果是旧流程则执行一步 // 如果是旧流程则执行一步
...@@ -503,7 +502,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -503,7 +502,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsElevator.class); IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
if (!ValidationUtil.isEmpty(elevator)) { if (!ValidationUtil.isEmpty(elevator)) {
elevator.setSequenceNbr( String.valueOf(techInfo.get("ELEVATOR_SEQ"))); elevator.setSequenceNbr(String.valueOf(techInfo.get("ELEVATOR_SEQ")));
iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator); iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator);
} }
} }
...@@ -511,7 +510,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -511,7 +510,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
else if (EquipmentClassifityEnum.CC.getCode().equals(equList)) { else if (EquipmentClassifityEnum.CC.getCode().equals(equList)) {
IdxBizJgTechParamsVehicle vehicle = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsVehicle.class); IdxBizJgTechParamsVehicle vehicle = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsVehicle.class);
if (!ValidationUtil.isEmpty(vehicle)) { if (!ValidationUtil.isEmpty(vehicle)) {
vehicle.setSequenceNbr( String.valueOf(techInfo.get("VEHICLE_SEQ"))); vehicle.setSequenceNbr(String.valueOf(techInfo.get("VEHICLE_SEQ")));
iIdxBizJgTechParamsVehicleService.saveOrUpdateData(vehicle); iIdxBizJgTechParamsVehicleService.saveOrUpdateData(vehicle);
} }
...@@ -526,7 +525,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -526,7 +525,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
else if (EquipmentClassifityEnum.KYSD.getCode().equals(equList)) { else if (EquipmentClassifityEnum.KYSD.getCode().equals(equList)) {
IdxBizJgTechParamsRopeway ropeway = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsRopeway.class); IdxBizJgTechParamsRopeway ropeway = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsRopeway.class);
if (!ValidationUtil.isEmpty(ropeway)) { if (!ValidationUtil.isEmpty(ropeway)) {
ropeway.setSequenceNbr( String.valueOf(techInfo.get("ROPEWAY_SEQ"))); ropeway.setSequenceNbr(String.valueOf(techInfo.get("ROPEWAY_SEQ")));
iIdxBizJgTechParamsRopewayService.saveOrUpdateData(ropeway); iIdxBizJgTechParamsRopewayService.saveOrUpdateData(ropeway);
} }
...@@ -548,7 +547,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -548,7 +547,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
else if (EquipmentClassifityEnum.GL.getCode().equals(equList)) { else if (EquipmentClassifityEnum.GL.getCode().equals(equList)) {
IdxBizJgTechParamsBoiler boiler = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsBoiler.class); IdxBizJgTechParamsBoiler boiler = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsBoiler.class);
if (!ValidationUtil.isEmpty(boiler)) { if (!ValidationUtil.isEmpty(boiler)) {
boiler.setSequenceNbr( String.valueOf(techInfo.get("BOILER_SEQ"))); boiler.setSequenceNbr(String.valueOf(techInfo.get("BOILER_SEQ")));
iIdxBizJgTechParamsBoilerService.saveOrUpdateData(boiler); iIdxBizJgTechParamsBoilerService.saveOrUpdateData(boiler);
} }
...@@ -580,7 +579,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -580,7 +579,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
else if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) { else if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
IdxBizJgTechParamsPipeline pipeline = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsPipeline.class); IdxBizJgTechParamsPipeline pipeline = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsPipeline.class);
if (!ValidationUtil.isEmpty(pipeline)) { if (!ValidationUtil.isEmpty(pipeline)) {
pipeline.setSequenceNbr( String.valueOf(techInfo.get("PIPELINE_SEQ"))); pipeline.setSequenceNbr(String.valueOf(techInfo.get("PIPELINE_SEQ")));
iIdxBizJgTechParamsPipelineService.saveOrUpdateData(pipeline); iIdxBizJgTechParamsPipelineService.saveOrUpdateData(pipeline);
} }
...@@ -594,7 +593,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -594,7 +593,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
else if (EquipmentClassifityEnum.QZJX.getCode().equals(equList)) { else if (EquipmentClassifityEnum.QZJX.getCode().equals(equList)) {
IdxBizJgTechParamsLifting lifting = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsLifting.class); IdxBizJgTechParamsLifting lifting = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsLifting.class);
if (!ValidationUtil.isEmpty(lifting)) { if (!ValidationUtil.isEmpty(lifting)) {
lifting.setSequenceNbr( String.valueOf(techInfo.get("LIFTING_SEQ"))); lifting.setSequenceNbr(String.valueOf(techInfo.get("LIFTING_SEQ")));
iIdxBizJgTechParamsLiftingService.saveOrUpdateData(lifting); iIdxBizJgTechParamsLiftingService.saveOrUpdateData(lifting);
} }
......
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