Commit a369c570 authored by suhuiguang's avatar suhuiguang

1.报检申请自测bug

parent 1eb2574c
......@@ -229,10 +229,19 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
model.setPromoter(RequestContext.getExeUserId());
model.setNextExecuteUserIds(nextUserIds);
model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
model.setStatusName(FlowStatusEnum.TO_SUBMITTED.getName());
commonService.saveExecuteFlowData2Redis(model.getProcessInstanceId(), this.buildInstanceRuntimeData(model));
} else if ("1".equals(model.getOperationType())) { // 工作台暂存、详情保存逻辑
setNameAndIsMustAccept(model);
if(null == model.getSequenceNbr()){
// 工作台暂存
model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
model.setStatusName(FlowStatusEnum.TO_BE_SUBMITTED.getName());
} else {
// 详情保存
log.info("详情保存,不修改业务状态");
}
setNameAndIsMustAccept(model);
}
LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getCode());
......@@ -249,8 +258,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
model.setApplicationDate(new Date());
model.setPromoter(reginParams.getUserModel().getUserId());
model.setApplicationUnitName(reginParams.getCompany().getCompanyName());
jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
List<JyjcInspectionApplicationEquip> equipInfos = new ArrayList<>();
if (null != model.getEquip() && model.getEquip().size() > 0) {
List<JyjcInspectionApplicationEquipDto> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipDto.class);
......@@ -298,8 +305,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
taskModelService.buildTaskModel(Arrays.asList(dto));
}
} else {
jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
model = this.updateWithModel(model);
if (StringUtils.isNotBlank(model.getProcessInstanceId()) && model.getOperationType().equals("0")) {
taskModelService.deleteTaskModel(model.getSequenceNbr() + "");
this.createdTaskModel(model);
......
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