审批2.0增加审批角色

platform-dao/src/main/resources/mapper/upms/SysUserMapper.xml

@@ -211,6 +211,6 @@
             resultType="com.platform.dao.vo.SysUserVO">
         select u.user_id, u.real_name
         from t_sys_user u
-                 join on(select DISTINCT role.user_id from t_sys_user_dept dept join t_sys_user_role role on dept.user_id = role.user_id where dept.dept_id = #{deptId} and role.role_id = #{roleId}) t u.user_id = t.user_id
+                 join (select DISTINCT role.user_id from t_sys_user_dept dept join t_sys_user_role role on dept.user_id = role.user_id where dept.dept_id = #{deptId} and role.role_id = #{roleId}) t on u.user_id = t.user_id
     </select>
 </mapper>

platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowServiceImpl.java

@@ -136,6 +136,7 @@ public class WorkflowServiceImpl extends BaseServiceImpl<WorkflowMapper, Workflo
                     if(verifyType == null){
                         throw new DeniedException("人员类型-verifyType不能为空");
                     }
+                    node.setVerifyType(verifyType);
                     if(verifyType == CommonConstants.VERIFY_TYPE_USER){
                         String verifier = jsonObject.getString("verifier");
                         String userName = jsonObject.getString("userName");

platform-service/src/main/java/com/platform/service/workflow/verifyStrategy/impl/VerifyPassStrategy.java

@@ -86,6 +86,20 @@ public class VerifyPassStrategy extends AbstractBaseStrategy {
     }
 
     private void finishTask(WorkflowTaskBom updBom, WorkflowTask updTask) {
+        // 获取历史记录
+        WorkflowTaskBom oldBom = workflowTaskBomMapper.selectByPrimaryKey(updBom.getId());
+        WorkflowTaskBom queryBom = new WorkflowTaskBom();
+        queryBom.setTaskId(queryBom.getTaskId());
+        queryBom.setNodeId(queryBom.getNodeId());
+        List<WorkflowTaskBom> historyList = workflowTaskBomMapper.select(queryBom);
+        historyList.forEach(item->{
+            if(!item.getId().equals(oldBom.getNodeId())){
+                item.setStatus(YesNoEnum.YES.getValue() + 1);
+                item.setHandleRemark("会签节点已由" + SecurityUtils.getUserInfo().getRealName() + "已处理");
+                item.setHandleTime(LocalDateTime.now());
+                workflowTaskBomMapper.updateByPrimaryKeySelective(item);
+            }
+        });
         updBom.setStatus(YesNoEnum.YES.getValue());
         updBom.setHandleTime(LocalDateTime.now());
         // 修改老节点