diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyRecController.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyRecController.java index ff3f314..cb8cbcd 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyRecController.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyRecController.java @@ -76,7 +76,7 @@ public class ImsDutyRecController { @PostMapping("/submit") @ApiOperationSupport(order = 6) - @ApiOperation(value = "新增或修改,然后提交,开始工作流程", notes = "传入imsDutyRec") + @ApiOperation(value = "新增或修改,然后提交", notes = "传入imsDutyRec") public R submit(@Valid @RequestBody ImsDutyRecEntity imsDutyRec) { return imsDutyRecService.submit(imsDutyRec); //return R.status(imsDutyRecService.submitV2(imsDutyRec,vo)); @@ -111,7 +111,6 @@ public class ImsDutyRecController { @ApiOperationSupport(order = 8) @ApiOperation(value = "处理工作流程", notes = "传入flow") public R submit(@Valid @RequestBody ImsDutyRecDTO dto) { -// return R.success("接口已弃用"); return R.status(imsDutyRecService.dealDutyRecFlow(dto)); } @@ -188,16 +187,6 @@ public class ImsDutyRecController { return R.data(imsDutyRecService.testClassDate(id, type)); } - /** - * 根据流程ID批量删除 - */ - @GetMapping("/delProcessInstanceIds") - @ApiOperationSupport(order = 20) - @ApiOperation(value = "根据流程ID批量删除", notes = "") - public R processInstanceIds(@RequestParam("processInstanceIds") String processInstanceIds) { - return R.data(imsDutyRecService.delProcessInstanceIds(processInstanceIds)); - } - /** * 新增:突发事件记录 diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/IImsDutyRecService.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/IImsDutyRecService.java index 7bd91a6..65a877f 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/IImsDutyRecService.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/IImsDutyRecService.java @@ -94,8 +94,6 @@ public interface IImsDutyRecService extends IService { List getRecInfoByDepts(List depts, String date); - R delProcessInstanceIds(String processInstanceIds); - /** * 交接班统计 * @param reqDTO 交接班信息 diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyRecServiceImpl.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyRecServiceImpl.java index 3c776c2..41a3e34 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyRecServiceImpl.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyRecServiceImpl.java @@ -13,9 +13,7 @@ import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; -import org.springblade.flow.core.entity.BladeFlow; import org.springblade.flow.core.feign.IFlowClient; -import org.springblade.flow.core.utils.TaskUtil; import org.springblade.hzinfo_inspect.duty.constants.OperationalConstants; import org.springblade.hzinfo_inspect.duty.dto.ChangeShiftsReqDTO; import org.springblade.hzinfo_inspect.duty.dto.ChangeShiftsRspDTO; @@ -23,7 +21,6 @@ import org.springblade.hzinfo_inspect.duty.dto.ImsDutyRecDTO; import org.springblade.hzinfo_inspect.duty.entity.*; import org.springblade.hzinfo_inspect.duty.enums.DutyMainStatus; import org.springblade.hzinfo_inspect.duty.enums.DutyRecStatus; -import org.springblade.hzinfo_inspect.duty.enums.JoinStatus; import org.springblade.hzinfo_inspect.duty.mapper.ImsDutyMainMapper; import org.springblade.hzinfo_inspect.duty.mapper.ImsDutyRecMapper; import org.springblade.hzinfo_inspect.duty.service.*; @@ -76,8 +73,6 @@ public class ImsDutyRecServiceImpl extends ServiceImpl result = flowClient.startProcessInstanceByKey(DutyRecProcessConstant. - DUTY_REC_FLOW_KEY, StringUtil.format("{}:{}", - DutyRecProcessConstant.DUTY_REC_PROCESS_TABLE, recEntity.getId()), new HashMap() {{ - put("taskId", recEntity.getId()); - put(DutyRecProcessConstant.TASK_VARIABLE_CARRY_USER, TaskUtil.getTaskUser(groupEntityManagerId.toString())); - //put(DutyRecProcessConstant.TASK_VARIABLE_CARRY_USER, Arrays.stream(dutyMainEntity.getDutyPersonIds().split("\\^")).map(o -> TaskUtil.getTaskUser(o)).collect(Collectors.joining(","))); - }}); - log.info("result-------------------------:" + result); - if (result.isSuccess()) { - Date date = new Date(); - //判断是否延时交班 - judgeDelayedHand(handDutyMainEntity, recEntity);//判断交班是否延时 - - // 返回流程id写入业务表 - recEntity.setExecTime(date); - recEntity.setProcessInstanceId(result.getData().getProcessInstanceId()); - recEntity.setStatus(DutyRecStatus.EXEC.getVal()); - //recEntity.setInspectTaskId(inspectTaskId); - updateById(recEntity); - } else { - throw new ServiceException("开启流程失败"); - } + Date date = new Date(); + //判断是否延时交班 + judgeDelayedHand(handDutyMainEntity, recEntity);//判断交班是否延时 + + // 返回流程id写入业务表 + recEntity.setExecTime(date); + recEntity.setStatus(DutyRecStatus.ACCEPT.getVal()); + updateById(recEntity); return R.status(true); } @@ -197,7 +177,6 @@ public class ImsDutyRecServiceImpl extends ServiceImpl carryDuties = imsDutyMainService.list(Wrappers.lambdaQuery().eq(ImsDutyMainEntity::getPreDutyId, recDTO.getDutyId())); - Assert.isTrue(carryDuties.size() <= 1, () -> { - throw new ServiceException("交班失败,接班不唯一,接班数量为:" + carryDuties.size()); - }); - recDTO.setCarryDutyMainVo(imsDutyMainService.getByIdOneV2(carryDuties.get(0).getId())); - Map variable = new HashMap() {{ - putAll(BeanUtil.toMap(recDTO)); - put("taskId", recEntity.getId()); - put(DutyRecProcessConstant.TASK_VARIABLE_CARRY_USER, TaskUtil.getTaskUser(managerId.toString())); - }}; - - R flowResult = flowClient.startProcessInstanceByKey( - DutyRecProcessConstant.DUTY_REC_FLOW_KEY, - StringUtil.format("{}:{}", DutyRecProcessConstant.DUTY_REC_PROCESS_TABLE, recEntity.getId()), - variable - ); - Assert.isTrue(flowResult.isSuccess(), () -> { - throw new ServiceException(flowResult.getMsg()); - }); - return flowResult.getData(); - } private void updateMain(Long dutyId) { ImsDutyMainEntity imsDutyMainEntity = new ImsDutyMainEntity(); @@ -566,8 +511,7 @@ public class ImsDutyRecServiceImpl extends ServiceImpl