From e4dccddf68d2a4c69aebee11ca2ea57a563a813d Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 12:03:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 84 ++++++++----------- 1 file changed, 37 insertions(+), 47 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 c04e767b..628efef2 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -198,8 +198,8 @@ public class XgfUserServiceImpl implements XgfUserService { flowDetail.put("APPROVER_ID", ""); flowDetail.put("APPROVER_NAME", ""); flowDetail.put("APPROVER_TIME", DateUtil.getTime()); - flowDetail.put("APPROVER_CORPINFO_ID", ""); - flowDetail.put("APPROVER_CORPINFO_NAME", ""); + flowDetail.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP")); + flowDetail.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME")); flowDetail.put("PASS_FLAG", "1"); flowDetail.put("END_FLAG", "0"); flowDetail.put("ISDELETE", "0"); @@ -221,6 +221,8 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_ID", ""); nextNode.put("APPROVER_NAME", ""); nextNode.put("APPROVER_OPINION", ""); + nextNode.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP")); + nextNode.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME")); flowDetailMapper.save(nextNode); currentNode.put("STEP_FLAG", "0"); flowDetailMapper.edit(currentNode); @@ -419,6 +421,14 @@ public class XgfUserServiceImpl implements XgfUserService { PageData info = new PageData(); info.put("info", list); info.put("STEP", entity.getString("FLOWS_STEP")); + + condition.clear(); + condition.put("XGF_USER_ID", request.getString("XGF_USER_ID")); + PageData userInfo = xgfUserMapper.findById(condition); + if (userInfo == null || userInfo.size() == 0) { + throw new RuntimeException("未找到该用户详细信息"); + } + info.put("endFlag", userInfo.getString("CHECK_STATUS")); return info; } @@ -469,6 +479,9 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); + flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); entity.put("VALID_FLAG", "0"); @@ -482,25 +495,14 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - - flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); - flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { - flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); - flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); - flows.put("APPOINT_ONE_CORP_TYPE", "0"); flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); - // TODO 企业端审批人 - flows.put("APPOINT_ONE_CORP_ID", ""); - flows.put("APPOINT_ONE_CORP_NAME", ""); flows.put("FLOWS_STEP", 1); xgfFlowsMapper.edit(flows); condition.clear(); @@ -516,6 +518,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_ONE_CORP_ID", "1"); + flows.put("APPOINT_ONE_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); + flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); entity.put("VALID_FLAG", "0"); @@ -529,10 +536,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -548,11 +551,6 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_TWO_USER_NAME", info.getString("APPOINT_USER_NAME")); flows.put("FLOWS_STEP", 2); - - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); - xgfFlowsMapper.edit(flows); return "0"; } else { @@ -561,12 +559,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("STATUS", "2"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); - - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 2); - xgfFlowsMapper.edit(flows); return "1"; } @@ -577,6 +570,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_TWO_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); + flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); @@ -591,9 +589,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); - flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -605,6 +600,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); entity.put("STATUS", "2"); xgfUserMapper.edit(entity); + xgfFlowsMapper.edit(flows); return "1"; case "1":// 集团单位审批，需要指定下一位人员进行审批 entity.put("CHECK_STATUS", 1); @@ -619,9 +615,6 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_THREE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_THREE_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_THREE_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); - flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 3); xgfFlowsMapper.edit(flows); return "0"; @@ -634,6 +627,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_THREE_CORP_ID", "1"); + flows.put("APPOINT_THREE_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); + flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); @@ -648,9 +646,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); - flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -674,10 +669,6 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); flows.put("FLOWS_STEP", 4); - - flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); - flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; default: @@ -691,6 +682,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_FOUR_CORP_ID", "1"); + flows.put("APPOINT_FOUR_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); + flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); @@ -705,9 +701,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); - flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); - flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -719,6 +712,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); entity.put("STATUS", "2"); xgfUserMapper.edit(entity); + xgfFlowsMapper.edit(flows); return "1"; case "1":// 辖区单位审批，需要指定审批人 entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); @@ -726,10 +720,6 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("VALID_FLAG", "1"); entity.put("STATUS", "2"); xgfUserMapper.edit(entity); - - flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); - flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); - flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 5); xgfFlowsMapper.edit(flows); return "1"; From 7cdaacec8c49e2115debd494a2c054fdb23f3ad6 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 13:49:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E3=80=81?= =?UTF-8?q?=E8=82=A1=E4=BB=BD=E7=AB=AF=EF=BC=8C=E7=9B=B8=E5=85=B3=E6=96=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xgf/XgfUserController.java | 2 +- .../service/xgf/impl/XgfUserServiceImpl.java | 197 ++++++++++-------- 2 files changed, 108 insertions(+), 91 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index 456b15c8..30e5c597 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -126,7 +126,7 @@ public class XgfUserController extends BaseController { } /** - * 人员指定审核 + * 查看审批信息 */ @RequestMapping(value = "/getApproveInfo") @ResponseBody 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 628efef2..41b3d6b7 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -335,89 +335,104 @@ public class XgfUserServiceImpl implements XgfUserService { List list = new ArrayList<>(); PageData zero = new PageData(); - zero.put("INDEX", "0"); - zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID")); - zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME")); - zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID")); - zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME")); - zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID")); - zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME")); - zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS")); - zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION")); - zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME")); - list.add(zero); - PageData one = new PageData(); - one.put("INDEX", "1"); - one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID")); - one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME")); - one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID")); - one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME")); - one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID")); - one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME")); - one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS")); - one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION")); - one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME")); - list.add(one); - PageData two = new PageData(); - two.put("INDEX", "2"); - two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID")); - two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME")); - two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID")); - two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME")); - two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID")); - two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME")); - two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS")); - two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION")); - two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME")); - list.add(two); - PageData three = new PageData(); - three.put("INDEX", "3"); - three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID")); - three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME")); - three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID")); - three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME")); - three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID")); - three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME")); - three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS")); - three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION")); - three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME")); - list.add(three); - PageData four = new PageData(); - four.put("INDEX", "4"); - four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID")); - four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME")); - four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID")); - four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME")); - four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID")); - four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME")); - four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS")); - four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION")); - four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME")); - list.add(four); - PageData five = new PageData(); - five.put("INDEX", "5"); - five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID")); - five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME")); - five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID")); - five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME")); - five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID")); - five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME")); - five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS")); - five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION")); - five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME")); - list.add(five); - PageData six = new PageData(); - six.put("INDEX", "6"); - six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID")); - six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME")); - six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID")); - six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME")); - six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID")); - six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME")); - six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS")); - six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION")); - six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME")); - list.add(six); + int index = Integer.parseInt(entity.getString("FLOWS_STEP")); + if (index >= 0){ + zero.put("INDEX", "0"); + zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID")); + zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME")); + zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID")); + zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME")); + zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID")); + zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME")); + zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS")); + zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION")); + zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME")); + list.add(zero); + } + if (index >= 1) { + PageData one = new PageData(); + one.put("INDEX", "1"); + one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID")); + one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME")); + one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID")); + one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME")); + one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID")); + one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME")); + one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS")); + one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION")); + one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME")); + list.add(one); + } + if (index >= 2) { + PageData two = new PageData(); + two.put("INDEX", "2"); + two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID")); + two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME")); + two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID")); + two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME")); + two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID")); + two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME")); + two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS")); + two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION")); + two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME")); + list.add(two); + } + if (index >= 3) { + PageData three = new PageData(); + three.put("INDEX", "3"); + three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID")); + three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME")); + three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID")); + three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME")); + three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID")); + three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME")); + three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS")); + three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION")); + three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME")); + list.add(three); + } + if (index >= 4) { + PageData four = new PageData(); + four.put("INDEX", "4"); + four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID")); + four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME")); + four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID")); + four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME")); + four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID")); + four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME")); + four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS")); + four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION")); + four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME")); + list.add(four); + } + if (index >= 5) { + PageData five = new PageData(); + five.put("INDEX", "5"); + five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID")); + five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME")); + five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID")); + five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME")); + five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID")); + five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME")); + five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS")); + five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION")); + five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME")); + list.add(five); + } + if (index >= 6) { + PageData six = new PageData(); + six.put("INDEX", "6"); + six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID")); + six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME")); + six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID")); + six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME")); + six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID")); + six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME")); + six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS")); + six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION")); + six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME")); + list.add(six); + } PageData info = new PageData(); info.put("info", list); info.put("STEP", entity.getString("FLOWS_STEP")); @@ -474,6 +489,8 @@ public class XgfUserServiceImpl implements XgfUserService { private String handle(PageData info, PageData flows) throws Exception { PageData condition = new PageData(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpEntity = corpInfoMapper.findById(condition); switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { case 0: {// 相关方端推送数据至企业端 condition.clear(); @@ -518,8 +535,8 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); - flows.put("APPOINT_ONE_CORP_ID", "1"); - flows.put("APPOINT_ONE_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getUSER_ID()); + flows.put("APPOINT_ONE_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); @@ -571,7 +588,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_TWO_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_TWO_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); @@ -627,8 +644,8 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); - flows.put("APPOINT_THREE_CORP_ID", "1"); - flows.put("APPOINT_THREE_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_THREE_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); @@ -682,8 +699,8 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); - flows.put("APPOINT_FOUR_CORP_ID", "1"); - flows.put("APPOINT_FOUR_CORP_NAME", "秦港股份公司"); + flows.put("APPOINT_FOUR_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_FOUR_CORP_NAME", entity.getString("CORP_NAME")); flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); From 7096647336507abe4d07d6300a16a86d0866b20a Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 15:21:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1=E3=80=81=E5=AE=A1=E6=89=B9=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E5=AD=98=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=84=8F=E8=A7=81bug=E4=BF=AE=E5=A4=8D=202=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E5=88=AB=E5=AD=97=E4=BF=AE=E6=94=B9=203=E3=80=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/service/xgf/impl/XgfUserServiceImpl.java | 10 ++++++---- .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 8 ++++++++ 2 files changed, 14 insertions(+), 4 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 41b3d6b7..f18af2b2 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -99,6 +99,8 @@ public class XgfUserServiceImpl implements XgfUserService { if (regDepartmentEntity.size() > 0) { x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); } + entity = new PageData(); + entity.putAll(x); xgfUserMapper.save(x); xgfUserDetailsMapper.save(x); } else { @@ -536,7 +538,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getUSER_ID()); - flows.put("APPOINT_ONE_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_ONE_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); @@ -588,7 +590,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_TWO_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_TWO_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); @@ -645,7 +647,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_THREE_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_THREE_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); @@ -700,7 +702,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); flows.put("APPOINT_FOUR_CORP_ID", Jurisdiction.getCORPINFO_ID()); - flows.put("APPOINT_FOUR_CORP_NAME", entity.getString("CORP_NAME")); + flows.put("APPOINT_FOUR_CORP_NAME", corpEntity.getString("CORP_NAME")); flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml index 1270676c..5b7725af 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -40,6 +40,8 @@ f.APPOINT_TWO_DEPARTMENT_NAME, f.APPOINT_TWO_USER_ID, f.APPOINT_TWO_USER_NAME, + f.APPOINT_TWO_STATUS, + f.APPOINT_TWO_OPINION, f.APPOINT_TWO_TIME, f.APPOINT_THREE_CORP_ID, f.APPOINT_THREE_CORP_NAME, @@ -123,6 +125,8 @@ APPOINT_TWO_DEPARTMENT_NAME, APPOINT_TWO_USER_ID, APPOINT_TWO_USER_NAME, + APPOINT_TWO_STATUS, + APPOINT_TWO_OPINION, APPOINT_TWO_TIME, APPOINT_THREE_CORP_ID, APPOINT_THREE_CORP_NAME, @@ -206,6 +210,8 @@ #{APPOINT_TWO_DEPARTMENT_NAME}, #{APPOINT_TWO_USER_ID}, #{APPOINT_TWO_USER_NAME}, + #{APPOINT_TWO_STATUS}, + #{APPOINT_TWO_OPINION}, #{APPOINT_TWO_TIME}, #{APPOINT_THREE_CORP_ID}, #{APPOINT_THREE_CORP_NAME}, @@ -301,6 +307,8 @@ APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME}, APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID}, APPOINT_TWO_USER_NAME = #{APPOINT_TWO_USER_NAME}, + APPOINT_TWO_STATUS = #{APPOINT_TWO_STATUS}, + APPOINT_TWO_OPINION = #{APPOINT_TWO_OPINION}, APPOINT_TWO_TIME = #{APPOINT_TWO_TIME}, APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME},