diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index 456b15c8..30e5c597 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -126,7 +126,7 @@ public class XgfUserController extends BaseController { } /** - * 人员指定审核 + * 查看审批信息 */ @RequestMapping(value = "/getApproveInfo") @ResponseBody diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index c04e767b..f18af2b2 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -99,6 +99,8 @@ public class XgfUserServiceImpl implements XgfUserService { if (regDepartmentEntity.size() > 0) { x.put("MAIN_DEPARTMENT_NAME", regDepartmentEntity.get("NAME")); } + entity = new PageData(); + entity.putAll(x); xgfUserMapper.save(x); xgfUserDetailsMapper.save(x); } else { @@ -198,8 +200,8 @@ public class XgfUserServiceImpl implements XgfUserService { flowDetail.put("APPROVER_ID", ""); flowDetail.put("APPROVER_NAME", ""); flowDetail.put("APPROVER_TIME", DateUtil.getTime()); - flowDetail.put("APPROVER_CORPINFO_ID", ""); - flowDetail.put("APPROVER_CORPINFO_NAME", ""); + flowDetail.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP")); + flowDetail.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME")); flowDetail.put("PASS_FLAG", "1"); flowDetail.put("END_FLAG", "0"); flowDetail.put("ISDELETE", "0"); @@ -221,6 +223,8 @@ public class XgfUserServiceImpl implements XgfUserService { nextNode.put("APPROVER_ID", ""); nextNode.put("APPROVER_NAME", ""); nextNode.put("APPROVER_OPINION", ""); + nextNode.put("APPROVER_CORPINFO_ID", entity.getString("BELONG_TO_CORP")); + nextNode.put("APPROVER_CORPINFO_NAME", entity.getString("BELONG_TO_CORP_NAME")); flowDetailMapper.save(nextNode); currentNode.put("STEP_FLAG", "0"); flowDetailMapper.edit(currentNode); @@ -333,92 +337,115 @@ public class XgfUserServiceImpl implements XgfUserService { List list = new ArrayList<>(); PageData zero = new PageData(); - zero.put("INDEX", "0"); - zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID")); - zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME")); - zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID")); - zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME")); - zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID")); - zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME")); - zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS")); - zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION")); - zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME")); - list.add(zero); - PageData one = new PageData(); - one.put("INDEX", "1"); - one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID")); - one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME")); - one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID")); - one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME")); - one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID")); - one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME")); - one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS")); - one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION")); - one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME")); - list.add(one); - PageData two = new PageData(); - two.put("INDEX", "2"); - two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID")); - two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME")); - two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID")); - two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME")); - two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID")); - two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME")); - two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS")); - two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION")); - two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME")); - list.add(two); - PageData three = new PageData(); - three.put("INDEX", "3"); - three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID")); - three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME")); - three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID")); - three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME")); - three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID")); - three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME")); - three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS")); - three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION")); - three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME")); - list.add(three); - PageData four = new PageData(); - four.put("INDEX", "4"); - four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID")); - four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME")); - four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID")); - four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME")); - four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID")); - four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME")); - four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS")); - four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION")); - four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME")); - list.add(four); - PageData five = new PageData(); - five.put("INDEX", "5"); - five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID")); - five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME")); - five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID")); - five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME")); - five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID")); - five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME")); - five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS")); - five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION")); - five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME")); - list.add(five); - PageData six = new PageData(); - six.put("INDEX", "6"); - six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID")); - six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME")); - six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID")); - six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME")); - six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID")); - six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME")); - six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS")); - six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION")); - six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME")); - list.add(six); + int index = Integer.parseInt(entity.getString("FLOWS_STEP")); + if (index >= 0){ + zero.put("INDEX", "0"); + zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID")); + zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME")); + zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID")); + zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME")); + zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID")); + zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME")); + zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS")); + zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION")); + zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME")); + list.add(zero); + } + if (index >= 1) { + PageData one = new PageData(); + one.put("INDEX", "1"); + one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID")); + one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME")); + one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID")); + one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME")); + one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID")); + one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME")); + one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS")); + one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION")); + one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME")); + list.add(one); + } + if (index >= 2) { + PageData two = new PageData(); + two.put("INDEX", "2"); + two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID")); + two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME")); + two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID")); + two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME")); + two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID")); + two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME")); + two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS")); + two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION")); + two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME")); + list.add(two); + } + if (index >= 3) { + PageData three = new PageData(); + three.put("INDEX", "3"); + three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID")); + three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME")); + three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID")); + three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME")); + three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID")); + three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME")); + three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS")); + three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION")); + three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME")); + list.add(three); + } + if (index >= 4) { + PageData four = new PageData(); + four.put("INDEX", "4"); + four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID")); + four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME")); + four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID")); + four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME")); + four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID")); + four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME")); + four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS")); + four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION")); + four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME")); + list.add(four); + } + if (index >= 5) { + PageData five = new PageData(); + five.put("INDEX", "5"); + five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID")); + five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME")); + five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID")); + five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME")); + five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID")); + five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME")); + five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS")); + five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION")); + five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME")); + list.add(five); + } + if (index >= 6) { + PageData six = new PageData(); + six.put("INDEX", "6"); + six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID")); + six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME")); + six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID")); + six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME")); + six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID")); + six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME")); + six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS")); + six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION")); + six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME")); + list.add(six); + } PageData info = new PageData(); info.put("info", list); info.put("STEP", entity.getString("FLOWS_STEP")); + + condition.clear(); + condition.put("XGF_USER_ID", request.getString("XGF_USER_ID")); + PageData userInfo = xgfUserMapper.findById(condition); + if (userInfo == null || userInfo.size() == 0) { + throw new RuntimeException("未找到该用户详细信息"); + } + info.put("endFlag", userInfo.getString("CHECK_STATUS")); return info; } @@ -464,11 +491,16 @@ public class XgfUserServiceImpl implements XgfUserService { private String handle(PageData info, PageData flows) throws Exception { PageData condition = new PageData(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + PageData corpEntity = corpInfoMapper.findById(condition); switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { case 0: {// 相关方端推送数据至企业端 condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); + flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); entity.put("VALID_FLAG", "0"); @@ -482,25 +514,14 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - - flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); - flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { - flows.put("APPOINT_ZERO_TIME", DateUtil.getTime()); - flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION")); - flows.put("APPOINT_ONE_CORP_TYPE", "0"); flows.put("APPOINT_ONE_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID")); flows.put("APPOINT_ONE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_ONE_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_ONE_USER_NAME", info.getString("APPOINT_USER_NAME")); - // TODO 企业端审批人 - flows.put("APPOINT_ONE_CORP_ID", ""); - flows.put("APPOINT_ONE_CORP_NAME", ""); flows.put("FLOWS_STEP", 1); xgfFlowsMapper.edit(flows); condition.clear(); @@ -516,6 +537,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_ONE_CORP_ID", Jurisdiction.getUSER_ID()); + flows.put("APPOINT_ONE_CORP_NAME", corpEntity.getString("CORP_NAME")); + flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); + flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); entity.put("VALID_FLAG", "0"); @@ -529,10 +555,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -548,11 +570,6 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_TWO_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_TWO_USER_NAME", info.getString("APPOINT_USER_NAME")); flows.put("FLOWS_STEP", 2); - - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); - xgfFlowsMapper.edit(flows); return "0"; } else { @@ -561,12 +578,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("STATUS", "2"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); xgfUserMapper.edit(entity); - - flows.put("APPOINT_ONE_TIME", DateUtil.getTime()); - flows.put("APPOINT_ONE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_ONE_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 2); - xgfFlowsMapper.edit(flows); return "1"; } @@ -577,6 +589,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_TWO_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_TWO_CORP_NAME", corpEntity.getString("CORP_NAME")); + flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); + flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); + flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); @@ -591,9 +608,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); - flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -605,6 +619,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); entity.put("STATUS", "2"); xgfUserMapper.edit(entity); + xgfFlowsMapper.edit(flows); return "1"; case "1":// 集团单位审批，需要指定下一位人员进行审批 entity.put("CHECK_STATUS", 1); @@ -619,9 +634,6 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_THREE_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME")); flows.put("APPOINT_THREE_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_THREE_USER_NAME", info.getString("APPOINT_USER_NAME")); - flows.put("APPOINT_TWO_TIME", DateUtil.getTime()); - flows.put("APPOINT_TWO_STATUS", info.getString("STATUS")); - flows.put("APPOINT_TWO_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 3); xgfFlowsMapper.edit(flows); return "0"; @@ -634,6 +646,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_THREE_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_THREE_CORP_NAME", corpEntity.getString("CORP_NAME")); + flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); + flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); + flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); @@ -648,9 +665,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); - flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -674,10 +688,6 @@ public class XgfUserServiceImpl implements XgfUserService { flows.put("APPOINT_FOUR_USER_ID", info.getString("APPOINT_USER_ID")); flows.put("APPOINT_FOUR_USER_NAME", info.getString("APPOINT_USER_NAME")); flows.put("FLOWS_STEP", 4); - - flows.put("APPOINT_THREE_TIME", DateUtil.getTime()); - flows.put("APPOINT_THREE_STATUS", info.getString("STATUS")); - flows.put("APPOINT_THREE_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; default: @@ -691,6 +701,11 @@ public class XgfUserServiceImpl implements XgfUserService { condition.clear(); condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData entity = xgfUserMapper.findById(condition); + flows.put("APPOINT_FOUR_CORP_ID", Jurisdiction.getCORPINFO_ID()); + flows.put("APPOINT_FOUR_CORP_NAME", corpEntity.getString("CORP_NAME")); + flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); + flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); + flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); // 1、判断是否通过审核 if ("0".equals(info.getString("STATUS"))) { entity.put("STATUS", "0"); @@ -705,9 +720,6 @@ public class XgfUserServiceImpl implements XgfUserService { throw new RuntimeException("请求失败"); } xgfUserMapper.edit(entity); - flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); - flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); - flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); xgfFlowsMapper.edit(flows); return "0"; } else { @@ -719,6 +731,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); entity.put("STATUS", "2"); xgfUserMapper.edit(entity); + xgfFlowsMapper.edit(flows); return "1"; case "1":// 辖区单位审批，需要指定审批人 entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); @@ -726,10 +739,6 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("VALID_FLAG", "1"); entity.put("STATUS", "2"); xgfUserMapper.edit(entity); - - flows.put("APPOINT_FOUR_TIME", DateUtil.getTime()); - flows.put("APPOINT_FOUR_STATUS", info.getString("STATUS")); - flows.put("APPOINT_FOUR_OPINION", info.getString("OPINION")); flows.put("FLOWS_STEP", 5); xgfFlowsMapper.edit(flows); return "1"; diff --git a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml index 1270676c..5b7725af 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -40,6 +40,8 @@ f.APPOINT_TWO_DEPARTMENT_NAME, f.APPOINT_TWO_USER_ID, f.APPOINT_TWO_USER_NAME, + f.APPOINT_TWO_STATUS, + f.APPOINT_TWO_OPINION, f.APPOINT_TWO_TIME, f.APPOINT_THREE_CORP_ID, f.APPOINT_THREE_CORP_NAME, @@ -123,6 +125,8 @@ APPOINT_TWO_DEPARTMENT_NAME, APPOINT_TWO_USER_ID, APPOINT_TWO_USER_NAME, + APPOINT_TWO_STATUS, + APPOINT_TWO_OPINION, APPOINT_TWO_TIME, APPOINT_THREE_CORP_ID, APPOINT_THREE_CORP_NAME, @@ -206,6 +210,8 @@ #{APPOINT_TWO_DEPARTMENT_NAME}, #{APPOINT_TWO_USER_ID}, #{APPOINT_TWO_USER_NAME}, + #{APPOINT_TWO_STATUS}, + #{APPOINT_TWO_OPINION}, #{APPOINT_TWO_TIME}, #{APPOINT_THREE_CORP_ID}, #{APPOINT_THREE_CORP_NAME}, @@ -301,6 +307,8 @@ APPOINT_TWO_DEPARTMENT_NAME = #{APPOINT_TWO_DEPARTMENT_NAME}, APPOINT_TWO_USER_ID = #{APPOINT_TWO_USER_ID}, APPOINT_TWO_USER_NAME = #{APPOINT_TWO_USER_NAME}, + APPOINT_TWO_STATUS = #{APPOINT_TWO_STATUS}, + APPOINT_TWO_OPINION = #{APPOINT_TWO_OPINION}, APPOINT_TWO_TIME = #{APPOINT_TWO_TIME}, APPOINT_THREE_CORP_ID = #{APPOINT_THREE_CORP_ID}, APPOINT_THREE_CORP_NAME = #{APPOINT_THREE_CORP_NAME},