From 7cdaacec8c49e2115debd494a2c054fdb23f3ad6 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 13:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E3=80=81=E8=82=A1?= =?UTF-8?q?=E4=BB=BD=E7=AB=AF=EF=BC=8C=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=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"));