From 5ceb7d1da095b7b076a78fe56c026cfe100a75c0 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 7 Mar 2025 18:33:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/jysoft/card/service/NewCardService.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/greenH5modul/src/com/jysoft/card/service/NewCardService.java b/greenH5modul/src/com/jysoft/card/service/NewCardService.java index fc5a730..e06403d 100644 --- a/greenH5modul/src/com/jysoft/card/service/NewCardService.java +++ b/greenH5modul/src/com/jysoft/card/service/NewCardService.java @@ -908,11 +908,13 @@ public class NewCardService { vo.setExamineBatch(nextExamineBatch); vo.setCheckRole(auditNodeList.get(1).get("checkRole")); vo.setExamineState("0"); + vo.setOperType(nextCheckOperate); }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0") && Objects.equals(nextCheckOperate, "1")){ // 无操作人员审核->制卡经办人审核 vo.setExamineBatch(nextExamineBatch); vo.setCheckRole(auditNodeList.get(1).get("checkRole")); vo.setExamineState("0"); + vo.setOperType(nextCheckOperate); }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1") && Objects.equals(nextCheckOperate, "0")){ // 制卡经办人审核->无操作人员审核 vo.setExamineBatch(nextExamineBatch); @@ -920,6 +922,7 @@ public class NewCardService { vo.setExamineState("0"); // 添加制卡经办人的ID vo.setOperCardId(vo.getUserId()); + vo.setOperType(nextCheckOperate); }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0") && Objects.equals(nextCheckOperate, "2")){ // 无操作人员审核->制卡经办人抄送(默认审批流程已结束) vo.setExamineBatch(nextExamineBatch); @@ -1009,11 +1012,13 @@ public class NewCardService { vo.setExamineBatch(nextExamineBatch); vo.setCheckRole(auditNodeList.get(1).get("checkRole")); vo.setExamineState("0"); + vo.setOperType(nextCheckOperate); }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0") && Objects.equals(nextCheckOperate, "1")){ // 无操作人员审核->制卡经办人审核 vo.setExamineBatch(nextExamineBatch); vo.setCheckRole(auditNodeList.get(1).get("checkRole")); vo.setExamineState("0"); + vo.setOperType(nextCheckOperate); }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1") && Objects.equals(nextCheckOperate, "0")){ // 制卡经办人审核->无操作人员审核 vo.setExamineBatch(nextExamineBatch); @@ -1021,11 +1026,13 @@ public class NewCardService { vo.setExamineState("0"); // 添加制卡经办人的ID vo.setOperCardId(vo.getUserId()); + vo.setOperType(nextCheckOperate); }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0") && Objects.equals(nextCheckOperate, "2")){ // 无操作人员审核->制卡经办人填写数据 vo.setExamineBatch(nextExamineBatch); vo.setCheckRole(auditNodeList.get(1).get("checkRole")); vo.setExamineState("0"); + vo.setOperType(nextCheckOperate); }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1") && Objects.equals(nextCheckOperate, "2")){ // 制卡经办人审核->制卡经办人填写数据 vo.setExamineBatch(nextExamineBatch); @@ -1033,6 +1040,7 @@ public class NewCardService { vo.setExamineState("1"); // 添加制卡经办人的ID vo.setOperCardId(vo.getUserId()); + vo.setOperType(nextCheckOperate); }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "2") && Objects.equals(nextCheckOperate, "-1")){ // 制卡经办人填写数据->已无审核节点(审批流程结束) vo.setExamineState("1"); @@ -1152,10 +1160,11 @@ public class NewCardService { */ public void updateCardAuditData(CardVo vo){ List parameter = new ArrayList(); - String sql = "UPDATE GREEN_CARD SET EXAMINE_BATCH = ?,EXAMINE_STATE = ?,CHECK_ROLE = ?"; + String sql = "UPDATE GREEN_CARD SET EXAMINE_BATCH = ?,EXAMINE_STATE = ?,CHECK_ROLE = ?,OPER_TYPE = ?"; parameter.add(vo.getExamineBatch()); parameter.add(vo.getExamineState()); parameter.add(vo.getCheckRole()); + parameter.add(vo.getOperType()); if(StringUtils.isNotBlank(vo.getActualBackTime())){ // 实际归还时间 parameter.add(vo.getActualBackTime()); sql += ",ACTUAL_BACK_TIME = ?"; @@ -1240,7 +1249,7 @@ public class NewCardService { public RestResult getUnapprovedData(CardVo vo){ try { // 获取当前登录人的角色 - List aduitRoles = new ArrayList(); + List aduitRoles = getCurrentUserRole(vo); String userId = vo.getUserId(); List parameter = new ArrayList(); String sql = " SELECT * FROM (SELECT ROWNUM num,A.* FROM ( "