diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/dto/SysUserRoleVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/dto/SysUserRoleVo.java index 0cc4c267..df9070e0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/dto/SysUserRoleVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/dto/SysUserRoleVo.java @@ -25,5 +25,5 @@ public class SysUserRoleVo extends SysUserRole { private String ancestors; - private Long userid; + private Long userId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java index b6807f86..4d4b726e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordHistoryMapper.java @@ -29,4 +29,6 @@ public interface SysWorkflowRecordHistoryMapper { String getNowUserIds(SysWorkflowRecordHistory sysWorkflowRecordHistory); void deleteNowNode(SysWorkflowRecordHistory sysWorkflowRecordHistory); + + String getRecordCodeByTaskId(Integer taskId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java index d3fe0abc..ec6b45a9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java @@ -179,7 +179,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis String flag = "0"; if("0".equals( flag)){ Integer taskId = sysWorkflowRecordHistory.getTaskId(); - String recordCode = sysWorkflowRecordHistory.getTaskCode(); + String recordCode = sysWorkflowRecordHistoryMapper.getRecordCodeByTaskId(taskId); Integer nextNodeId = sysWorkflowRecordHistory.getNextNodeId(); Integer nodeId = sysWorkflowRecordHistory.getNodeId(); sysWorkflowRecordHistory.setCreateBy(userId.toString()); @@ -366,6 +366,7 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis SysUser sysUser, Integer taskId, String recordCode, Integer recordId, Integer nextNodeId, Integer nodeId) { boolean found = false; Integer proId = null; + Integer proIdThree = null ; List userList = new ArrayList<>(); for (int i = 0; i < sysWorkflowNodeList.size(); i++) { // 判断列表中哪个节点是当前审批的节点,如果不是审批的节点不处理 @@ -380,9 +381,15 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis // 限制同一unit单位 //获取转入(接收方)的agreementId proId = sysWorkflowRecordHistoryMapper.getLeaseAgreementIdByTaskId(sysWorkflowRecordHistory); + if(i==2){ //到发起方施工管理部 + proIdThree = sysWorkflowRecordHistoryMapper.getBackAgreementIdByTaskId(sysWorkflowRecordHistory); + }else{ + proIdThree = null; + } int deptId = directAuditMapper.getImpUnit(String.valueOf(proId)); DirectApplyInfo directApplyInfo = new DirectApplyInfo(); directApplyInfo.setLeaseProId(String.valueOf(proId)); + directApplyInfo.setDeptId(deptId); //插入history表中 @@ -466,10 +473,13 @@ public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHis log.info("-------------节点更新工单信息✔-------------"); // 修改工单信息 updateWorkOrder(recordId, sysUser.getUserName()); - // 如果下个节点⬇存在的话,那么就创建下个节点⬇的工单信息 if (nextNodeId != null && proId != null) { - createWorkOrderAndPeopleDirect(sysUser,proId, taskId, recordCode, recordId, nextNodeId,userList); + if(proIdThree!=null){ + createWorkOrderAndPeopleDirect(sysUser,proIdThree, taskId, recordCode, recordId, nextNodeId,userList); + }else{ + createWorkOrderAndPeopleDirect(sysUser,proId, taskId, recordCode, recordId, nextNodeId,userList); + } }else{ //以下走退料、领料方法 SltAgreementInfo sltAgreementInfo = new SltAgreementInfo(); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml index d4254672..945c67c3 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml @@ -94,6 +94,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_workflow_record_history where record_id = #{recordId} and next_node_id = #{nodeId} + delete from sys_workflow_record_history where record_id = #{recordId} and node_id = #{nodeId}