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},