From 6193cf4c03c5ecdec5362c6cf22df2506c7c5368 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 17 Jan 2024 18:43:03 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 129 +++++++++++++++--- .../mybatis/datasource/xgf/FlowMapper.xml | 6 + .../datasource/xgf/XgfUserDetailsMapper.xml | 33 ++++- 3 files changed, 145 insertions(+), 23 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 169722b4..3a912791 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -2,9 +2,7 @@ package com.zcloud.service.xgf.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.xgf.TrainUsersMapper; -import com.zcloud.mapper.datasource.xgf.XgfUserDetailsMapper; -import com.zcloud.mapper.datasource.xgf.XgfUserMapper; +import com.zcloud.mapper.datasource.xgf.*; import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.xgf.XgfUserService; @@ -30,10 +28,13 @@ public class XgfUserServiceImpl implements XgfUserService { private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource - private TrainUsersMapper trainUsersMapper; + private DepartmentService departmentService; @Resource - private DepartmentService departmentService; + private FlowMapper flowMapper; + + @Resource + private FlowDetailMapper flowDetailMapper; @Value("${preventionxgf.api.url}") private String prevention_xgf_url; @@ -60,6 +61,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData condition = new PageData(); for (PageData x : list) { if (StringUtils.isNotBlank(x.getString("USER_ID"))) { + /* 1、 保存相关方用户信息 */ condition.put("XGF_USER_ID", x.getString("USER_ID")); PageData entity = xgfUserMapper.findById(condition); if (entity == null || entity.size() <= 0) { @@ -67,7 +69,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("XGF_USER_DETAILS_ID", x.get("USER_ID")); x.put("XGF_USER_NAME", x.get("NAME")); x.put("VALID_FLAG", "1"); - x.put("STATUS", "2"); + x.put("STATUS", "1"); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -113,17 +115,67 @@ public class XgfUserServiceImpl implements XgfUserService { } x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); - x.put("STATUS", "2"); + x.put("STATUS", "1"); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); - }else { + } else { x.put("STUDY_STATUS", entity.getString("STUDY_STATUS")); } - x.put("STUDY_STATUS",entity.getString("STUDY_STATUS")); + x.put("STUDY_STATUS", entity.getString("STUDY_STATUS")); xgfUserMapper.edit(x); xgfUserDetailsMapper.edit(x); } + /* 2、保存相关方人员流程审批信息 */ + condition.clear(); + condition.put("FOREIGN_KEY", x.getString("XGF_USER_ID")); + condition.put("TYPE", "1"); + condition.put("VALID_FLAG", "1"); + PageData flow = flowMapper.findByCondition(condition); + if (flow == null || flow.size() == 0) { + /* 保存审批流程信息 */ + flow = new PageData(); + flow.put("FLOW_ID", Warden.get32UUID()); + flow.put("TYPE", "1"); + flow.put("CREATOR", ""); + flow.put("CREATOR_NAME", ""); + flow.put("CREATOR_TIME", DateUtil.getTime()); + flow.put("VALID_FLAG", "1"); + flow.put("ISDELETE", "0"); + flow.put("FOREIGN_KEY", x.getString("XGF_USER_ID")); + flowMapper.save(flow); + /* 保存审批流程明细信息 */ + PageData flowDetail = new PageData(); + flowDetail.put("FLOW_DETAIL_ID", Warden.get32UUID()); + flowDetail.put("FLOW_ID", flow.getString("FLOW_ID")); + flowDetail.put("STEP_FLAG", "1"); + flowDetail.put("STEP_NAME", "相关方数据将人员信息发送给企业端"); + flowDetail.put("SORT", 0); + 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("PASS_FLAG", "1"); + flowDetail.put("END_FLAG", "0"); + flowDetail.put("ISDELETE", "0"); + flowDetail.put("PARENT_ID", "0"); + flowDetailMapper.save(flowDetail); + } else { + condition.clear(); + condition.put("FLOW_ID", flow.getString("FLOW_ID")); + PageData currentNode = flowDetailMapper.selectOne(condition); + PageData nextNode = new PageData(); + nextNode.putAll(currentNode); + nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); + nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); + nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); + nextNode.put("STEP_NAME", "相关方数据将人员打回后重新发送给企业端"); + flowDetailMapper.save(nextNode); + currentNode.put("STEP_FLAG", "0"); + flowDetailMapper.edit(currentNode); + } + } } } @@ -131,7 +183,6 @@ public class XgfUserServiceImpl implements XgfUserService { @Override public void approvalApplication(PageData request) throws Exception { - List list = Arrays.asList(request.getString("xgf_user_ids").split(",")); PageData condition = new PageData(); @@ -139,7 +190,7 @@ public class XgfUserServiceImpl implements XgfUserService { List entities = xgfUserMapper.listByIds(condition); /* 校验所有数据是否都是正常状态 */ if (entities.stream().anyMatch(n -> !"2".equals(n.getString("STATUS")))) { - String name = entities.stream().filter(n -> !"2".equals(n.getString("STATUS"))).map( n -> n.getString("NAME")).collect(Collectors.joining(",")); + String name = entities.stream().filter(n -> !"2".equals(n.getString("STATUS"))).map(n -> n.getString("NAME")).collect(Collectors.joining(",")); throw new RuntimeException("用户[" + name + "]在系统流程中无法被打回"); } @@ -171,19 +222,59 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("未找到该用户"); } if ("1".equals(request.getString("STATUS"))) { - entity.put("STATUS", "0"); - } else { entity.put("STATUS", "2"); entity.put("VALID_FLAG", "1"); + // 企业端人员审核完成后，指定企业端监管部门，中的某人进行培训 + condition.clear(); + condition.put("XFG_USER_DETAILS_ID", x); + PageData userInfo = xgfUserDetailsMapper.findById(condition); + if (userInfo == null || userInfo.size() == 0) { + throw new RuntimeException("未找到该用户详细信息"); + } + userInfo.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); + userInfo.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); + } else { + entity.put("STATUS", "0"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", request.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } } xgfUserMapper.edit(entity); - - entity.put("USER_ID", condition.get("XGF_USER_ID")); - entity.put("STATUS", request.getString("STATUS")); - Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", entity); - if (result == null || !"succeed".equals(result.get("result"))) { - throw new RuntimeException("请求失败"); + /* 保存审批流程明细信息 */ + condition.clear(); + condition.put("FOREIGN_KEY", entity.getString("XGF_USER_ID")); + condition.put("TYPE", "1"); + condition.put("VALID_FLAG", "1"); + PageData flow = flowMapper.findByCondition(condition); + if (flow == null || flow.size() == 0){ + throw new RuntimeException("未找到该用户审批流程"); } + condition.clear(); + condition.put("FLOW_ID", flow.getString("FLOW_ID")); + PageData currentNode = flowDetailMapper.selectOne(condition); + PageData nextNode = new PageData(); + nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); + nextNode.put("FLOW_ID", flow.getString("FLOW_ID")); + nextNode.put("STEP_FLAG", "1"); + nextNode.put("STEP_NAME", "相关方数据将人员信息发送给企业端"); + nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); + nextNode.put("APPROVER_ID", Jurisdiction.getUSER_ID()); + nextNode.put("APPROVER_NAME", Jurisdiction.getName()); + nextNode.put("APPROVER_TIME", DateUtil.getTime()); + nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + nextNode.put("APPROVER_CORPINFO_NAME", ""); + nextNode.put("PASS_FLAG", request.getString("STATUS")); + nextNode.put("END_FLAG", "0"); + nextNode.put("ISDELETE", "0"); + nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); + flowDetailMapper.save(nextNode); + currentNode.put("STEP_FLAG", "0"); + flowDetailMapper.edit(currentNode); } } diff --git a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml index 978c5797..94da1851 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml @@ -87,5 +87,11 @@ and a.FOREIGN_KEY = #{FOREIGN_KEY} + + and a.TYPE = #{TYPE} + + + and a.VALID_FLAG = #{VALID_FLAG} + diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index 0c1343c9..b0713313 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -63,7 +63,14 @@ f.IS_BF, f.IS_SOCIAL, f.SOCIAL_NUMBER, - f.zzName + f.zzName, + f.APPOINT_DEPARTMENT_ID, + f.APPOINT_DEPARTMENT_NAME, + f.APPOINT_ONE_CORP_ID, + f.APPOINT_ONE_CORP_NAME, + f.APPOINT_ONE_DEPARTMENT_ID, + f.APPOINT_ONE_DEPARTMENT_NAME + @@ -122,7 +129,13 @@ IS_BF, IS_SOCIAL, SOCIAL_NUMBER, - zzName + zzName, + APPOINT_DEPARTMENT_ID, + APPOINT_DEPARTMENT_NAME, + APPOINT_ONE_CORP_ID, + APPOINT_ONE_CORP_NAME, + APPOINT_ONE_DEPARTMENT_ID, + APPOINT_ONE_DEPARTMENT_NAME @@ -181,7 +194,13 @@ #{IS_BF}, #{IS_SOCIAL}, #{SOCIAL_NUMBER}, - #{zzName} + #{zzName}, + #{APPOINT_DEPARTMENT_ID}, + #{APPOINT_DEPARTMENT_NAME}, + #{APPOINT_ONE_CORP_ID}, + #{APPOINT_ONE_CORP_NAME}, + #{APPOINT_ONE_DEPARTMENT_ID}, + #{APPOINT_ONE_DEPARTMENT_NAME} @@ -264,7 +283,13 @@ IS_BF = #{IS_BF}, IS_SOCIAL = #{IS_SOCIAL}, SOCIAL_NUMBER = #{SOCIAL_NUMBER}, - zzName = #{zzName} + zzName = #{zzName}, + APPOINT_DEPARTMENT_ID = #{APPOINT_DEPARTMENT_ID}, + APPOINT_DEPARTMENT_NAME = #{APPOINT_DEPARTMENT_NAME}, + APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, + APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, + APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, + APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} From 1cf1adefd9c2a001b778f29a251498282fb3d6ad Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 18 Jan 2024 13:56:15 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xgf/TrainingBatchController.java | 1 - .../controller/xgf/XgfUserController.java | 29 +++++++++++++- .../mapper/datasource/xgf/XgfUserMapper.java | 2 + .../zcloud/service/xgf/XgfUserService.java | 2 + .../service/xgf/impl/XgfUserServiceImpl.java | 22 +++++++++- .../datasource/xgf/XgfUserDetailsMapper.xml | 24 +++++++++-- .../mybatis/datasource/xgf/XgfUserMapper.xml | 40 +++++++++++++++++-- 7 files changed, 108 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java b/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java index feb476ac..26bbb122 100644 --- a/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java +++ b/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java @@ -117,7 +117,6 @@ public class TrainingBatchController extends BaseController { * @throws Exception */ @RequestMapping(value = "/userList") - @RequiresPermissions("trainingbatch:list") @ResponseBody public Object userList(Page page) throws Exception { Map map = new HashMap(); diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index 3929e092..f9ade76d 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -29,7 +29,6 @@ public class XgfUserController extends BaseController { @Resource private TrainingBatchService trainingBatchService; - @RequestMapping(value = "/list") @ResponseBody public Object list(Page page) throws Exception { @@ -43,6 +42,9 @@ public class XgfUserController extends BaseController { return response; } + /** + * 人员信息审核 + */ @RequestMapping(value = "/approve") @ResponseBody public Object approve() throws Exception { @@ -95,4 +97,29 @@ public class XgfUserController extends BaseController { response.put("data", request); return response; } + + @RequestMapping(value = "/getAppointApproveList") + @ResponseBody + public Object getAppointApproveList(Page page) throws Exception{ + PageData request = this.getPageData(); + page.setPd(request); + PageData response = new PageData(); + response.put("result", "success"); + response.put("list", xgfUserService.getAppointApproveList(page)); + response.put("page", page); + return response; + } + + /** + * 人员指定审核 + */ + @RequestMapping(value = "/appointApprove") + @ResponseBody + public Object appointApprove() throws Exception{ + PageData request = this.getPageData(); + PageData response = new PageData(); + response.put("result", "success"); + response.put("data", request); + return response; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java index 63d2150e..87f11474 100644 --- a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java @@ -70,4 +70,6 @@ public interface XgfUserMapper { PageData getInfoById(PageData condition); List findRecordList(PageData condition); + + List appointlistPage(Page page); } diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 3397027c..47ee65ad 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -24,4 +24,6 @@ public interface XgfUserService { PageData findInfo(PageData condition); List findRecordList(PageData condition) throws Exception; + + List getAppointApproveList(Page page); } 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 3a912791..2321c4db 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -70,6 +70,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("XGF_USER_NAME", x.get("NAME")); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); + x.put("CHECK_STATUS","0"); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -116,6 +117,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); + x.put("CHECK_STATUS","0"); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); } else { @@ -221,18 +223,23 @@ public class XgfUserServiceImpl implements XgfUserService { if (entity == null || entity.size() == 0) { throw new RuntimeException("未找到该用户"); } + // 通过则指定监管部门人员进行审核，不同过则打回相关方端(将CHECK_STATUS改为1) if ("1".equals(request.getString("STATUS"))) { - entity.put("STATUS", "2"); + entity.put("STATUS", "1"); entity.put("VALID_FLAG", "1"); - // 企业端人员审核完成后，指定企业端监管部门，中的某人进行培训 + entity.put("CHECK_STATUS","1"); condition.clear(); condition.put("XFG_USER_DETAILS_ID", x); PageData userInfo = xgfUserDetailsMapper.findById(condition); if (userInfo == null || userInfo.size() == 0) { throw new RuntimeException("未找到该用户详细信息"); } + // 企业端人员审核完成后，指定企业端监管部门，中的某人进行审核 userInfo.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); userInfo.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); + userInfo.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); + userInfo.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); + xgfUserDetailsMapper.edit(userInfo); } else { entity.put("STATUS", "0"); PageData key = new PageData(); @@ -287,4 +294,15 @@ public class XgfUserServiceImpl implements XgfUserService { public List findRecordList(PageData condition) throws Exception { return xgfUserMapper.findRecordList(condition); } + + @Override + public List getAppointApproveList(Page page) { + List list = xgfUserMapper.appointlistPage(page); + for (PageData x : list) { + if (StringUtils.isNotBlank(x.getString("APPOINT_USER_ID"))) { + // TODO 判断当前人是否有权限审批 + } + } + return list; + } } diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index b0713313..3115441f 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -66,10 +66,14 @@ f.zzName, f.APPOINT_DEPARTMENT_ID, f.APPOINT_DEPARTMENT_NAME, + f.APPOINT_USER_ID, + f.APPOINT_USER_NAME, f.APPOINT_ONE_CORP_ID, f.APPOINT_ONE_CORP_NAME, f.APPOINT_ONE_DEPARTMENT_ID, - f.APPOINT_ONE_DEPARTMENT_NAME + f.APPOINT_ONE_DEPARTMENT_NAME, + f.APPOINT_ONE_USER_ID, + f.APPOINT_ONE_USER_NAME @@ -132,10 +136,14 @@ zzName, APPOINT_DEPARTMENT_ID, APPOINT_DEPARTMENT_NAME, + APPOINT_USER_ID, + APPOINT_USER_NAME, APPOINT_ONE_CORP_ID, APPOINT_ONE_CORP_NAME, APPOINT_ONE_DEPARTMENT_ID, - APPOINT_ONE_DEPARTMENT_NAME + APPOINT_ONE_DEPARTMENT_NAME, + APPOINT_ONE_USER_ID, + APPOINT_ONE_USER_NAME @@ -197,10 +205,14 @@ #{zzName}, #{APPOINT_DEPARTMENT_ID}, #{APPOINT_DEPARTMENT_NAME}, + #{APPOINT_USER_ID}, + #{APPOINT_USER_NAME}, #{APPOINT_ONE_CORP_ID}, #{APPOINT_ONE_CORP_NAME}, #{APPOINT_ONE_DEPARTMENT_ID}, - #{APPOINT_ONE_DEPARTMENT_NAME} + #{APPOINT_ONE_DEPARTMENT_NAME}, + #{APPOINT_ONE_USER_ID}, + #{APPOINT_ONE_USER_NAME} @@ -286,10 +298,14 @@ zzName = #{zzName}, APPOINT_DEPARTMENT_ID = #{APPOINT_DEPARTMENT_ID}, APPOINT_DEPARTMENT_NAME = #{APPOINT_DEPARTMENT_NAME}, + APPOINT_USER_ID = #{APPOINT_USER_ID}, + APPOINT_USER_NAME = #{APPOINT_USER_NAME}, APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, - APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME} + APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, + APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, + APPOINT_ONE_USER_NAME = #{APPOINT_ONE_USER_NAME} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index ddbff968..78e7a597 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -21,7 +21,8 @@ f.STATUS, f.OPERATOR_TIME, f.ISFLOW, - f.STUDY_STATUS + f.STUDY_STATUS, + f.CHECK_STATUS @@ -38,7 +39,8 @@ STATUS, OPERATOR_TIME, ISFLOW, - STUDY_STATUS + STUDY_STATUS, + CHECK_STATUS @@ -55,7 +57,8 @@ #{STATUS}, #{OPERATOR_TIME}, #{ISFLOW}, - #{STUDY_STATUS} + #{STUDY_STATUS}, + #{CHECK_STATUS} @@ -95,7 +98,8 @@ STATUS = #{STATUS}, OPERATOR_TIME = #{OPERATOR_TIME}, ISFLOW = #{ISFLOW}, - STUDY_STATUS = #{STUDY_STATUS} + STUDY_STATUS = #{STUDY_STATUS}, + CHECK_STATUS = #{CHECK_STATUS} where XGF_USER_ID = #{XGF_USER_ID} @@ -229,6 +233,9 @@ and a.VALID_FLAG = #{pd.VALID_FLAG} + + and a.CHECK_STATUS = #{pd.CHECK_STATUS} + + From b393a6164aecf4fb549a65caf8bd24eddce2c93f Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 19 Jan 2024 16:11:49 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=94=BE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=B5=81=E7=A8=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/datasource/xgf/XgfFlowsMapper.java | 24 ++ .../zcloud/service/xgf/XgfUserService.java | 2 + .../service/xgf/impl/XgfUserServiceImpl.java | 247 +++++++++++-- .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 336 ++++++++++++++++++ .../datasource/xgf/XgfUserDetailsMapper.xml | 49 +-- .../mybatis/datasource/xgf/XgfUserMapper.xml | 34 +- 6 files changed, 614 insertions(+), 78 deletions(-) create mode 100644 src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java create mode 100644 src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java new file mode 100644 index 00000000..4710f34d --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfFlowsMapper.java @@ -0,0 +1,24 @@ +package com.zcloud.mapper.datasource.xgf; + +import java.util.List; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +/** + * 相关方人员审批信息列表(XgfFlows)表数据库访问层 + * + * @author liu jun + * @since 2024-01-19 12:24:00 + */ +public interface XgfFlowsMapper { + int save(PageData entity); + + int delete(PageData entity); + + int edit(PageData pd); + + List datalistPage(Page page); + + PageData findById(PageData condition); +} + diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 47ee65ad..2e947dfa 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -26,4 +26,6 @@ public interface XgfUserService { List findRecordList(PageData condition) throws Exception; List getAppointApproveList(Page page); + + void approveAppoint(PageData request) throws Exception; } 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 2321c4db..1684043a 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -2,6 +2,7 @@ package com.zcloud.service.xgf.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.bus.CorpInfoMapper; import com.zcloud.mapper.datasource.xgf.*; import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.system.DepartmentService; @@ -36,6 +37,12 @@ public class XgfUserServiceImpl implements XgfUserService { @Resource private FlowDetailMapper flowDetailMapper; + @Resource + private XgfFlowsMapper xgfFlowsMapper; + + @Resource + private CorpInfoMapper corpInfoMapper; + @Value("${preventionxgf.api.url}") private String prevention_xgf_url; @@ -70,7 +77,8 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("XGF_USER_NAME", x.get("NAME")); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); - x.put("CHECK_STATUS","0"); + x.put("CHECK_STATUS", "0"); + x.put("CHECK_STEP", 1); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -117,7 +125,8 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); - x.put("CHECK_STATUS","0"); + x.put("CHECK_STATUS", "0"); + x.put("CHECK_STEP", 1); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); } else { @@ -130,6 +139,43 @@ public class XgfUserServiceImpl implements XgfUserService { } /* 2、保存相关方人员流程审批信息 */ condition.clear(); + condition.put("FLOWS_ID", x.getString("USER_ID")); + PageData flows = xgfFlowsMapper.findById(condition); + if (flows == null || flows.size() <= 0) { + flows = new PageData(); + flows.put("FLOWS_ID", x.getString("USER_ID")); + flows.put("FLOWS_STEP", 1); + flows.put("FOREIGN_KEY_ID", x.getString("USER_ID")); + flows.put("FOREIGN_KEY_NAME", "xgf_user=>XGF_USER_ID"); + flows.put("APPOINT_ZERO_CORP_ID", x.getString("CORPINFO_ID")); + condition.clear(); + condition.put("CORPINFO_ID", x.getString("CORPINFO_ID")); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + flows.put("APPOINT_ZERO_CORP_NAME", corpInfo.getString("NAME")); + } + flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_ZERO_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_ZERO_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_ZERO_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_ZERO_USER_NAME")); + xgfFlowsMapper.save(flows); + } else { + flows.put("APPOINT_ZERO_CORP_ID", x.getString("CORPINFO_ID")); + flows.put("FLOWS_STEP", 1); + condition.clear(); + condition.put("CORPINFO_ID", x.getString("CORPINFO_ID")); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + flows.put("APPOINT_ZERO_CORP_NAME", corpInfo.getString("NAME")); + } + flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_ZERO_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_ZERO_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_ZERO_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_ZERO_USER_NAME")); + xgfFlowsMapper.edit(flows); + } + /* 3、流程记录 */ + condition.clear(); condition.put("FOREIGN_KEY", x.getString("XGF_USER_ID")); condition.put("TYPE", "1"); condition.put("VALID_FLAG", "1"); @@ -227,19 +273,8 @@ public class XgfUserServiceImpl implements XgfUserService { if ("1".equals(request.getString("STATUS"))) { entity.put("STATUS", "1"); entity.put("VALID_FLAG", "1"); - entity.put("CHECK_STATUS","1"); - condition.clear(); - condition.put("XFG_USER_DETAILS_ID", x); - PageData userInfo = xgfUserDetailsMapper.findById(condition); - if (userInfo == null || userInfo.size() == 0) { - throw new RuntimeException("未找到该用户详细信息"); - } - // 企业端人员审核完成后，指定企业端监管部门，中的某人进行审核 - userInfo.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); - userInfo.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); - userInfo.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); - userInfo.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); - xgfUserDetailsMapper.edit(userInfo); + entity.put("CHECK_STATUS", "1"); + entity.put("CHECK_STEP", 2); } else { entity.put("STATUS", "0"); PageData key = new PageData(); @@ -250,15 +285,33 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + } + /* 保存审批信息 */ + condition.clear(); + condition.put("FLOWS_ID", x); + PageData flows = xgfFlowsMapper.findById(condition); + if (flows == null || flows.size() == 0) { + throw new RuntimeException("未找到该用户详细信息"); + } + condition.clear(); + condition.put("STATUS", request.getString("STATUS")); + condition.put("APPOINT_CORP_ID", request.getString("APPOINT_CORP_ID")); + condition.put("APPOINT_CORP_NAME", request.getString("APPOINT_CORP_NAME")); + condition.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); + condition.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); + condition.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); + condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); + handle(condition, flows); + xgfUserMapper.edit(entity); - /* 保存审批流程明细信息 */ + /* 保存审批记录 */ condition.clear(); condition.put("FOREIGN_KEY", entity.getString("XGF_USER_ID")); condition.put("TYPE", "1"); condition.put("VALID_FLAG", "1"); PageData flow = flowMapper.findByCondition(condition); - if (flow == null || flow.size() == 0){ + if (flow == null || flow.size() == 0) { throw new RuntimeException("未找到该用户审批流程"); } condition.clear(); @@ -274,7 +327,12 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_NAME", Jurisdiction.getName()); nextNode.put("APPROVER_TIME", DateUtil.getTime()); nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - nextNode.put("APPROVER_CORPINFO_NAME", ""); + condition.clear(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("NAME")); + } nextNode.put("PASS_FLAG", request.getString("STATUS")); nextNode.put("END_FLAG", "0"); nextNode.put("ISDELETE", "0"); @@ -299,10 +357,157 @@ public class XgfUserServiceImpl implements XgfUserService { public List getAppointApproveList(Page page) { List list = xgfUserMapper.appointlistPage(page); for (PageData x : list) { - if (StringUtils.isNotBlank(x.getString("APPOINT_USER_ID"))) { - // TODO 判断当前人是否有权限审批 - } + x.put("power_flag", getPower(x)); } return list; } + + @Override + public void approveAppoint(PageData request) throws Exception { + PageData condition = new PageData(); + condition.put("XGF_USER_ID",request.getString("XGF_USER_ID")); + PageData userInfo = xgfUserMapper.findById(condition); + if (userInfo == null || userInfo.size() == 0) { + throw new RuntimeException("未找到该用户"); + } + condition.clear(); + condition.put("FLOWS_ID", userInfo.getString("XGF_USER_ID")); + PageData flows = xgfFlowsMapper.findById(condition); + if (flows == null || flows.size() == 0) { + throw new RuntimeException("未找到该用户详审批信息"); + } + handle(request,flows); + } + + /* 获取当前用户是否有权限审批 */ + private String getPower(PageData x) { + switch (Integer.parseInt(x.get("CHECK_STEP").toString())) { + case 1: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ONE_USER_ID"))) { + return "1"; + } + case 2: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_TWO_USER_ID"))) { + return "1"; + } + case 3: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_THREE_USER_ID"))) { + return "1"; + } + case 4: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FOUR_USER_ID"))) { + return "1"; + } + case 5: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_FIVE_USER_ID"))) { + return "1"; + } + case 6: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SIX_USER_ID"))) { + return "1"; + } + case 7: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_SEVEN_USER_ID"))) { + return "1"; + } + default: + return "0"; + } + } + + void handle(PageData info, PageData flows) throws Exception{ + switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { + case 1: + flows.put("APPOINT_ONE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ONE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + 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")); + 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); + break; + case 2: + flows.put("APPOINT_TWO_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_TWO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_TWO_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); + break; + case 3: + flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + 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_THREE_TIME", DateUtil.getTime()); + flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 4); + xgfFlowsMapper.edit(flows); + break; + case 4: + flows.put("APPOINT_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); + 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); + break; + case 5: + flows.put("APPOINT_FIVE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_FIVE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_FIVE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_FIVE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_FIVE_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_FIVE_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); + flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 6); + xgfFlowsMapper.edit(flows); + break; + case 6: + flows.put("APPOINT_SIX_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_SIX_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_SIX_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_SIX_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_SIX_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_SIX_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_SIX_TIME", DateUtil.getTime()); + flows.put("APPOINT_SIX_STATUS", info.getString("STATUS")); + flows.put("APPOINT_SIX_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 7); + xgfFlowsMapper.edit(flows); + break; + case 7: + flows.put("APPOINT_SEVEN_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_SEVEN_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_SEVEN_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_SEVEN_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_SEVEN_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_SEVEN_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_SEVEN_TIME", DateUtil.getTime()); + flows.put("APPOINT_SEVEN_STATUS", info.getString("STATUS")); + flows.put("APPOINT_SEVEN_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 8); + xgfFlowsMapper.edit(flows); + break; + } + } } diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml new file mode 100644 index 00000000..a9f52371 --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -0,0 +1,336 @@ + + + + + + xgf_flows + + + + f.FLOWS_ID, + f.FOREIGN_KEY_ID, + f.FOREIGN_KEY_NAME, + f.FLOWS_STEP, + f.IS_DELETE, + f.APPOINT_ZERO_CORP_ID, + f.APPOINT_ZERO_CORP_TYEP, + f.APPOINT_ZERO_CORP_NAME, + f.APPOINT_ZERO_DEPARTMENT_ID, + f.APPOINT_ZERO_DEPARTMENT_NAME, + f.APPOINT_ZERO_USER_ID, + f.APPOINT_ZERO_USER_NAME, + f.APPOINT_ZERO_STATUS, + f.APPOINT_ZERO_OPINION, + f.APPOINT_ZERO_TIME, + f.APPOINT_ONE_CORP_ID, + f.APPOINT_ONE_CORP_NAME, + f.APPOINT_ONE_CORP_TYEP, + f.APPOINT_ONE_DEPARTMENT_ID, + f.APPOINT_ONE_DEPARTMENT_NAME, + f.APPOINT_ONE_USER_ID, + f.APPOINT_ONE_USER_NAME, + f.APPOINT_ONE_STATUS, + f.APPOINT_ONE_OPINION, + f.APPOINT_ONE_TIME, + f.APPOINT_TWO_CORP_ID, + f.APPOINT_TWO_CORP_NAME, + f.APPOINT_TWO_DEPARTMENT_ID, + f.APPOINT_TWO_DEPARTMENT_NAME, + f.APPOINT_TWO_USER_ID, + f.APPOINT_TWO_USER_NAME, + f.APPOINT_TWO_TIME, + f.APPOINT_THREE_CORP_ID, + f.APPOINT_THREE_CORP_NAME, + f.APPOINT_THREE_DEPARTMENT_ID, + f.APPOINT_THREE_DEPARTMENT_NAME, + f.APPOINT_THREE_USER_ID, + f.APPOINT_THREE_USER_NAME, + f.APPOINT_THREE_STATUS, + f.APPOINT_THREE_OPINION, + f.APPOINT_THREE_TIME, + f.APPOINT_FOUR_CORP_ID, + f.APPOINT_FOUR_CORP_NAME, + f.APPOINT_FOUR_DEPARTMENT_ID, + f.APPOINT_FOUR_DEPARTMENT_NAME, + f.APPOINT_FOUR_USER_ID, + f.APPOINT_FOUR_USER_NAME, + f.APPOINT_FOUR_STATUS, + f.APPOINT_FOUR_OPINION, + f.APPOINT_FIVE_CORP_ID, + f.APPOINT_FIVE_CORP_NAME, + f.APPOINT_FIVE_DEPARTMENT_ID, + f.APPOINT_FIVE_DEPARTMENT_NAME, + f.APPOINT_FIVE_USER_ID, + f.APPOINT_FIVE_USER_NAME, + f.APPOINT_FIVE_STATUS, + f.APPOINT_FIVE_OPINION, + f.APPOINT_SIX_CORP_ID, + f.APPOINT_SIX_CORP_NAME, + f.APPOINT_SIX_DEPARTMENT_ID, + f.APPOINT_SIX_DEPARTMENT_NAME, + f.APPOINT_SIX_USER_ID, + f.APPOINT_SIX_USER_NAME, + f.APPOINT_SIX_STATUS, + f.APPOINT_SIX_OPINION, + f.APPOINT_SEVEN_CORP_ID, + f.APPOINT_SEVEN_CORP_NAME, + f.APPOINT_SEVEN_DEPARTMENT_ID, + f.APPOINT_SEVEN_DEPARTMENT_NAME, + f.APPOINT_SEVEN_USER_ID, + f.APPOINT_SEVEN_USER_NAME, + f.APPOINT_SEVEN_STATUS, + f.APPOINT_SEVEN_OPINION + + + + FLOWS_ID, + FOREIGN_KEY_ID, + FOREIGN_KEY_NAME, + FLOWS_STEP, + IS_DELETE, + APPOINT_ZERO_CORP_ID, + APPOINT_ZERO_CORP_TYEP, + APPOINT_ZERO_CORP_NAME, + APPOINT_ZERO_DEPARTMENT_ID, + APPOINT_ZERO_DEPARTMENT_NAME, + APPOINT_ZERO_USER_ID, + APPOINT_ZERO_USER_NAME, + APPOINT_ZERO_STATUS, + APPOINT_ZERO_OPINION, + APPOINT_ZERO_TIME, + APPOINT_ONE_CORP_ID, + APPOINT_ONE_CORP_NAME, + APPOINT_ONE_CORP_TYEP, + APPOINT_ONE_DEPARTMENT_ID, + APPOINT_ONE_DEPARTMENT_NAME, + APPOINT_ONE_USER_ID, + APPOINT_ONE_USER_NAME, + APPOINT_ONE_STATUS, + APPOINT_ONE_OPINION, + APPOINT_ONE_TIME, + APPOINT_TWO_CORP_ID, + APPOINT_TWO_CORP_NAME, + APPOINT_TWO_DEPARTMENT_ID, + APPOINT_TWO_DEPARTMENT_NAME, + APPOINT_TWO_USER_ID, + APPOINT_TWO_USER_NAME, + APPOINT_TWO_TIME, + APPOINT_THREE_CORP_ID, + APPOINT_THREE_CORP_NAME, + APPOINT_THREE_DEPARTMENT_ID, + APPOINT_THREE_DEPARTMENT_NAME, + APPOINT_THREE_USER_ID, + APPOINT_THREE_USER_NAME, + APPOINT_THREE_STATUS, + APPOINT_THREE_OPINION, + APPOINT_THREE_TIME, + APPOINT_FOUR_CORP_ID, + APPOINT_FOUR_CORP_NAME, + APPOINT_FOUR_DEPARTMENT_ID, + APPOINT_FOUR_DEPARTMENT_NAME, + APPOINT_FOUR_USER_ID, + APPOINT_FOUR_USER_NAME, + APPOINT_FOUR_STATUS, + APPOINT_FOUR_OPINION, + APPOINT_FIVE_CORP_ID, + APPOINT_FIVE_CORP_NAME, + APPOINT_FIVE_DEPARTMENT_ID, + APPOINT_FIVE_DEPARTMENT_NAME, + APPOINT_FIVE_USER_ID, + APPOINT_FIVE_USER_NAME, + APPOINT_FIVE_STATUS, + APPOINT_FIVE_OPINION, + APPOINT_SIX_CORP_ID, + APPOINT_SIX_CORP_NAME, + APPOINT_SIX_DEPARTMENT_ID, + APPOINT_SIX_DEPARTMENT_NAME, + APPOINT_SIX_USER_ID, + APPOINT_SIX_USER_NAME, + APPOINT_SIX_STATUS, + APPOINT_SIX_OPINION, + APPOINT_SEVEN_CORP_ID, + APPOINT_SEVEN_CORP_NAME, + APPOINT_SEVEN_DEPARTMENT_ID, + APPOINT_SEVEN_DEPARTMENT_NAME, + APPOINT_SEVEN_USER_ID, + APPOINT_SEVEN_USER_NAME, + APPOINT_SEVEN_STATUS, + APPOINT_SEVEN_OPINION + + + + #{FLOWS_ID}, + #{FOREIGN_KEY_ID}, + #{FOREIGN_KEY_NAME}, + #{FLOWS_STEP}, + #{IS_DELETE}, + #{APPOINT_ZERO_CORP_ID}, + #{APPOINT_ZERO_CORP_TYEP}, + #{APPOINT_ZERO_CORP_NAME}, + #{APPOINT_ZERO_DEPARTMENT_ID}, + #{APPOINT_ZERO_DEPARTMENT_NAME}, + #{APPOINT_ZERO_USER_ID}, + #{APPOINT_ZERO_USER_NAME}, + #{APPOINT_ZERO_STATUS}, + #{APPOINT_ZERO_OPINION}, + #{APPOINT_ZERO_TIME}, + #{APPOINT_ONE_CORP_ID}, + #{APPOINT_ONE_CORP_NAME}, + #{APPOINT_ONE_CORP_TYEP}, + #{APPOINT_ONE_DEPARTMENT_ID}, + #{APPOINT_ONE_DEPARTMENT_NAME}, + #{APPOINT_ONE_USER_ID}, + #{APPOINT_ONE_USER_NAME}, + #{APPOINT_ONE_STATUS}, + #{APPOINT_ONE_OPINION}, + #{APPOINT_ONE_TIME}, + #{APPOINT_TWO_CORP_ID}, + #{APPOINT_TWO_CORP_NAME}, + #{APPOINT_TWO_DEPARTMENT_ID}, + #{APPOINT_TWO_DEPARTMENT_NAME}, + #{APPOINT_TWO_USER_ID}, + #{APPOINT_TWO_USER_NAME}, + #{APPOINT_TWO_TIME}, + #{APPOINT_THREE_CORP_ID}, + #{APPOINT_THREE_CORP_NAME}, + #{APPOINT_THREE_DEPARTMENT_ID}, + #{APPOINT_THREE_DEPARTMENT_NAME}, + #{APPOINT_THREE_USER_ID}, + #{APPOINT_THREE_USER_NAME}, + #{APPOINT_THREE_STATUS}, + #{APPOINT_THREE_OPINION}, + #{APPOINT_THREE_TIME}, + #{APPOINT_FOUR_CORP_ID}, + #{APPOINT_FOUR_CORP_NAME}, + #{APPOINT_FOUR_DEPARTMENT_ID}, + #{APPOINT_FOUR_DEPARTMENT_NAME}, + #{APPOINT_FOUR_USER_ID}, + #{APPOINT_FOUR_USER_NAME}, + #{APPOINT_FOUR_STATUS}, + #{APPOINT_FOUR_OPINION}, + #{APPOINT_FIVE_CORP_ID}, + #{APPOINT_FIVE_CORP_NAME}, + #{APPOINT_FIVE_DEPARTMENT_ID}, + #{APPOINT_FIVE_DEPARTMENT_NAME}, + #{APPOINT_FIVE_USER_ID}, + #{APPOINT_FIVE_USER_NAME}, + #{APPOINT_FIVE_STATUS}, + #{APPOINT_FIVE_OPINION}, + #{APPOINT_SIX_CORP_ID}, + #{APPOINT_SIX_CORP_NAME}, + #{APPOINT_SIX_DEPARTMENT_ID}, + #{APPOINT_SIX_DEPARTMENT_NAME}, + #{APPOINT_SIX_USER_ID}, + #{APPOINT_SIX_USER_NAME}, + #{APPOINT_SIX_STATUS}, + #{APPOINT_SIX_OPINION}, + #{APPOINT_SEVEN_CORP_ID}, + #{APPOINT_SEVEN_CORP_NAME}, + #{APPOINT_SEVEN_DEPARTMENT_ID}, + #{APPOINT_SEVEN_DEPARTMENT_NAME}, + #{APPOINT_SEVEN_USER_ID}, + #{APPOINT_SEVEN_USER_NAME}, + #{APPOINT_SEVEN_STATUS}, + #{APPOINT_SEVEN_OPINION} + + + + + insert into xgf_flows () values () + + + + + delete from xgf_flows where FLOWS_ID = #{FLOWS_ID} + + + + + update xgf_flows set + FLOWS_ID = #{FLOWS_ID}, + FOREIGN_KEY_ID = #{FOREIGN_KEY_ID}, + FOREIGN_KEY_NAME = #{FOREIGN_KEY_NAME}, + FLOWS_STEP = #{FLOWS_STEP}, + IS_DELETE = #{IS_DELETE}, + APPOINT_ZERO_CORP_ID = #{APPOINT_ZERO_CORP_ID}, + APPOINT_ZERO_CORP_TYEP = #{APPOINT_ZERO_CORP_TYEP}, + APPOINT_ZERO_CORP_NAME = #{APPOINT_ZERO_CORP_NAME}, + APPOINT_ZERO_DEPARTMENT_ID = #{APPOINT_ZERO_DEPARTMENT_ID}, + APPOINT_ZERO_DEPARTMENT_NAME = #{APPOINT_ZERO_DEPARTMENT_NAME}, + APPOINT_ZERO_USER_ID = #{APPOINT_ZERO_USER_ID}, + APPOINT_ZERO_USER_NAME = #{APPOINT_ZERO_USER_NAME}, + APPOINT_ZERO_STATUS = #{APPOINT_ZERO_STATUS}, + APPOINT_ZERO_OPINION = #{APPOINT_ZERO_OPINION}, + APPOINT_ZERO_TIME = #{APPOINT_ZERO_TIME}, + APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, + APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, + APPOINT_ONE_CORP_TYEP = #{APPOINT_ONE_CORP_TYEP}, + APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, + APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, + APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, + APPOINT_ONE_USER_NAME = #{APPOINT_ONE_USER_NAME}, + APPOINT_ONE_STATUS = #{APPOINT_ONE_STATUS}, + APPOINT_ONE_OPINION = #{APPOINT_ONE_OPINION}, + APPOINT_ONE_TIME = #{APPOINT_ONE_TIME}, + APPOINT_TWO_CORP_ID = #{APPOINT_TWO_CORP_ID}, + APPOINT_TWO_CORP_NAME = #{APPOINT_TWO_CORP_NAME}, + APPOINT_TWO_DEPARTMENT_ID = #{APPOINT_TWO_DEPARTMENT_ID}, + 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_TIME = #{APPOINT_TWO_TIME}, + APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, + APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME}, + APPOINT_THREE_DEPARTMENT_ID = #{APPOINT_THREE_DEPARTMENT_ID}, + APPOINT_THREE_DEPARTMENT_NAME = #{APPOINT_THREE_DEPARTMENT_NAME}, + APPOINT_THREE_USER_ID = #{APPOINT_THREE_USER_ID}, + APPOINT_THREE_USER_NAME = #{APPOINT_THREE_USER_NAME}, + APPOINT_THREE_STATUS = #{APPOINT_THREE_STATUS}, + APPOINT_THREE_OPINION = #{APPOINT_THREE_OPINION}, + APPOINT_THREE_TIME = #{APPOINT_THREE_TIME}, + APPOINT_FOUR_CORP_ID = #{APPOINT_FOUR_CORP_ID}, + APPOINT_FOUR_CORP_NAME = #{APPOINT_FOUR_CORP_NAME}, + APPOINT_FOUR_DEPARTMENT_ID = #{APPOINT_FOUR_DEPARTMENT_ID}, + APPOINT_FOUR_DEPARTMENT_NAME = #{APPOINT_FOUR_DEPARTMENT_NAME}, + APPOINT_FOUR_USER_ID = #{APPOINT_FOUR_USER_ID}, + APPOINT_FOUR_USER_NAME = #{APPOINT_FOUR_USER_NAME}, + APPOINT_FOUR_STATUS = #{APPOINT_FOUR_STATUS}, + APPOINT_FOUR_OPINION = #{APPOINT_FOUR_OPINION}, + APPOINT_FIVE_CORP_ID = #{APPOINT_FIVE_CORP_ID}, + APPOINT_FIVE_CORP_NAME = #{APPOINT_FIVE_CORP_NAME}, + APPOINT_FIVE_DEPARTMENT_ID = #{APPOINT_FIVE_DEPARTMENT_ID}, + APPOINT_FIVE_DEPARTMENT_NAME = #{APPOINT_FIVE_DEPARTMENT_NAME}, + APPOINT_FIVE_USER_ID = #{APPOINT_FIVE_USER_ID}, + APPOINT_FIVE_USER_NAME = #{APPOINT_FIVE_USER_NAME}, + APPOINT_FIVE_STATUS = #{APPOINT_FIVE_STATUS}, + APPOINT_FIVE_OPINION = #{APPOINT_FIVE_OPINION}, + APPOINT_SIX_CORP_ID = #{APPOINT_SIX_CORP_ID}, + APPOINT_SIX_CORP_NAME = #{APPOINT_SIX_CORP_NAME}, + APPOINT_SIX_DEPARTMENT_ID = #{APPOINT_SIX_DEPARTMENT_ID}, + APPOINT_SIX_DEPARTMENT_NAME = #{APPOINT_SIX_DEPARTMENT_NAME}, + APPOINT_SIX_USER_ID = #{APPOINT_SIX_USER_ID}, + APPOINT_SIX_USER_NAME = #{APPOINT_SIX_USER_NAME}, + APPOINT_SIX_STATUS = #{APPOINT_SIX_STATUS}, + APPOINT_SIX_OPINION = #{APPOINT_SIX_OPINION}, + APPOINT_SEVEN_CORP_ID = #{APPOINT_SEVEN_CORP_ID}, + APPOINT_SEVEN_CORP_NAME = #{APPOINT_SEVEN_CORP_NAME}, + APPOINT_SEVEN_DEPARTMENT_ID = #{APPOINT_SEVEN_DEPARTMENT_ID}, + APPOINT_SEVEN_DEPARTMENT_NAME = #{APPOINT_SEVEN_DEPARTMENT_NAME}, + APPOINT_SEVEN_USER_ID = #{APPOINT_SEVEN_USER_ID}, + APPOINT_SEVEN_USER_NAME = #{APPOINT_SEVEN_USER_NAME}, + APPOINT_SEVEN_STATUS = #{APPOINT_SEVEN_STATUS}, + APPOINT_SEVEN_OPINION = #{APPOINT_SEVEN_OPINION} + where a.FLOWS_ID = #{FLOWS_ID} + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index 3115441f..0c1343c9 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -63,18 +63,7 @@ f.IS_BF, f.IS_SOCIAL, f.SOCIAL_NUMBER, - f.zzName, - f.APPOINT_DEPARTMENT_ID, - f.APPOINT_DEPARTMENT_NAME, - f.APPOINT_USER_ID, - f.APPOINT_USER_NAME, - f.APPOINT_ONE_CORP_ID, - f.APPOINT_ONE_CORP_NAME, - f.APPOINT_ONE_DEPARTMENT_ID, - f.APPOINT_ONE_DEPARTMENT_NAME, - f.APPOINT_ONE_USER_ID, - f.APPOINT_ONE_USER_NAME - + f.zzName @@ -133,17 +122,7 @@ IS_BF, IS_SOCIAL, SOCIAL_NUMBER, - zzName, - APPOINT_DEPARTMENT_ID, - APPOINT_DEPARTMENT_NAME, - APPOINT_USER_ID, - APPOINT_USER_NAME, - APPOINT_ONE_CORP_ID, - APPOINT_ONE_CORP_NAME, - APPOINT_ONE_DEPARTMENT_ID, - APPOINT_ONE_DEPARTMENT_NAME, - APPOINT_ONE_USER_ID, - APPOINT_ONE_USER_NAME + zzName @@ -202,17 +181,7 @@ #{IS_BF}, #{IS_SOCIAL}, #{SOCIAL_NUMBER}, - #{zzName}, - #{APPOINT_DEPARTMENT_ID}, - #{APPOINT_DEPARTMENT_NAME}, - #{APPOINT_USER_ID}, - #{APPOINT_USER_NAME}, - #{APPOINT_ONE_CORP_ID}, - #{APPOINT_ONE_CORP_NAME}, - #{APPOINT_ONE_DEPARTMENT_ID}, - #{APPOINT_ONE_DEPARTMENT_NAME}, - #{APPOINT_ONE_USER_ID}, - #{APPOINT_ONE_USER_NAME} + #{zzName} @@ -295,17 +264,7 @@ IS_BF = #{IS_BF}, IS_SOCIAL = #{IS_SOCIAL}, SOCIAL_NUMBER = #{SOCIAL_NUMBER}, - zzName = #{zzName}, - APPOINT_DEPARTMENT_ID = #{APPOINT_DEPARTMENT_ID}, - APPOINT_DEPARTMENT_NAME = #{APPOINT_DEPARTMENT_NAME}, - APPOINT_USER_ID = #{APPOINT_USER_ID}, - APPOINT_USER_NAME = #{APPOINT_USER_NAME}, - APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, - APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, - APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, - APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, - APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, - APPOINT_ONE_USER_NAME = #{APPOINT_ONE_USER_NAME} + zzName = #{zzName} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index 78e7a597..9a021c38 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -22,7 +22,8 @@ f.OPERATOR_TIME, f.ISFLOW, f.STUDY_STATUS, - f.CHECK_STATUS + f.CHECK_STATUS, + f.CHECK_STEP @@ -40,7 +41,8 @@ OPERATOR_TIME, ISFLOW, STUDY_STATUS, - CHECK_STATUS + CHECK_STATUS, + CHECK_STEP @@ -58,7 +60,8 @@ #{OPERATOR_TIME}, #{ISFLOW}, #{STUDY_STATUS}, - #{CHECK_STATUS} + #{CHECK_STATUS}, + #{CHECK_STEP} @@ -99,7 +102,8 @@ OPERATOR_TIME = #{OPERATOR_TIME}, ISFLOW = #{ISFLOW}, STUDY_STATUS = #{STUDY_STATUS}, - CHECK_STATUS = #{CHECK_STATUS} + CHECK_STATUS = #{CHECK_STATUS}, + CHECK_STEP = #{CHECK_STEP} where XGF_USER_ID = #{XGF_USER_ID} @@ -321,15 +325,18 @@ a.BELONG_TO_CORP_NAME, a.USERNAME, a.NAME, - b.MANAGER_DEPARTMENT_ID, - b.MANAGER_DEPARTMENT_NAME, - b.MAIN_DEPARTMENT_ID, - b.MAIN_DEPARTMENT_NAME - from - xgf_user a - left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID + c.* + from xgf_user a + left join xgf_flows c on a.XGF_USER_ID = c.FLOWS_ID where a.IS_DELETE = '0' - and (a.APPOINT_USER_ID = #{pd.USER_ID} or a.APPOINT_ONE_USER_ID is #{pd.USER_ID}) + and (c.APPOINT_ONE_USER_ID = #{pd.USER_ID} + or c.APPOINT_TWO_USER_ID = #{pd.USER_ID} + or c.APPOINT_THREE_USER_ID = #{pd.USER_ID} + or c.APPOINT_FOUR_USER_ID = #{pd.USER_ID} + or c.APPOINT_FIVE_USER_ID = #{pd.USER_ID} + or c.APPOINT_SIX_USER_ID = #{pd.USER_ID} + or c.APPOINT_SEVEN_USER_ID = #{pd.USER_ID} + ) and a.STATUS = #{pd.STATUS} @@ -339,6 +346,9 @@ and a.CHECK_STATUS = #{pd.CHECK_STATUS} + + and a.CHECK_STEP = #{pd.CHECK_STEP} + From 0bfd1d1d9dc4a6ab1a2aa6db64175be9fa786718 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 19 Jan 2024 16:45:45 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xgf/XgfUserController.java | 2 + .../zcloud/service/xgf/XgfUserService.java | 2 - .../service/xgf/impl/XgfUserServiceImpl.java | 108 +++++++++--------- 3 files changed, 53 insertions(+), 59 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index f9ade76d..22d6d78d 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -6,6 +6,7 @@ import com.zcloud.entity.PageData; import com.zcloud.service.xgf.TrainingBatchService; import com.zcloud.service.xgf.XgfUserService; import com.zcloud.util.HttpClientService; +import com.zcloud.util.Jurisdiction; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -102,6 +103,7 @@ public class XgfUserController extends BaseController { @ResponseBody public Object getAppointApproveList(Page page) throws Exception{ PageData request = this.getPageData(); + request.put("USER_ID", Jurisdiction.getUSER_ID()); page.setPd(request); PageData response = new PageData(); response.put("result", "success"); diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 2e947dfa..47ee65ad 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -26,6 +26,4 @@ public interface XgfUserService { List findRecordList(PageData condition) throws Exception; List getAppointApproveList(Page page); - - void approveAppoint(PageData request) throws Exception; } 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 1684043a..b881982f 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -271,12 +271,17 @@ public class XgfUserServiceImpl implements XgfUserService { } // 通过则指定监管部门人员进行审核，不同过则打回相关方端(将CHECK_STATUS改为1) if ("1".equals(request.getString("STATUS"))) { - entity.put("STATUS", "1"); entity.put("VALID_FLAG", "1"); - entity.put("CHECK_STATUS", "1"); - entity.put("CHECK_STEP", 2); + if (StringUtils.isBlank(entity.getString("endFlag"))) { + entity.put("CHECK_STATUS", "1"); + } else { + entity.put("CHECK_STATUS", 2); + } + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); } else { entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); @@ -302,44 +307,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); condition.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); - handle(condition, flows); - + // 保存审计进度 + this.handle(condition, flows); + // 保存审批记录 + this.saveLog(x, request.getString("STATUS"), "企业端初次审批"); xgfUserMapper.edit(entity); - /* 保存审批记录 */ - condition.clear(); - condition.put("FOREIGN_KEY", entity.getString("XGF_USER_ID")); - condition.put("TYPE", "1"); - condition.put("VALID_FLAG", "1"); - PageData flow = flowMapper.findByCondition(condition); - if (flow == null || flow.size() == 0) { - throw new RuntimeException("未找到该用户审批流程"); - } - condition.clear(); - condition.put("FLOW_ID", flow.getString("FLOW_ID")); - PageData currentNode = flowDetailMapper.selectOne(condition); - PageData nextNode = new PageData(); - nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); - nextNode.put("FLOW_ID", flow.getString("FLOW_ID")); - nextNode.put("STEP_FLAG", "1"); - nextNode.put("STEP_NAME", "相关方数据将人员信息发送给企业端"); - nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); - nextNode.put("APPROVER_ID", Jurisdiction.getUSER_ID()); - nextNode.put("APPROVER_NAME", Jurisdiction.getName()); - nextNode.put("APPROVER_TIME", DateUtil.getTime()); - nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - condition.clear(); - condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - PageData corpInfo = corpInfoMapper.findById(condition); - if (corpInfo != null && corpInfo.size() > 0) { - nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("NAME")); - } - nextNode.put("PASS_FLAG", request.getString("STATUS")); - nextNode.put("END_FLAG", "0"); - nextNode.put("ISDELETE", "0"); - nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); - flowDetailMapper.save(nextNode); - currentNode.put("STEP_FLAG", "0"); - flowDetailMapper.edit(currentNode); } } @@ -362,23 +334,6 @@ public class XgfUserServiceImpl implements XgfUserService { return list; } - @Override - public void approveAppoint(PageData request) throws Exception { - PageData condition = new PageData(); - condition.put("XGF_USER_ID",request.getString("XGF_USER_ID")); - PageData userInfo = xgfUserMapper.findById(condition); - if (userInfo == null || userInfo.size() == 0) { - throw new RuntimeException("未找到该用户"); - } - condition.clear(); - condition.put("FLOWS_ID", userInfo.getString("XGF_USER_ID")); - PageData flows = xgfFlowsMapper.findById(condition); - if (flows == null || flows.size() == 0) { - throw new RuntimeException("未找到该用户详审批信息"); - } - handle(request,flows); - } - /* 获取当前用户是否有权限审批 */ private String getPower(PageData x) { switch (Integer.parseInt(x.get("CHECK_STEP").toString())) { @@ -510,4 +465,43 @@ public class XgfUserServiceImpl implements XgfUserService { break; } } + + void saveLog(String id,String status,String name){ + /* 保存审批记录 */ + PageData condition = new PageData(); + condition.clear(); + condition.put("FOREIGN_KEY", id); + condition.put("TYPE", "1"); + condition.put("VALID_FLAG", "1"); + PageData flow = flowMapper.findByCondition(condition); + if (flow == null || flow.size() == 0) { + throw new RuntimeException("流程已被暂停，请联系管理员"); + } + condition.clear(); + condition.put("FLOW_ID", flow.getString("FLOW_ID")); + PageData currentNode = flowDetailMapper.selectOne(condition); + PageData nextNode = new PageData(); + nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); + nextNode.put("FLOW_ID", flow.getString("FLOW_ID")); + nextNode.put("STEP_FLAG", "1"); + nextNode.put("STEP_NAME", name); + nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); + nextNode.put("APPROVER_ID", Jurisdiction.getUSER_ID()); + nextNode.put("APPROVER_NAME", Jurisdiction.getName()); + nextNode.put("APPROVER_TIME", DateUtil.getTime()); + nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + condition.clear(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("NAME")); + } + nextNode.put("PASS_FLAG", status); + nextNode.put("END_FLAG", "0"); + nextNode.put("ISDELETE", "0"); + nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); + flowDetailMapper.save(nextNode); + currentNode.put("STEP_FLAG", "0"); + flowDetailMapper.edit(currentNode); + } } From 7d015ec13839e7ce083cd2792650edbcbb124e0b Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 19 Jan 2024 18:35:26 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=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 | 56 ++++++++++--------- .../datasource/xgf/FlowDetailMapper.xml | 16 ++++-- .../mybatis/datasource/xgf/FlowMapper.xml | 10 +++- .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 4 +- .../mybatis/datasource/xgf/XgfUserMapper.xml | 4 +- 5 files changed, 52 insertions(+), 38 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 b881982f..ba0b55c6 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -78,7 +78,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); x.put("CHECK_STATUS", "0"); - x.put("CHECK_STEP", 1); + x.put("CHECK_STEP", 0); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -126,7 +126,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); x.put("CHECK_STATUS", "0"); - x.put("CHECK_STEP", 1); + x.put("CHECK_STEP", 0); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); } else { @@ -144,34 +144,25 @@ public class XgfUserServiceImpl implements XgfUserService { if (flows == null || flows.size() <= 0) { flows = new PageData(); flows.put("FLOWS_ID", x.getString("USER_ID")); - flows.put("FLOWS_STEP", 1); + flows.put("FLOWS_STEP", 0); flows.put("FOREIGN_KEY_ID", x.getString("USER_ID")); flows.put("FOREIGN_KEY_NAME", "xgf_user=>XGF_USER_ID"); - flows.put("APPOINT_ZERO_CORP_ID", x.getString("CORPINFO_ID")); - condition.clear(); - condition.put("CORPINFO_ID", x.getString("CORPINFO_ID")); - PageData corpInfo = corpInfoMapper.findById(condition); - if (corpInfo != null && corpInfo.size() > 0) { - flows.put("APPOINT_ZERO_CORP_NAME", corpInfo.getString("NAME")); - } - flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_ZERO_DEPARTMENT_ID")); - flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_ZERO_DEPARTMENT_NAME")); - flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_ZERO_USER_ID")); - flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_ZERO_USER_NAME")); + flows.put("IS_DELETE", "0"); + flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_USER_NAME")); xgfFlowsMapper.save(flows); } else { - flows.put("APPOINT_ZERO_CORP_ID", x.getString("CORPINFO_ID")); - flows.put("FLOWS_STEP", 1); - condition.clear(); - condition.put("CORPINFO_ID", x.getString("CORPINFO_ID")); - PageData corpInfo = corpInfoMapper.findById(condition); - if (corpInfo != null && corpInfo.size() > 0) { - flows.put("APPOINT_ZERO_CORP_NAME", corpInfo.getString("NAME")); - } - flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_ZERO_DEPARTMENT_ID")); - flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_ZERO_DEPARTMENT_NAME")); - flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_ZERO_USER_ID")); - flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_ZERO_USER_NAME")); + flows.put("FLOWS_STEP", 0); + flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_USER_NAME")); xgfFlowsMapper.edit(flows); } /* 3、流程记录 */ @@ -372,6 +363,19 @@ public class XgfUserServiceImpl implements XgfUserService { void handle(PageData info, PageData flows) throws Exception{ switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { + case 0: + flows.put("APPOINT_ZERO_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ZERO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ZERO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_ZERO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_ZERO_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_ZERO_USER_NAME", info.getString("APPOINT_USER_NAME")); + 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("FLOWS_STEP", 1); + xgfFlowsMapper.edit(flows); + break; case 1: flows.put("APPOINT_ONE_CORP_ID", info.getString("APPOINT_CORP_ID")); flows.put("APPOINT_ONE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); diff --git a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml index 4a663f1e..238c3b06 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml @@ -28,7 +28,8 @@ f.END_FLAG, f.ISDELETE, f.PARENT_ID, - f.FOREIGN_KEY + f.FOREIGN_KEY, + f.SORT @@ -47,7 +48,8 @@ END_FLAG, ISDELETE, PARENT_ID, - FOREIGN_KEY + FOREIGN_KEY, + SORT @@ -66,7 +68,8 @@ #{END_FLAG}, #{ISDELETE}, #{PARENT_ID}, - #{FOREIGN_KEY} + #{FOREIGN_KEY}, + #{SORT} @@ -104,8 +107,9 @@ END_FLAG = #{END_FLAG}, ISDELETE = #{ISDELETE}, PARENT_ID = #{PARENT_ID}, - FOREIGN_ID = #{FOREIGN_ID}, + FOREIGN_KEY = #{FOREIGN_KEY}, STEP_NAME = #{STEP_NAME}, + SORT = #{SORT} where FLOW_DETAIL_ID = #{FLOW_DETAIL_ID} @@ -125,8 +129,8 @@ and a.PARENT_ID = #{PARENT_ID} - - and a.FOREIGN_ID = #{FOREIGN_ID} + + and a.FOREIGN_KEY = #{FOREIGN_KEY} diff --git a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml index 94da1851..c0ab1b4e 100644 --- a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml @@ -20,7 +20,8 @@ f.CREATOR_NAME, f.CREATOR_TIME, f.VALID_FLAG, - f.FOREIGN_KEY + f.FOREIGN_KEY, + f.ISDELETE @@ -31,7 +32,8 @@ CREATOR_NAME, CREATOR_TIME, VALID_FLAG, - FOREIGN_KEY + FOREIGN_KEY, + ISDELETE @@ -42,7 +44,8 @@ #{CREATOR_NAME}, #{CREATOR_TIME}, #{VALID_FLAG}, - #{FOREIGN_KEY} + #{FOREIGN_KEY}, + #{ISDELETE} @@ -74,6 +77,7 @@ CREATOR_NAME = #{CREATOR_NAME}, CREATOR_TIME = #{CREATOR_TIME}, VALID_FLAG = #{VALID_FLAG}, + ISDELETE = #{ISDELETE}, FOREIGN_KEY = FOREIGN_KEY where FLOW_ID = #{FLOW_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml index a9f52371..ff7f5e4a 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -1,6 +1,6 @@ - + xgf_flows @@ -320,7 +320,7 @@ APPOINT_SEVEN_USER_NAME = #{APPOINT_SEVEN_USER_NAME}, APPOINT_SEVEN_STATUS = #{APPOINT_SEVEN_STATUS}, APPOINT_SEVEN_OPINION = #{APPOINT_SEVEN_OPINION} - where a.FLOWS_ID = #{FLOWS_ID} + where FLOWS_ID = #{FLOWS_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index 9a021c38..fd91dc5a 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -325,11 +325,13 @@ a.BELONG_TO_CORP_NAME, a.USERNAME, a.NAME, + a.CHECK_STEP, c.* from xgf_user a left join xgf_flows c on a.XGF_USER_ID = c.FLOWS_ID where a.IS_DELETE = '0' - and (c.APPOINT_ONE_USER_ID = #{pd.USER_ID} + and (c.APPOINT_ZERO_USER_ID = #{pd.USER_ID} + or c.APPOINT_ONE_USER_ID = #{pd.USER_ID} or c.APPOINT_TWO_USER_ID = #{pd.USER_ID} or c.APPOINT_THREE_USER_ID = #{pd.USER_ID} or c.APPOINT_FOUR_USER_ID = #{pd.USER_ID} From d3b41ecf7bc77feef520f1521611f188f50cfc7d Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 19 Jan 2024 20:44:33 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=8E=BB=E9=99=A4debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 336 ++++++++++++------ .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 46 ++- 2 files changed, 264 insertions(+), 118 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 ba0b55c6..4c71a1c7 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -4,7 +4,6 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.bus.CorpInfoMapper; import com.zcloud.mapper.datasource.xgf.*; -import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.xgf.XgfUserService; import com.zcloud.util.*; @@ -77,7 +76,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("XGF_USER_NAME", x.get("NAME")); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); - x.put("CHECK_STATUS", "0"); + x.put("CHECK_STATUS", "1"); x.put("CHECK_STEP", 0); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); @@ -125,7 +124,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); - x.put("CHECK_STATUS", "0"); + x.put("CHECK_STATUS", "1"); x.put("CHECK_STEP", 0); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); @@ -256,33 +255,6 @@ public class XgfUserServiceImpl implements XgfUserService { PageData condition = new PageData(); for (String x : list) { condition.put("XGF_USER_ID", x); - PageData entity = xgfUserMapper.findById(condition); - if (entity == null || entity.size() == 0) { - throw new RuntimeException("未找到该用户"); - } - // 通过则指定监管部门人员进行审核，不同过则打回相关方端(将CHECK_STATUS改为1) - if ("1".equals(request.getString("STATUS"))) { - entity.put("VALID_FLAG", "1"); - if (StringUtils.isBlank(entity.getString("endFlag"))) { - entity.put("CHECK_STATUS", "1"); - } else { - entity.put("CHECK_STATUS", 2); - } - entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); - } else { - entity.put("STATUS", "0"); - entity.put("VALID_FLAG", "0"); - entity.put("CHECK_STATUS", "-2"); - PageData key = new PageData(); - key.putAll(entity); - key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", request.getString("STATUS")); - Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); - if (result == null || !"succeed".equals(result.get("result"))) { - throw new RuntimeException("请求失败"); - } - - } /* 保存审批信息 */ condition.clear(); condition.put("FLOWS_ID", x); @@ -298,11 +270,9 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); condition.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); - // 保存审计进度 - this.handle(condition, flows); + // 保存审批记录 - this.saveLog(x, request.getString("STATUS"), "企业端初次审批"); - xgfUserMapper.edit(entity); + this.saveLog(x, request.getString("STATUS"), this.handle(condition, flows)); } } @@ -361,11 +331,13 @@ public class XgfUserServiceImpl implements XgfUserService { } } - void handle(PageData info, PageData flows) throws Exception{ + private String handle(PageData info, PageData flows) throws Exception { + PageData condition = new PageData(); switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { - case 0: + case 0:// 相关方端推送数据至企业端 flows.put("APPOINT_ZERO_CORP_ID", info.getString("APPOINT_CORP_ID")); flows.put("APPOINT_ZERO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_ZERO_CORP_TYPE", "0"); flows.put("APPOINT_ZERO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); flows.put("APPOINT_ZERO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_ZERO_USER_ID", info.getString("APPOINT_USER_ID")); @@ -375,73 +347,215 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 1); xgfFlowsMapper.edit(flows); - break; - case 1: - flows.put("APPOINT_ONE_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_ONE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - 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")); - 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); - break; - case 2: - flows.put("APPOINT_TWO_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_TWO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_TWO_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); - break; - case 3: - flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - 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_THREE_TIME", DateUtil.getTime()); - flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 4); - xgfFlowsMapper.edit(flows); - break; - case 4: - flows.put("APPOINT_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); - 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); - break; - case 5: - flows.put("APPOINT_FIVE_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_FIVE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_FIVE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_FIVE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_FIVE_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_FIVE_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); - flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); - flows.put("FLOWS_STEP", 6); - xgfFlowsMapper.edit(flows); - break; - case 6: + return "0"; + // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 + case 1: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", info.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + xgfUserMapper.edit(entity); + return "0"; + } else { + condition.clear(); + flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getCORPINFO_ID()); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + flows.put("APPOINT_ONE_CORP_NAME", corpInfo.getString("CORP_NAME")); + } + 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")); + 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 "0"; + } + } + //监管部门审批人审批，并根据不同类型的审批规则进行处理 + case 2: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", info.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + return "0"; + } else { + // 2、通过审核后，根据不同的流程进行不同的处理 + switch (info.getString("FLOWS_TYPE")) { + case "0":// 辖区单位审批 + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + return "1"; + case "1":// 集团单位审批，需要指定下一位人员进行审批 + entity.put("CHECK_STATUS", 1); + entity.put("VALID_FLAG", "2"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_TWO_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_TWO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_TWO_CORP_TYPE", "0"); + flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_TWO_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"; + default: + throw new RuntimeException("未知的审批类型"); + } + } + } + case 3: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", info.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + return "0"; + } else { + // TODO 根据是否委托辖区单位进行处理(前端传回来) + switch (info.getString("attorneyFlag")) { + case "0":// 由股份端审批 + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + return "1"; + case "1":// 辖区单位审批，需要指定审批人 + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + 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_THREE_TIME", DateUtil.getTime()); + flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); + flows.put("FLOWS_STEP", 4); + xgfFlowsMapper.edit(flows); + return "0"; + default: + throw new RuntimeException("未知的审批类型"); + } + + } + } + // 委托先去单位审批 + case 4: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", info.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + return "0"; + } else { + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); + flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); + 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 "0"; + } + + } + // 委托辖区单位监管部门审批 + case 5: { + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + // 1、判断是否通过审核 + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", info.getString("STATUS")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + return "0"; + } else { + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + return "1"; + } + } + // 6往后是备用流程 + case 6: { flows.put("APPOINT_SIX_CORP_ID", info.getString("APPOINT_CORP_ID")); flows.put("APPOINT_SIX_CORP_NAME", info.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_SIX_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); @@ -453,8 +567,9 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_SIX_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 7); xgfFlowsMapper.edit(flows); - break; - case 7: + return "0"; + } + case 7: { flows.put("APPOINT_SEVEN_CORP_ID", info.getString("APPOINT_CORP_ID")); flows.put("APPOINT_SEVEN_CORP_NAME", info.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_SEVEN_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); @@ -466,11 +581,14 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_SEVEN_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 8); xgfFlowsMapper.edit(flows); - break; + return "0"; + } + default: + return "1"; } } - void saveLog(String id,String status,String name){ + void saveLog(String id, String status, String endFlag) throws Exception { /* 保存审批记录 */ PageData condition = new PageData(); condition.clear(); @@ -488,7 +606,7 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); nextNode.put("FLOW_ID", flow.getString("FLOW_ID")); nextNode.put("STEP_FLAG", "1"); - nextNode.put("STEP_NAME", name); + nextNode.put("STEP_NAME", "企业端审批"); nextNode.put("SORT", Integer.parseInt(currentNode.get("SORT").toString()) + 1); nextNode.put("APPROVER_ID", Jurisdiction.getUSER_ID()); nextNode.put("APPROVER_NAME", Jurisdiction.getName()); @@ -501,7 +619,7 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("NAME")); } nextNode.put("PASS_FLAG", status); - nextNode.put("END_FLAG", "0"); + nextNode.put("END_FLAG", endFlag); nextNode.put("ISDELETE", "0"); nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); flowDetailMapper.save(nextNode); diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml index ff7f5e4a..1a29cad2 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -1,6 +1,6 @@ - + xgf_flows @@ -11,9 +11,10 @@ f.FOREIGN_KEY_ID, f.FOREIGN_KEY_NAME, f.FLOWS_STEP, + f.FLOWS_TYPE, f.IS_DELETE, f.APPOINT_ZERO_CORP_ID, - f.APPOINT_ZERO_CORP_TYEP, + f.APPOINT_ZERO_CORP_TYPE, f.APPOINT_ZERO_CORP_NAME, f.APPOINT_ZERO_DEPARTMENT_ID, f.APPOINT_ZERO_DEPARTMENT_NAME, @@ -24,7 +25,7 @@ f.APPOINT_ZERO_TIME, f.APPOINT_ONE_CORP_ID, f.APPOINT_ONE_CORP_NAME, - f.APPOINT_ONE_CORP_TYEP, + f.APPOINT_ONE_CORP_TYPE, f.APPOINT_ONE_DEPARTMENT_ID, f.APPOINT_ONE_DEPARTMENT_NAME, f.APPOINT_ONE_USER_ID, @@ -34,6 +35,7 @@ f.APPOINT_ONE_TIME, f.APPOINT_TWO_CORP_ID, f.APPOINT_TWO_CORP_NAME, + f.APPOINT_TWO_CORP_TYPE, f.APPOINT_TWO_DEPARTMENT_ID, f.APPOINT_TWO_DEPARTMENT_NAME, f.APPOINT_TWO_USER_ID, @@ -41,6 +43,7 @@ f.APPOINT_TWO_TIME, f.APPOINT_THREE_CORP_ID, f.APPOINT_THREE_CORP_NAME, + f.APPOINT_THREE_CORP_TYPE, f.APPOINT_THREE_DEPARTMENT_ID, f.APPOINT_THREE_DEPARTMENT_NAME, f.APPOINT_THREE_USER_ID, @@ -50,6 +53,7 @@ f.APPOINT_THREE_TIME, f.APPOINT_FOUR_CORP_ID, f.APPOINT_FOUR_CORP_NAME, + f.APPOINT_FOUR_CORP_TYPE, f.APPOINT_FOUR_DEPARTMENT_ID, f.APPOINT_FOUR_DEPARTMENT_NAME, f.APPOINT_FOUR_USER_ID, @@ -58,6 +62,7 @@ f.APPOINT_FOUR_OPINION, f.APPOINT_FIVE_CORP_ID, f.APPOINT_FIVE_CORP_NAME, + f.APPOINT_FIVE_CORP_TYPE, f.APPOINT_FIVE_DEPARTMENT_ID, f.APPOINT_FIVE_DEPARTMENT_NAME, f.APPOINT_FIVE_USER_ID, @@ -66,6 +71,7 @@ f.APPOINT_FIVE_OPINION, f.APPOINT_SIX_CORP_ID, f.APPOINT_SIX_CORP_NAME, + f.APPOINT_SIX_CORP_TYPE, f.APPOINT_SIX_DEPARTMENT_ID, f.APPOINT_SIX_DEPARTMENT_NAME, f.APPOINT_SIX_USER_ID, @@ -74,6 +80,7 @@ f.APPOINT_SIX_OPINION, f.APPOINT_SEVEN_CORP_ID, f.APPOINT_SEVEN_CORP_NAME, + f.APPOINT_SEVEN_CORP_TYPE, f.APPOINT_SEVEN_DEPARTMENT_ID, f.APPOINT_SEVEN_DEPARTMENT_NAME, f.APPOINT_SEVEN_USER_ID, @@ -87,9 +94,10 @@ FOREIGN_KEY_ID, FOREIGN_KEY_NAME, FLOWS_STEP, + FLOWS_TYPE, IS_DELETE, APPOINT_ZERO_CORP_ID, - APPOINT_ZERO_CORP_TYEP, + APPOINT_ZERO_CORP_TYPE, APPOINT_ZERO_CORP_NAME, APPOINT_ZERO_DEPARTMENT_ID, APPOINT_ZERO_DEPARTMENT_NAME, @@ -100,7 +108,7 @@ APPOINT_ZERO_TIME, APPOINT_ONE_CORP_ID, APPOINT_ONE_CORP_NAME, - APPOINT_ONE_CORP_TYEP, + APPOINT_ONE_CORP_TYPE, APPOINT_ONE_DEPARTMENT_ID, APPOINT_ONE_DEPARTMENT_NAME, APPOINT_ONE_USER_ID, @@ -110,6 +118,7 @@ APPOINT_ONE_TIME, APPOINT_TWO_CORP_ID, APPOINT_TWO_CORP_NAME, + APPOINT_TWO_CORP_TYPE, APPOINT_TWO_DEPARTMENT_ID, APPOINT_TWO_DEPARTMENT_NAME, APPOINT_TWO_USER_ID, @@ -117,6 +126,7 @@ APPOINT_TWO_TIME, APPOINT_THREE_CORP_ID, APPOINT_THREE_CORP_NAME, + APPOINT_THREE_CORP_TYPE, APPOINT_THREE_DEPARTMENT_ID, APPOINT_THREE_DEPARTMENT_NAME, APPOINT_THREE_USER_ID, @@ -126,6 +136,7 @@ APPOINT_THREE_TIME, APPOINT_FOUR_CORP_ID, APPOINT_FOUR_CORP_NAME, + APPOINT_FOUR_CORP_TYPE, APPOINT_FOUR_DEPARTMENT_ID, APPOINT_FOUR_DEPARTMENT_NAME, APPOINT_FOUR_USER_ID, @@ -134,6 +145,7 @@ APPOINT_FOUR_OPINION, APPOINT_FIVE_CORP_ID, APPOINT_FIVE_CORP_NAME, + APPOINT_FIVE_CORP_TYPE, APPOINT_FIVE_DEPARTMENT_ID, APPOINT_FIVE_DEPARTMENT_NAME, APPOINT_FIVE_USER_ID, @@ -142,6 +154,7 @@ APPOINT_FIVE_OPINION, APPOINT_SIX_CORP_ID, APPOINT_SIX_CORP_NAME, + APPOINT_SIX_CORP_TYPE, APPOINT_SIX_DEPARTMENT_ID, APPOINT_SIX_DEPARTMENT_NAME, APPOINT_SIX_USER_ID, @@ -150,6 +163,7 @@ APPOINT_SIX_OPINION, APPOINT_SEVEN_CORP_ID, APPOINT_SEVEN_CORP_NAME, + APPOINT_SEVEN_CORP_TYPE, APPOINT_SEVEN_DEPARTMENT_ID, APPOINT_SEVEN_DEPARTMENT_NAME, APPOINT_SEVEN_USER_ID, @@ -163,9 +177,10 @@ #{FOREIGN_KEY_ID}, #{FOREIGN_KEY_NAME}, #{FLOWS_STEP}, + #{FLOWS_TYPE}, #{IS_DELETE}, #{APPOINT_ZERO_CORP_ID}, - #{APPOINT_ZERO_CORP_TYEP}, + #{APPOINT_ZERO_CORP_TYPE}, #{APPOINT_ZERO_CORP_NAME}, #{APPOINT_ZERO_DEPARTMENT_ID}, #{APPOINT_ZERO_DEPARTMENT_NAME}, @@ -176,7 +191,7 @@ #{APPOINT_ZERO_TIME}, #{APPOINT_ONE_CORP_ID}, #{APPOINT_ONE_CORP_NAME}, - #{APPOINT_ONE_CORP_TYEP}, + #{APPOINT_ONE_CORP_TYPE}, #{APPOINT_ONE_DEPARTMENT_ID}, #{APPOINT_ONE_DEPARTMENT_NAME}, #{APPOINT_ONE_USER_ID}, @@ -186,6 +201,7 @@ #{APPOINT_ONE_TIME}, #{APPOINT_TWO_CORP_ID}, #{APPOINT_TWO_CORP_NAME}, + #{APPOINT_TWO_CORP_TYPE}, #{APPOINT_TWO_DEPARTMENT_ID}, #{APPOINT_TWO_DEPARTMENT_NAME}, #{APPOINT_TWO_USER_ID}, @@ -193,6 +209,7 @@ #{APPOINT_TWO_TIME}, #{APPOINT_THREE_CORP_ID}, #{APPOINT_THREE_CORP_NAME}, + #{APPOINT_THREE_CORP_TYPE}, #{APPOINT_THREE_DEPARTMENT_ID}, #{APPOINT_THREE_DEPARTMENT_NAME}, #{APPOINT_THREE_USER_ID}, @@ -202,6 +219,7 @@ #{APPOINT_THREE_TIME}, #{APPOINT_FOUR_CORP_ID}, #{APPOINT_FOUR_CORP_NAME}, + #{APPOINT_FOUR_CORP_TYPE}, #{APPOINT_FOUR_DEPARTMENT_ID}, #{APPOINT_FOUR_DEPARTMENT_NAME}, #{APPOINT_FOUR_USER_ID}, @@ -210,6 +228,7 @@ #{APPOINT_FOUR_OPINION}, #{APPOINT_FIVE_CORP_ID}, #{APPOINT_FIVE_CORP_NAME}, + #{APPOINT_FIVE_CORP_TYPE}, #{APPOINT_FIVE_DEPARTMENT_ID}, #{APPOINT_FIVE_DEPARTMENT_NAME}, #{APPOINT_FIVE_USER_ID}, @@ -218,6 +237,7 @@ #{APPOINT_FIVE_OPINION}, #{APPOINT_SIX_CORP_ID}, #{APPOINT_SIX_CORP_NAME}, + #{APPOINT_SIX_CORP_TYPE}, #{APPOINT_SIX_DEPARTMENT_ID}, #{APPOINT_SIX_DEPARTMENT_NAME}, #{APPOINT_SIX_USER_ID}, @@ -226,6 +246,7 @@ #{APPOINT_SIX_OPINION}, #{APPOINT_SEVEN_CORP_ID}, #{APPOINT_SEVEN_CORP_NAME}, + #{APPOINT_SEVEN_CORP_TYPE}, #{APPOINT_SEVEN_DEPARTMENT_ID}, #{APPOINT_SEVEN_DEPARTMENT_NAME}, #{APPOINT_SEVEN_USER_ID}, @@ -251,9 +272,10 @@ FOREIGN_KEY_ID = #{FOREIGN_KEY_ID}, FOREIGN_KEY_NAME = #{FOREIGN_KEY_NAME}, FLOWS_STEP = #{FLOWS_STEP}, + FLOWS_TYPE = #{FLOWS_TYPE}, IS_DELETE = #{IS_DELETE}, APPOINT_ZERO_CORP_ID = #{APPOINT_ZERO_CORP_ID}, - APPOINT_ZERO_CORP_TYEP = #{APPOINT_ZERO_CORP_TYEP}, + APPOINT_ZERO_CORP_TYPE = #{APPOINT_ZERO_CORP_TYPE}, APPOINT_ZERO_CORP_NAME = #{APPOINT_ZERO_CORP_NAME}, APPOINT_ZERO_DEPARTMENT_ID = #{APPOINT_ZERO_DEPARTMENT_ID}, APPOINT_ZERO_DEPARTMENT_NAME = #{APPOINT_ZERO_DEPARTMENT_NAME}, @@ -264,7 +286,7 @@ APPOINT_ZERO_TIME = #{APPOINT_ZERO_TIME}, APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, - APPOINT_ONE_CORP_TYEP = #{APPOINT_ONE_CORP_TYEP}, + APPOINT_ONE_CORP_TYPE = #{APPOINT_ONE_CORP_TYPE}, APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, @@ -274,6 +296,7 @@ APPOINT_ONE_TIME = #{APPOINT_ONE_TIME}, APPOINT_TWO_CORP_ID = #{APPOINT_TWO_CORP_ID}, APPOINT_TWO_CORP_NAME = #{APPOINT_TWO_CORP_NAME}, + APPOINT_TWO_CORP_TYPE = #{APPOINT_TWO_CORP_TYPE}, APPOINT_TWO_DEPARTMENT_ID = #{APPOINT_TWO_DEPARTMENT_ID}, APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME}, APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID}, @@ -281,6 +304,7 @@ APPOINT_TWO_TIME = #{APPOINT_TWO_TIME}, APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME}, + APPOINT_THREE_CORP_TYPE = #{APPOINT_THREE_CORP_TYPE}, APPOINT_THREE_DEPARTMENT_ID = #{APPOINT_THREE_DEPARTMENT_ID}, APPOINT_THREE_DEPARTMENT_NAME = #{APPOINT_THREE_DEPARTMENT_NAME}, APPOINT_THREE_USER_ID = #{APPOINT_THREE_USER_ID}, @@ -290,6 +314,7 @@ APPOINT_THREE_TIME = #{APPOINT_THREE_TIME}, APPOINT_FOUR_CORP_ID = #{APPOINT_FOUR_CORP_ID}, APPOINT_FOUR_CORP_NAME = #{APPOINT_FOUR_CORP_NAME}, + APPOINT_FOUR_CORP_TYPE = #{APPOINT_FOUR_CORP_TYPE}, APPOINT_FOUR_DEPARTMENT_ID = #{APPOINT_FOUR_DEPARTMENT_ID}, APPOINT_FOUR_DEPARTMENT_NAME = #{APPOINT_FOUR_DEPARTMENT_NAME}, APPOINT_FOUR_USER_ID = #{APPOINT_FOUR_USER_ID}, @@ -298,6 +323,7 @@ APPOINT_FOUR_OPINION = #{APPOINT_FOUR_OPINION}, APPOINT_FIVE_CORP_ID = #{APPOINT_FIVE_CORP_ID}, APPOINT_FIVE_CORP_NAME = #{APPOINT_FIVE_CORP_NAME}, + APPOINT_FIVE_CORP_TYPE = #{APPOINT_FIVE_CORP_TYPE}, APPOINT_FIVE_DEPARTMENT_ID = #{APPOINT_FIVE_DEPARTMENT_ID}, APPOINT_FIVE_DEPARTMENT_NAME = #{APPOINT_FIVE_DEPARTMENT_NAME}, APPOINT_FIVE_USER_ID = #{APPOINT_FIVE_USER_ID}, @@ -306,6 +332,7 @@ APPOINT_FIVE_OPINION = #{APPOINT_FIVE_OPINION}, APPOINT_SIX_CORP_ID = #{APPOINT_SIX_CORP_ID}, APPOINT_SIX_CORP_NAME = #{APPOINT_SIX_CORP_NAME}, + APPOINT_SIX_CORP_TYPE = #{APPOINT_SIX_CORP_TYPE}, APPOINT_SIX_DEPARTMENT_ID = #{APPOINT_SIX_DEPARTMENT_ID}, APPOINT_SIX_DEPARTMENT_NAME = #{APPOINT_SIX_DEPARTMENT_NAME}, APPOINT_SIX_USER_ID = #{APPOINT_SIX_USER_ID}, @@ -314,6 +341,7 @@ APPOINT_SIX_OPINION = #{APPOINT_SIX_OPINION}, APPOINT_SEVEN_CORP_ID = #{APPOINT_SEVEN_CORP_ID}, APPOINT_SEVEN_CORP_NAME = #{APPOINT_SEVEN_CORP_NAME}, + APPOINT_SEVEN_CORP_TYPE = #{APPOINT_SEVEN_CORP_TYPE}, APPOINT_SEVEN_DEPARTMENT_ID = #{APPOINT_SEVEN_DEPARTMENT_ID}, APPOINT_SEVEN_DEPARTMENT_NAME = #{APPOINT_SEVEN_DEPARTMENT_NAME}, APPOINT_SEVEN_USER_ID = #{APPOINT_SEVEN_USER_ID}, From eebf95ff9eebdff2f03a8d58e48a6296030b947d Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 14:39:39 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 92 ++++++++++++++----- .../mybatis/datasource/xgf/XgfFlowsMapper.xml | 2 +- 2 files changed, 68 insertions(+), 26 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 4c71a1c7..3e974f5d 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -136,17 +136,20 @@ public class XgfUserServiceImpl implements XgfUserService { xgfUserMapper.edit(x); xgfUserDetailsMapper.edit(x); } + /* 2、保存相关方人员流程审批信息 */ condition.clear(); condition.put("FLOWS_ID", x.getString("USER_ID")); PageData flows = xgfFlowsMapper.findById(condition); if (flows == null || flows.size() <= 0) { flows = new PageData(); + flows.put("FLOWS_TYPE", getType(x.getString("CORPINOF_ID"))); flows.put("FLOWS_ID", x.getString("USER_ID")); flows.put("FLOWS_STEP", 0); flows.put("FOREIGN_KEY_ID", x.getString("USER_ID")); flows.put("FOREIGN_KEY_NAME", "xgf_user=>XGF_USER_ID"); flows.put("IS_DELETE", "0"); + flows.put("APPOINT_ZERO_CORP_TYPE", "0"); flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID")); @@ -156,8 +159,10 @@ public class XgfUserServiceImpl implements XgfUserService { xgfFlowsMapper.save(flows); } else { flows.put("FLOWS_STEP", 0); + flows.put("FLOWS_TYPE", getType(x.getString("CORPINOF_ID"))); flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_ZERO_CORP_TYPE", "0"); flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID")); flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_USER_ID")); @@ -264,6 +269,7 @@ public class XgfUserServiceImpl implements XgfUserService { } condition.clear(); condition.put("STATUS", request.getString("STATUS")); + condition.put("OPINION", request.getString("OPINION")); condition.put("APPOINT_CORP_ID", request.getString("APPOINT_CORP_ID")); condition.put("APPOINT_CORP_NAME", request.getString("APPOINT_CORP_NAME")); condition.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); @@ -298,6 +304,10 @@ public class XgfUserServiceImpl implements XgfUserService { /* 获取当前用户是否有权限审批 */ private String getPower(PageData x) { switch (Integer.parseInt(x.get("CHECK_STEP").toString())) { + case 0: + if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ZERO_USER_ID"))) { + return "1"; + } case 1: if (Jurisdiction.getUSER_ID().equals(x.getString("APPOINT_ONE_USER_ID"))) { return "1"; @@ -335,18 +345,23 @@ public class XgfUserServiceImpl implements XgfUserService { PageData condition = new PageData(); switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { case 0:// 相关方端推送数据至企业端 - flows.put("APPOINT_ZERO_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_ZERO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_ZERO_CORP_TYPE", "0"); - flows.put("APPOINT_ZERO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_ZERO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_ZERO_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_ZERO_USER_NAME", info.getString("APPOINT_USER_NAME")); 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")); + flows.put("APPOINT_ONE_CORP_ID", flows.getString("APPOINT_ZERO_CORP_ID")); + flows.put("APPOINT_ONE_CORP_NAME", flows.getString("APPOINT_ZERO_CORP_NAME")); flows.put("FLOWS_STEP", 1); xgfFlowsMapper.edit(flows); + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData user = xgfUserMapper.findById(condition); + user.put("CHECK_STEP", 1); return "0"; // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 case 1: { @@ -368,24 +383,39 @@ public class XgfUserServiceImpl implements XgfUserService { xgfUserMapper.edit(entity); return "0"; } else { - condition.clear(); - flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getCORPINFO_ID()); - condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - PageData corpInfo = corpInfoMapper.findById(condition); - if (corpInfo != null && corpInfo.size() > 0) { - flows.put("APPOINT_ONE_CORP_NAME", corpInfo.getString("CORP_NAME")); + if ("1".equals(info.getString("FLOWS_TYPE"))) { + entity.put("CHECK_STATUS", 1); + entity.put("VALID_FLAG", "2"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + + flows.put("APPOINT_TWO_CORP_TYPE", "0"); + flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + 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 { + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + 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"; } - 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")); - 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 "0"; } } //监管部门审批人审批，并根据不同类型的审批规则进行处理 @@ -588,7 +618,7 @@ public class XgfUserServiceImpl implements XgfUserService { } } - void saveLog(String id, String status, String endFlag) throws Exception { + private void saveLog(String id, String status, String endFlag) throws Exception { /* 保存审批记录 */ PageData condition = new PageData(); condition.clear(); @@ -601,6 +631,7 @@ public class XgfUserServiceImpl implements XgfUserService { } condition.clear(); condition.put("FLOW_ID", flow.getString("FLOW_ID")); + condition.put("STEP_FLAG", "1"); PageData currentNode = flowDetailMapper.selectOne(condition); PageData nextNode = new PageData(); nextNode.put("FLOW_DETAIL_ID", Warden.get32UUID()); @@ -626,4 +657,15 @@ public class XgfUserServiceImpl implements XgfUserService { currentNode.put("STEP_FLAG", "0"); flowDetailMapper.edit(currentNode); } + + private String getType(String corpInfoId) { + // 集团单位id（河港机械 jtdw002 1e6dbbe16004402f8d2c0e52afd9a676），（河港港工 jtdw003 3a854eefa7894e06aaa1a2611bca80f6），（河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5），（方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2） +// String jituandanwei = "1e6dbbe16004402f8d2c0e52afd9a676，3a854eefa7894e06aaa1a2611bca80f6，020578a4c1f04bc692ee25145c2efbe5，90966974de3c4b83aca6f8fd6432d5c2"; +// if (jituandanwei.contains(corpInfoId)) { +// return "1"; +// }else { +// return "0"; +// } + return "0"; + } } diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml index 1a29cad2..1270676c 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -1,6 +1,6 @@ - + xgf_flows From e673955258cdf676caa675b1c5fecb1f3a588b55 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 15:23:03 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 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 3e974f5d..ee248e60 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -362,6 +362,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData user = xgfUserMapper.findById(condition); user.put("CHECK_STEP", 1); + xgfUserMapper.edit(user); return "0"; // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 case 1: { @@ -659,13 +660,16 @@ public class XgfUserServiceImpl implements XgfUserService { } private String getType(String corpInfoId) { - // 集团单位id（河港机械 jtdw002 1e6dbbe16004402f8d2c0e52afd9a676），（河港港工 jtdw003 3a854eefa7894e06aaa1a2611bca80f6），（河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5），（方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2） -// String jituandanwei = "1e6dbbe16004402f8d2c0e52afd9a676，3a854eefa7894e06aaa1a2611bca80f6，020578a4c1f04bc692ee25145c2efbe5，90966974de3c4b83aca6f8fd6432d5c2"; -// if (jituandanwei.contains(corpInfoId)) { -// return "1"; -// }else { -// return "0"; -// } - return "0"; + // 集团单位id + // （河港机械 jtdw002 1e6dbbe16004402f8d2c0e52afd9a676）， + // （河港港工 jtdw003 3a854eefa7894e06aaa1a2611bca80f6）， + // （河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5）， + // （方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2） + String jituandanwei = "1e6dbbe16004402f8d2c0e52afd9a676，3a854eefa7894e06aaa1a2611bca80f6，020578a4c1f04bc692ee25145c2efbe5，90966974de3c4b83aca6f8fd6432d5c2"; + if (jituandanwei.contains(corpInfoId)) { + return "1"; + }else { + return "0"; + } } } From f7dd131d82403aef3eb815f2c9c86a62670e8073 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 18:11:55 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 ee248e60..54c5ad9c 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -384,7 +384,7 @@ public class XgfUserServiceImpl implements XgfUserService { xgfUserMapper.edit(entity); return "0"; } else { - if ("1".equals(info.getString("FLOWS_TYPE"))) { + if ("1".equals(flows.getString("FLOWS_TYPE"))) { entity.put("CHECK_STATUS", 1); entity.put("VALID_FLAG", "2"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); @@ -440,7 +440,7 @@ public class XgfUserServiceImpl implements XgfUserService { return "0"; } else { // 2、通过审核后，根据不同的流程进行不同的处理 - switch (info.getString("FLOWS_TYPE")) { + switch (flows.getString("FLOWS_TYPE")) { case "0":// 辖区单位审批 entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); From bacf047b67a364457e76401b8d29a0bdbda27710 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 18:21:41 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 52 +++++++++++-------- 1 file changed, 31 insertions(+), 21 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 54c5ad9c..b629a65a 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -502,16 +502,17 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); - flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - 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_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); + 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")); - flows.put("FLOWS_STEP", 4); xgfFlowsMapper.edit(flows); return "0"; default: @@ -540,21 +541,30 @@ public class XgfUserServiceImpl implements XgfUserService { } return "0"; } else { - entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); - xgfUserMapper.edit(entity); + // TODO 根据是否委托辖区单位进行处理(前端传回来) + switch (flows.getString("FLOWS_TYPE")) { + case "0":// 由股份端审批 + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + xgfUserMapper.edit(entity); + return "1"; + case "1":// 辖区单位审批，需要指定审批人 + entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("CHECK_STATUS", 2); + entity.put("VALID_FLAG", "1"); + entity.put("STATUS", "2"); + xgfUserMapper.edit(entity); - flows.put("APPOINT_FOUR_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_FOUR_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_FOUR_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_FOUR_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); - 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 "0"; + 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", 4); + xgfFlowsMapper.edit(flows); + return "1"; + default: + throw new RuntimeException("未知的审批类型"); + } } } From 7f3007041e96c031fc767bfe183df50217603ed3 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 18:47:25 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b629a65a..61bd48c2 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -491,7 +491,7 @@ public class XgfUserServiceImpl implements XgfUserService { return "0"; } else { // TODO 根据是否委托辖区单位进行处理(前端传回来) - switch (info.getString("attorneyFlag")) { + switch (flows.getString("FLOWS_TYPE")) { case "0":// 由股份端审批 entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); From a52ccd1f50393a8966872823597e6789a855d9e4 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 22 Jan 2024 19:32:40 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 71 ++++++++++++------- 1 file changed, 46 insertions(+), 25 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 61bd48c2..115371f8 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -207,6 +207,7 @@ public class XgfUserServiceImpl implements XgfUserService { } else { condition.clear(); condition.put("FLOW_ID", flow.getString("FLOW_ID")); + condition.put("STEP_FLAG", "1"); PageData currentNode = flowDetailMapper.selectOne(condition); PageData nextNode = new PageData(); nextNode.putAll(currentNode); @@ -344,27 +345,47 @@ public class XgfUserServiceImpl implements XgfUserService { private String handle(PageData info, PageData flows) throws Exception { PageData condition = new PageData(); switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { - case 0:// 相关方端推送数据至企业端 - 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")); - flows.put("APPOINT_ONE_CORP_ID", flows.getString("APPOINT_ZERO_CORP_ID")); - flows.put("APPOINT_ONE_CORP_NAME", flows.getString("APPOINT_ZERO_CORP_NAME")); - flows.put("FLOWS_STEP", 1); - xgfFlowsMapper.edit(flows); + case 0: {// 相关方端推送数据至企业端 condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); - PageData user = xgfUserMapper.findById(condition); - user.put("CHECK_STEP", 1); - xgfUserMapper.edit(user); - return "0"; - // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 + PageData entity = xgfUserMapper.findById(condition); + if ("0".equals(info.getString("STATUS"))) { + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); + } + xgfUserMapper.edit(entity); + 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")); + flows.put("APPOINT_ONE_CORP_ID", flows.getString("APPOINT_ZERO_CORP_ID")); + flows.put("APPOINT_ONE_CORP_NAME", flows.getString("APPOINT_ZERO_CORP_NAME")); + flows.put("FLOWS_STEP", 1); + xgfFlowsMapper.edit(flows); + condition.clear(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData user = xgfUserMapper.findById(condition); + user.put("CHECK_STEP", 1); + xgfUserMapper.edit(user); + return "0"; + } + + } // 相关方选择的审批人审批，并指定下一位监管部门审批人，不过打回相关方端 case 1: { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); @@ -376,7 +397,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", info.getString("STATUS")); + key.put("STATUS", "1"); Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); @@ -432,7 +453,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", info.getString("STATUS")); + key.put("STATUS", "1"); Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); @@ -483,7 +504,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", info.getString("STATUS")); + key.put("STATUS", "1"); Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); @@ -534,7 +555,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", info.getString("STATUS")); + key.put("STATUS", "1"); Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); @@ -581,7 +602,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData key = new PageData(); key.putAll(entity); key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", info.getString("STATUS")); + key.put("STATUS", "1"); Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); @@ -678,7 +699,7 @@ public class XgfUserServiceImpl implements XgfUserService { String jituandanwei = "1e6dbbe16004402f8d2c0e52afd9a676，3a854eefa7894e06aaa1a2611bca80f6，020578a4c1f04bc692ee25145c2efbe5，90966974de3c4b83aca6f8fd6432d5c2"; if (jituandanwei.contains(corpInfoId)) { return "1"; - }else { + } else { return "0"; } } From 0cd60ce5e3291bd59e45ce578b9043a8a1f7e0b3 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 23 Jan 2024 15:38:30 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E8=8B=A5=E5=B9=B2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 70 ++++++++++++++----- 1 file changed, 52 insertions(+), 18 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 115371f8..be8fc426 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -143,7 +143,7 @@ public class XgfUserServiceImpl implements XgfUserService { PageData flows = xgfFlowsMapper.findById(condition); if (flows == null || flows.size() <= 0) { flows = new PageData(); - flows.put("FLOWS_TYPE", getType(x.getString("CORPINOF_ID"))); + flows.put("FLOWS_TYPE", getType(x.getString("CORPINFO_ID"))); flows.put("FLOWS_ID", x.getString("USER_ID")); flows.put("FLOWS_STEP", 0); flows.put("FOREIGN_KEY_ID", x.getString("USER_ID")); @@ -159,7 +159,7 @@ public class XgfUserServiceImpl implements XgfUserService { xgfFlowsMapper.save(flows); } else { flows.put("FLOWS_STEP", 0); - flows.put("FLOWS_TYPE", getType(x.getString("CORPINOF_ID"))); + flows.put("FLOWS_TYPE", getType(x.getString("CORPINFO_ID"))); flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID")); flows.put("APPOINT_ZERO_CORP_TYPE", "0"); @@ -279,7 +279,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); // 保存审批记录 - this.saveLog(x, request.getString("STATUS"), this.handle(condition, flows)); + this.saveLog(condition, request.getString("STATUS"), this.handle(condition, flows)); } } @@ -362,6 +362,11 @@ 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()); @@ -403,6 +408,11 @@ 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 { if ("1".equals(flows.getString("FLOWS_TYPE"))) { @@ -427,6 +437,7 @@ public class XgfUserServiceImpl implements XgfUserService { } else { entity.put("CHECK_STATUS", 2); entity.put("VALID_FLAG", "1"); + entity.put("STATUS", "2"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); @@ -458,6 +469,10 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + 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 { // 2、通过审核后，根据不同的流程进行不同的处理 @@ -474,13 +489,13 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); - flows.put("APPOINT_TWO_CORP_ID", info.getString("APPOINT_CORP_ID")); - flows.put("APPOINT_TWO_CORP_NAME", info.getString("APPOINT_CORP_NAME")); - flows.put("APPOINT_TWO_CORP_TYPE", "0"); - flows.put("APPOINT_TWO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); - flows.put("APPOINT_TWO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); - flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); - flows.put("APPOINT_TWO_USER_NAME", info.getString("APPOINT_USER_NAME")); + flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); + flows.put("APPOINT_THREE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); + flows.put("APPOINT_THREE_CORP_TYPE", "0"); + flows.put("APPOINT_THREE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); + 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")); @@ -509,6 +524,9 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); + flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); return "0"; } else { // TODO 根据是否委托辖区单位进行处理(前端传回来) @@ -560,6 +578,10 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + 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 { // TODO 根据是否委托辖区单位进行处理(前端传回来) @@ -580,7 +602,7 @@ public class XgfUserServiceImpl implements XgfUserService { 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", 4); + flows.put("FLOWS_STEP", 5); xgfFlowsMapper.edit(flows); return "1"; default: @@ -607,6 +629,10 @@ public class XgfUserServiceImpl implements XgfUserService { if (result == null || !"succeed".equals(result.get("result"))) { throw new RuntimeException("请求失败"); } + flows.put("APPOINT_FIVE_TIME", DateUtil.getTime()); + flows.put("APPOINT_FIVE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FIVE_OPINION", info.getString("OPINION")); + xgfFlowsMapper.edit(flows); return "0"; } else { entity.put("CHECK_STATUS", 2); @@ -650,11 +676,11 @@ public class XgfUserServiceImpl implements XgfUserService { } } - private void saveLog(String id, String status, String endFlag) throws Exception { + private void saveLog(PageData info, String status, String endFlag) throws Exception { /* 保存审批记录 */ PageData condition = new PageData(); condition.clear(); - condition.put("FOREIGN_KEY", id); + condition.put("FOREIGN_KEY", info.getString("FLOWS_ID")); condition.put("TYPE", "1"); condition.put("VALID_FLAG", "1"); PageData flow = flowMapper.findByCondition(condition); @@ -675,19 +701,27 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_NAME", Jurisdiction.getName()); nextNode.put("APPROVER_TIME", DateUtil.getTime()); nextNode.put("APPROVER_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - condition.clear(); - condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); - PageData corpInfo = corpInfoMapper.findById(condition); - if (corpInfo != null && corpInfo.size() > 0) { - nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("NAME")); + nextNode.put("APPROVER_OPINION", info.get("OPINION")); + if ("1".equals(Jurisdiction.getCORPINFO_ID())) { + nextNode.put("APPROVER_CORPINFO_NAME", "秦皇岛股份有限公司"); + } else { + condition.clear(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpInfo = corpInfoMapper.findById(condition); + if (corpInfo != null && corpInfo.size() > 0) { + nextNode.put("APPROVER_CORPINFO_NAME", corpInfo.getString("CORP_NAME")); + } } nextNode.put("PASS_FLAG", status); nextNode.put("END_FLAG", endFlag); nextNode.put("ISDELETE", "0"); nextNode.put("PARENT_ID", currentNode.getString("FLOW_DETAIL_ID")); + flowDetailMapper.save(nextNode); currentNode.put("STEP_FLAG", "0"); flowDetailMapper.edit(currentNode); + flow.put("END_FLAG", endFlag); + flowMapper.edit(flow); } private String getType(String corpInfoId) {