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..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; @@ -29,7 +30,6 @@ public class XgfUserController extends BaseController { @Resource private TrainingBatchService trainingBatchService; - @RequestMapping(value = "/list") @ResponseBody public Object list(Page page) throws Exception { @@ -43,6 +43,9 @@ public class XgfUserController extends BaseController { return response; } + /** + * 人员信息审核 + */ @RequestMapping(value = "/approve") @ResponseBody public Object approve() throws Exception { @@ -95,4 +98,30 @@ 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(); + request.put("USER_ID", Jurisdiction.getUSER_ID()); + 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/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/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 169722b4..be8fc426 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -2,10 +2,8 @@ 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.service.bus.CorpInfoService; +import com.zcloud.mapper.datasource.bus.CorpInfoMapper; +import com.zcloud.mapper.datasource.xgf.*; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.xgf.XgfUserService; import com.zcloud.util.*; @@ -30,10 +28,19 @@ 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; + + @Resource + private XgfFlowsMapper xgfFlowsMapper; + + @Resource + private CorpInfoMapper corpInfoMapper; @Value("${preventionxgf.api.url}") private String prevention_xgf_url; @@ -60,6 +67,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 +75,9 @@ 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("CHECK_STATUS", "1"); + x.put("CHECK_STEP", 0); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -113,17 +123,103 @@ public class XgfUserServiceImpl implements XgfUserService { } x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); - x.put("STATUS", "2"); + x.put("STATUS", "1"); + x.put("CHECK_STATUS", "1"); + x.put("CHECK_STEP", 0); 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("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("CORPINFO_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")); + 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("FLOWS_STEP", 0); + 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"); + 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、流程记录 */ + 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")); + condition.put("STEP_FLAG", "1"); + 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 +227,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 +234,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 + "]在系统流程中无法被打回"); } @@ -166,24 +261,25 @@ 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("未找到该用户"); + /* 保存审批信息 */ + condition.clear(); + condition.put("FLOWS_ID", x); + PageData flows = xgfFlowsMapper.findById(condition); + if (flows == null || flows.size() == 0) { + throw new RuntimeException("未找到该用户详细信息"); } - if ("1".equals(request.getString("STATUS"))) { - entity.put("STATUS", "0"); - } else { - entity.put("STATUS", "2"); - entity.put("VALID_FLAG", "1"); - } - xgfUserMapper.edit(entity); + 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")); + 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")); - 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("请求失败"); - } + // 保存审批记录 + this.saveLog(condition, request.getString("STATUS"), this.handle(condition, flows)); } } @@ -196,4 +292,449 @@ 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) { + x.put("power_flag", getPower(x)); + } + return list; + } + + /* 获取当前用户是否有权限审批 */ + 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"; + } + 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"; + } + } + + private String handle(PageData info, PageData flows) throws Exception { + PageData condition = new PageData(); + 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); + 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); + + 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")); + 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")); + 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); + + 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"))) { + 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("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"; + } + } + } + //监管部门审批人审批，并根据不同类型的审批规则进行处理 + 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", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + 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、通过审核后，根据不同的流程进行不同的处理 + 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_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_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")); + 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", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + 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 根据是否委托辖区单位进行处理(前端传回来) + 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); + 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("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: + 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", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + 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 根据是否委托辖区单位进行处理(前端传回来) + 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_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"; + default: + throw new RuntimeException("未知的审批类型"); + } + } + + } + // 委托辖区单位监管部门审批 + 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", "1"); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + 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); + 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")); + 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); + 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")); + 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); + return "0"; + } + default: + return "1"; + } + } + + private void saveLog(PageData info, String status, String endFlag) throws Exception { + /* 保存审批记录 */ + PageData condition = new PageData(); + condition.clear(); + condition.put("FOREIGN_KEY", info.getString("FLOWS_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")); + condition.put("STEP_FLAG", "1"); + 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_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) { + // 集团单位id + // （河港机械 jtdw002 1e6dbbe16004402f8d2c0e52afd9a676）， + // （河港港工 jtdw003 3a854eefa7894e06aaa1a2611bca80f6）， + // （河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5）， + // （方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2） + String jituandanwei = "1e6dbbe16004402f8d2c0e52afd9a676，3a854eefa7894e06aaa1a2611bca80f6，020578a4c1f04bc692ee25145c2efbe5，90966974de3c4b83aca6f8fd6432d5c2"; + if (jituandanwei.contains(corpInfoId)) { + return "1"; + } else { + return "0"; + } + } } 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 978c5797..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} @@ -87,5 +91,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/XgfFlowsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml new file mode 100644 index 00000000..1270676c --- /dev/null +++ b/src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml @@ -0,0 +1,364 @@ + + + + + + xgf_flows + + + + f.FLOWS_ID, + 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_TYPE, + 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_TYPE, + 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_CORP_TYPE, + 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_CORP_TYPE, + 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_CORP_TYPE, + 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_CORP_TYPE, + 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_CORP_TYPE, + 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_CORP_TYPE, + 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, + FLOWS_TYPE, + IS_DELETE, + APPOINT_ZERO_CORP_ID, + APPOINT_ZERO_CORP_TYPE, + 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_TYPE, + 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_CORP_TYPE, + 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_CORP_TYPE, + 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_CORP_TYPE, + 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_CORP_TYPE, + 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_CORP_TYPE, + 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_CORP_TYPE, + 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}, + #{FLOWS_TYPE}, + #{IS_DELETE}, + #{APPOINT_ZERO_CORP_ID}, + #{APPOINT_ZERO_CORP_TYPE}, + #{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_TYPE}, + #{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_CORP_TYPE}, + #{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_CORP_TYPE}, + #{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_CORP_TYPE}, + #{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_CORP_TYPE}, + #{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_CORP_TYPE}, + #{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_CORP_TYPE}, + #{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}, + FLOWS_TYPE = #{FLOWS_TYPE}, + IS_DELETE = #{IS_DELETE}, + APPOINT_ZERO_CORP_ID = #{APPOINT_ZERO_CORP_ID}, + 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}, + 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_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}, + 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_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}, + 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_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}, + 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_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}, + 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_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}, + 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_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}, + 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_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}, + APPOINT_SEVEN_USER_NAME = #{APPOINT_SEVEN_USER_NAME}, + APPOINT_SEVEN_STATUS = #{APPOINT_SEVEN_STATUS}, + APPOINT_SEVEN_OPINION = #{APPOINT_SEVEN_OPINION} + 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 ddbff968..fd91dc5a 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -21,7 +21,9 @@ f.STATUS, f.OPERATOR_TIME, f.ISFLOW, - f.STUDY_STATUS + f.STUDY_STATUS, + f.CHECK_STATUS, + f.CHECK_STEP @@ -38,7 +40,9 @@ STATUS, OPERATOR_TIME, ISFLOW, - STUDY_STATUS + STUDY_STATUS, + CHECK_STATUS, + CHECK_STEP @@ -55,7 +59,9 @@ #{STATUS}, #{OPERATOR_TIME}, #{ISFLOW}, - #{STUDY_STATUS} + #{STUDY_STATUS}, + #{CHECK_STATUS}, + #{CHECK_STEP} @@ -95,7 +101,9 @@ STATUS = #{STATUS}, OPERATOR_TIME = #{OPERATOR_TIME}, ISFLOW = #{ISFLOW}, - STUDY_STATUS = #{STUDY_STATUS} + STUDY_STATUS = #{STUDY_STATUS}, + CHECK_STATUS = #{CHECK_STATUS}, + CHECK_STEP = #{CHECK_STEP} where XGF_USER_ID = #{XGF_USER_ID} @@ -229,6 +237,9 @@ and a.VALID_FLAG = #{pd.VALID_FLAG} + + and a.CHECK_STATUS = #{pd.CHECK_STATUS} + +