bonus
/
hz-zhhq-app-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

This commit is contained in:
cwchen 2025-03-07 18:33:10 +08:00
parent 6148290658
commit 5ceb7d1da0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
greenH5modul/src/com/jysoft/card/service/NewCardService.java
View File

@ -908,11 +908,13 @@ public class NewCardService {
vo.setExamineBatch(nextExamineBatch); vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole")); vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0"); vo.setExamineState("0");
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0") }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "1")){ // 无操作人员审核->制卡经办人审核 && Objects.equals(nextCheckOperate, "1")){ // 无操作人员审核->制卡经办人审核
vo.setExamineBatch(nextExamineBatch); vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole")); vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0"); vo.setExamineState("0");
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1") }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1")
&& Objects.equals(nextCheckOperate, "0")){ // 制卡经办人审核->无操作人员审核 && Objects.equals(nextCheckOperate, "0")){ // 制卡经办人审核->无操作人员审核
vo.setExamineBatch(nextExamineBatch); vo.setExamineBatch(nextExamineBatch);
@ -920,6 +922,7 @@ public class NewCardService {
vo.setExamineState("0"); vo.setExamineState("0");
// 添加制卡经办人的ID // 添加制卡经办人的ID
vo.setOperCardId(vo.getUserId()); vo.setOperCardId(vo.getUserId());
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0") }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "2")){ // 无操作人员审核->制卡经办人抄送(默认审批流程已结束) && Objects.equals(nextCheckOperate, "2")){ // 无操作人员审核->制卡经办人抄送(默认审批流程已结束)
vo.setExamineBatch(nextExamineBatch); vo.setExamineBatch(nextExamineBatch);
@ -1009,11 +1012,13 @@ public class NewCardService {
vo.setExamineBatch(nextExamineBatch); vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole")); vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0"); vo.setExamineState("0");
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0") }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "1")){ // 无操作人员审核->制卡经办人审核 && Objects.equals(nextCheckOperate, "1")){ // 无操作人员审核->制卡经办人审核
vo.setExamineBatch(nextExamineBatch); vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole")); vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0"); vo.setExamineState("0");
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1") }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1")
&& Objects.equals(nextCheckOperate, "0")){ // 制卡经办人审核->无操作人员审核 && Objects.equals(nextCheckOperate, "0")){ // 制卡经办人审核->无操作人员审核
vo.setExamineBatch(nextExamineBatch); vo.setExamineBatch(nextExamineBatch);
@ -1021,11 +1026,13 @@ public class NewCardService {
vo.setExamineState("0"); vo.setExamineState("0");
// 添加制卡经办人的ID // 添加制卡经办人的ID
vo.setOperCardId(vo.getUserId()); vo.setOperCardId(vo.getUserId());
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0") }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "0")
&& Objects.equals(nextCheckOperate, "2")){ // 无操作人员审核->制卡经办人填写数据 && Objects.equals(nextCheckOperate, "2")){ // 无操作人员审核->制卡经办人填写数据
vo.setExamineBatch(nextExamineBatch); vo.setExamineBatch(nextExamineBatch);
vo.setCheckRole(auditNodeList.get(1).get("checkRole")); vo.setCheckRole(auditNodeList.get(1).get("checkRole"));
vo.setExamineState("0"); vo.setExamineState("0");
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1") }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "1")
&& Objects.equals(nextCheckOperate, "2")){ // 制卡经办人审核->制卡经办人填写数据 && Objects.equals(nextCheckOperate, "2")){ // 制卡经办人审核->制卡经办人填写数据
vo.setExamineBatch(nextExamineBatch); vo.setExamineBatch(nextExamineBatch);
@ -1033,6 +1040,7 @@ public class NewCardService {
vo.setExamineState("1"); vo.setExamineState("1");
// 添加制卡经办人的ID // 添加制卡经办人的ID
vo.setOperCardId(vo.getUserId()); vo.setOperCardId(vo.getUserId());
vo.setOperType(nextCheckOperate);
}else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "2") }else if(Objects.equals(vo.getExamineState(), "1") && Objects.equals(checkOperate, "2")
&& Objects.equals(nextCheckOperate, "-1")){ // 制卡经办人填写数据->已无审核节点(审批流程结束) && Objects.equals(nextCheckOperate, "-1")){ // 制卡经办人填写数据->已无审核节点(审批流程结束)
vo.setExamineState("1"); vo.setExamineState("1");
@ -1152,10 +1160,11 @@ public class NewCardService {
*/ */
public void updateCardAuditData(CardVo vo){ public void updateCardAuditData(CardVo vo){
List<Object> parameter = new ArrayList<Object>(); List<Object> parameter = new ArrayList<Object>();
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.getExamineBatch());
parameter.add(vo.getExamineState()); parameter.add(vo.getExamineState());
parameter.add(vo.getCheckRole()); parameter.add(vo.getCheckRole());
parameter.add(vo.getOperType());
if(StringUtils.isNotBlank(vo.getActualBackTime())){ // 实际归还时间 if(StringUtils.isNotBlank(vo.getActualBackTime())){ // 实际归还时间
parameter.add(vo.getActualBackTime()); parameter.add(vo.getActualBackTime());
sql += ",ACTUAL_BACK_TIME = ?"; sql += ",ACTUAL_BACK_TIME = ?";
@ -1240,7 +1249,7 @@ public class NewCardService {
public RestResult getUnapprovedData(CardVo vo){ public RestResult getUnapprovedData(CardVo vo){
try { try {
// 获取当前登录人的角色 // 获取当前登录人的角色
List<String> aduitRoles = new ArrayList<String>(); List<String> aduitRoles = getCurrentUserRole(vo);
String userId = vo.getUserId(); String userId = vo.getUserId();
List<Object> parameter = new ArrayList<Object>(); List<Object> parameter = new ArrayList<Object>();
String sql = " SELECT * FROM (SELECT ROWNUM num,A.* FROM ( " String sql = " SELECT * FROM (SELECT ROWNUM num,A.* FROM ( "