guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

企业端、股份端，相关方人员详情信息代码同步

2024年2月1日V1.0.53
liujun 2024-01-30 13:49:14 +08:00
parent e4dccddf68
commit 7cdaacec8c
2 changed files with 108 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/controller/xgf/XgfUserController.java
View File

@ -126,7 +126,7 @@ public class XgfUserController extends BaseController {
} }
/** /**
* 人员指定审核 * 查看审批信息
*/ */
@RequestMapping(value = "/getApproveInfo") @RequestMapping(value = "/getApproveInfo")
@ResponseBody @ResponseBody

197
src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
View File

@ -335,89 +335,104 @@ public class XgfUserServiceImpl implements XgfUserService {
List<PageData> list = new ArrayList<>(); List<PageData> list = new ArrayList<>();
PageData zero = new PageData(); PageData zero = new PageData();
zero.put("INDEX", "0"); int index = Integer.parseInt(entity.getString("FLOWS_STEP"));
zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID")); if (index >= 0){
zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME")); zero.put("INDEX", "0");
zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID")); zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID"));
zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME")); zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME"));
zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID")); zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID"));
zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME")); zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME"));
zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS")); zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID"));
zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION")); zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME"));
zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME")); zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS"));
list.add(zero); zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION"));
PageData one = new PageData(); zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME"));
one.put("INDEX", "1"); list.add(zero);
one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID")); }
one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME")); if (index >= 1) {
one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID")); PageData one = new PageData();
one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME")); one.put("INDEX", "1");
one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID")); one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID"));
one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME")); one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME"));
one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS")); one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID"));
one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION")); one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME"));
one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME")); one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID"));
list.add(one); one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME"));
PageData two = new PageData(); one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS"));
two.put("INDEX", "2"); one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION"));
two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID")); one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME"));
two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME")); list.add(one);
two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID")); }
two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME")); if (index >= 2) {
two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID")); PageData two = new PageData();
two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME")); two.put("INDEX", "2");
two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS")); two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID"));
two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION")); two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME"));
two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME")); two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID"));
list.add(two); two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME"));
PageData three = new PageData(); two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID"));
three.put("INDEX", "3"); two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME"));
three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID")); two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS"));
three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME")); two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION"));
three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID")); two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME"));
three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME")); list.add(two);
three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID")); }
three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME")); if (index >= 3) {
three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS")); PageData three = new PageData();
three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION")); three.put("INDEX", "3");
three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME")); three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID"));
list.add(three); three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME"));
PageData four = new PageData(); three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID"));
four.put("INDEX", "4"); three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME"));
four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID")); three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID"));
four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME")); three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME"));
four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID")); three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS"));
four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME")); three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION"));
four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID")); three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME"));
four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME")); list.add(three);
four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS")); }
four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION")); if (index >= 4) {
four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME")); PageData four = new PageData();
list.add(four); four.put("INDEX", "4");
PageData five = new PageData(); four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID"));
five.put("INDEX", "5"); four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME"));
five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID")); four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID"));
five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME")); four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME"));
five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID")); four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID"));
five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME")); four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME"));
five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID")); four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS"));
five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME")); four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION"));
five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS")); four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME"));
five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION")); list.add(four);
five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME")); }
list.add(five); if (index >= 5) {
PageData six = new PageData(); PageData five = new PageData();
six.put("INDEX", "6"); five.put("INDEX", "5");
six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID")); five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID"));
six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME")); five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME"));
six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID")); five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID"));
six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME")); five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME"));
six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID")); five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID"));
six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME")); five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME"));
six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS")); five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS"));
six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION")); five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION"));
six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME")); five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME"));
list.add(six); list.add(five);
}
if (index >= 6) {
PageData six = new PageData();
six.put("INDEX", "6");
six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID"));
six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME"));
six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID"));
six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME"));
six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID"));
six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME"));
six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS"));
six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION"));
six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME"));
list.add(six);
}
PageData info = new PageData(); PageData info = new PageData();
info.put("info", list); info.put("info", list);
info.put("STEP", entity.getString("FLOWS_STEP")); info.put("STEP", entity.getString("FLOWS_STEP"));
@ -474,6 +489,8 @@ public class XgfUserServiceImpl implements XgfUserService {
private String handle(PageData info, PageData flows) throws Exception { private String handle(PageData info, PageData flows) throws Exception {
PageData condition = new PageData(); PageData condition = new PageData();
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData corpEntity = corpInfoMapper.findById(condition);
switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) {
case 0: {// 相关方端推送数据至企业端 case 0: {// 相关方端推送数据至企业端
condition.clear(); condition.clear();
@ -518,8 +535,8 @@ public class XgfUserServiceImpl implements XgfUserService {
condition.clear(); condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition); PageData entity = xgfUserMapper.findById(condition);
flows.put("APPOINT_ONE_CORP_ID", "1"); flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getUSER_ID());
flows.put("APPOINT_ONE_CORP_NAME", "秦港股份公司"); flows.put("APPOINT_ONE_CORP_NAME", entity.getString("CORP_NAME"));
flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); flows.put("APPOINT_ONE_STATUS", info.getString("STATUS"));
flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); flows.put("APPOINT_ONE_OPINION", info.getString("OPINION"));
@ -571,7 +588,7 @@ public class XgfUserServiceImpl implements XgfUserService {
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition); PageData entity = xgfUserMapper.findById(condition);
flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_TWO_CORP_NAME", "秦港股份公司"); flows.put("APPOINT_TWO_CORP_NAME", entity.getString("CORP_NAME"));
flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); flows.put("APPOINT_TWO_TIME", DateUtil.getTime());
flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); flows.put("APPOINT_TWO_STATUS", info.getString("STATUS"));
flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); flows.put("APPOINT_TWO_OPINION", info.getString("OPINION"));
@ -627,8 +644,8 @@ public class XgfUserServiceImpl implements XgfUserService {
condition.clear(); condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition); PageData entity = xgfUserMapper.findById(condition);
flows.put("APPOINT_THREE_CORP_ID", "1"); flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_THREE_CORP_NAME", "秦港股份公司"); flows.put("APPOINT_THREE_CORP_NAME", entity.getString("CORP_NAME"));
flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); flows.put("APPOINT_THREE_TIME", DateUtil.getTime());
flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); flows.put("APPOINT_THREE_STATUS", info.getString("STATUS"));
flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); flows.put("APPOINT_THREE_OPINION", info.getString("OPINION"));
@ -682,8 +699,8 @@ public class XgfUserServiceImpl implements XgfUserService {
condition.clear(); condition.clear();
condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID"));
PageData entity = xgfUserMapper.findById(condition); PageData entity = xgfUserMapper.findById(condition);
flows.put("APPOINT_FOUR_CORP_ID", "1"); flows.put("APPOINT_FOUR_CORP_ID", Jurisdiction.getCORPINFO_ID());
flows.put("APPOINT_FOUR_CORP_NAME", "秦港股份公司"); flows.put("APPOINT_FOUR_CORP_NAME", entity.getString("CORP_NAME"));
flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); flows.put("APPOINT_FOUR_TIME", DateUtil.getTime());
flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS"));
flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION"));