From c63da69e51b908ef578d2b153f19556bec5478ce Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 31 Jan 2024 10:51:53 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85=E7=90=86=202=E3=80=81?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=94=B9=203=E3=80=81?= =?UTF-8?q?=E6=B6=88=E9=98=B2=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E8=AF=A6=E6=83=85=E5=90=8E=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 42 +++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index f18af2b2..72ace485 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -455,34 +455,50 @@ public class XgfUserServiceImpl implements XgfUserService { case 0: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ZERO_USER_ID"))) { return "1"; + } else { + return "0"; } case 1: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ONE_USER_ID"))) { return "1"; + } else { + return "0"; } case 2: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_TWO_USER_ID"))) { return "1"; + } else { + return "0"; } case 3: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_THREE_USER_ID"))) { return "1"; + } else { + return "0"; } case 4: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FOUR_USER_ID"))) { return "1"; + } else { + return "0"; } case 5: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FIVE_USER_ID"))) { return "1"; + } else { + return "0"; } case 6: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SIX_USER_ID"))) { return "1"; + } else { + return "0"; } case 7: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SEVEN_USER_ID"))) { return "1"; + } else { + return "0"; } default: return "0"; @@ -514,6 +530,7 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); + this.clearInfo(flows); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -555,6 +572,7 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); + this.clearInfo(flows); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -600,6 +618,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("VALID_FLAG", "0"); entity.put("CHECK_STATUS", "-2"); PageData key = new PageData(); + xgfUserMapper.edit(entity); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); key.put("STATUS", "1"); @@ -607,7 +626,7 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } - xgfUserMapper.edit(entity); + this.clearInfo(flows); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -656,6 +675,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("STATUS", "0"); entity.put("VALID_FLAG", "0"); entity.put("CHECK_STATUS", "-2"); + xgfUserMapper.edit(entity); PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); @@ -664,7 +684,7 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } - xgfUserMapper.edit(entity); + this.clearInfo(flows); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -711,6 +731,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("STATUS", "0"); entity.put("VALID_FLAG", "0"); entity.put("CHECK_STATUS", "-2"); + xgfUserMapper.edit(entity); PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); @@ -719,7 +740,7 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } - xgfUserMapper.edit(entity); + this.clearInfo(flows); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -752,6 +773,11 @@ public class XgfUserServiceImpl implements XgfUserService { case 5: { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + flows.put("APPOINT_FIVE_CORP_ID", "1"); + flows.put("APPOINT_FIVE_CORP_NAME", "秦港股份有限公司"); + flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); + flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); PageData entity = xgfUserMapper.findById(condition); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { @@ -815,6 +841,15 @@ public class XgfUserServiceImpl implements XgfUserService { } } + private void clearInfo(PageData flow){ + flow.put("APPOINT_ONE_USER_ID", ""); + flow.put("APPOINT_TWO_USER_ID", ""); + flow.put("APPOINT_THREE_USER_ID", ""); + flow.put("APPOINT_FOUR_USER_ID", ""); + flow.put("APPOINT_FIVE_USER_ID", ""); + flow.put("APPOINT_SIX_USER_ID", ""); + flow.put("APPOINT_SEVEN_USER_ID", ""); + } private void saveLog(PageData info, String status, String endFlag) throws Exception { /* 保存审批记录 */ PageData condition = new PageData(); @@ -822,6 +857,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("FOREIGN_KEY", info.getString("FLOWS_ID")); condition.put("TYPE", "1"); condition.put("VALID_FLAG", "1"); + condition.put("END_FLAG", "0"); PageData flow = flowMapper.findByCondition(condition); if (flow == null || flow.size() == 0) { throw new RuntimeException("流程已被暂停，请联系管理员");