diff --git a/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java b/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java index feb476ac..26bbb122 100644 --- a/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java +++ b/src/main/java/com/zcloud/controller/xgf/TrainingBatchController.java @@ -117,7 +117,6 @@ public class TrainingBatchController extends BaseController { * @throws Exception */ @RequestMapping(value = "/userList") - @RequiresPermissions("trainingbatch:list") @ResponseBody public Object userList(Page page) throws Exception { Map map = new HashMap(); diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index 3929e092..f9ade76d 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -29,7 +29,6 @@ public class XgfUserController extends BaseController { @Resource private TrainingBatchService trainingBatchService; - @RequestMapping(value = "/list") @ResponseBody public Object list(Page page) throws Exception { @@ -43,6 +42,9 @@ public class XgfUserController extends BaseController { return response; } + /** + * 人员信息审核 + */ @RequestMapping(value = "/approve") @ResponseBody public Object approve() throws Exception { @@ -95,4 +97,29 @@ public class XgfUserController extends BaseController { response.put("data", request); return response; } + + @RequestMapping(value = "/getAppointApproveList") + @ResponseBody + public Object getAppointApproveList(Page page) throws Exception{ + PageData request = this.getPageData(); + page.setPd(request); + PageData response = new PageData(); + response.put("result", "success"); + response.put("list", xgfUserService.getAppointApproveList(page)); + response.put("page", page); + return response; + } + + /** + * 人员指定审核 + */ + @RequestMapping(value = "/appointApprove") + @ResponseBody + public Object appointApprove() throws Exception{ + PageData request = this.getPageData(); + PageData response = new PageData(); + response.put("result", "success"); + response.put("data", request); + return response; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java index 63d2150e..87f11474 100644 --- a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java @@ -70,4 +70,6 @@ public interface XgfUserMapper { PageData getInfoById(PageData condition); List findRecordList(PageData condition); + + List appointlistPage(Page page); } diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 3397027c..47ee65ad 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -24,4 +24,6 @@ public interface XgfUserService { PageData findInfo(PageData condition); List findRecordList(PageData condition) throws Exception; + + List getAppointApproveList(Page page); } diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 3a912791..2321c4db 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -70,6 +70,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("XGF_USER_NAME", x.get("NAME")); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); + x.put("CHECK_STATUS","0"); x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("IS_DELETE", "0"); @@ -116,6 +117,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("IS_DELETE", "0"); x.put("VALID_FLAG", "1"); x.put("STATUS", "1"); + x.put("CHECK_STATUS","0"); if ("2".equals(x.getString("STUDY_STATUS"))) { x.put("STUDY_STATUS", "2"); } else { @@ -221,18 +223,23 @@ public class XgfUserServiceImpl implements XgfUserService { if (entity == null || entity.size() == 0) { throw new RuntimeException("未找到该用户"); } + // 通过则指定监管部门人员进行审核,不同过则打回相关方端(将CHECK_STATUS改为1) if ("1".equals(request.getString("STATUS"))) { - entity.put("STATUS", "2"); + entity.put("STATUS", "1"); entity.put("VALID_FLAG", "1"); - // 企业端人员审核完成后,指定企业端监管部门,中的某人进行培训 + entity.put("CHECK_STATUS","1"); condition.clear(); condition.put("XFG_USER_DETAILS_ID", x); PageData userInfo = xgfUserDetailsMapper.findById(condition); if (userInfo == null || userInfo.size() == 0) { throw new RuntimeException("未找到该用户详细信息"); } + // 企业端人员审核完成后,指定企业端监管部门,中的某人进行审核 userInfo.put("APPOINT_DEPARTMENT_ID", request.getString("APPOINT_DEPARTMENT_ID")); userInfo.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); + userInfo.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); + userInfo.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); + xgfUserDetailsMapper.edit(userInfo); } else { entity.put("STATUS", "0"); PageData key = new PageData(); @@ -287,4 +294,15 @@ public class XgfUserServiceImpl implements XgfUserService { public List findRecordList(PageData condition) throws Exception { return xgfUserMapper.findRecordList(condition); } + + @Override + public List getAppointApproveList(Page page) { + List list = xgfUserMapper.appointlistPage(page); + for (PageData x : list) { + if (StringUtils.isNotBlank(x.getString("APPOINT_USER_ID"))) { + // TODO 判断当前人是否有权限审批 + } + } + return list; + } } diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index b0713313..3115441f 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -66,10 +66,14 @@ f.zzName, f.APPOINT_DEPARTMENT_ID, f.APPOINT_DEPARTMENT_NAME, + f.APPOINT_USER_ID, + f.APPOINT_USER_NAME, f.APPOINT_ONE_CORP_ID, f.APPOINT_ONE_CORP_NAME, f.APPOINT_ONE_DEPARTMENT_ID, - f.APPOINT_ONE_DEPARTMENT_NAME + f.APPOINT_ONE_DEPARTMENT_NAME, + f.APPOINT_ONE_USER_ID, + f.APPOINT_ONE_USER_NAME @@ -132,10 +136,14 @@ zzName, APPOINT_DEPARTMENT_ID, APPOINT_DEPARTMENT_NAME, + APPOINT_USER_ID, + APPOINT_USER_NAME, APPOINT_ONE_CORP_ID, APPOINT_ONE_CORP_NAME, APPOINT_ONE_DEPARTMENT_ID, - APPOINT_ONE_DEPARTMENT_NAME + APPOINT_ONE_DEPARTMENT_NAME, + APPOINT_ONE_USER_ID, + APPOINT_ONE_USER_NAME @@ -197,10 +205,14 @@ #{zzName}, #{APPOINT_DEPARTMENT_ID}, #{APPOINT_DEPARTMENT_NAME}, + #{APPOINT_USER_ID}, + #{APPOINT_USER_NAME}, #{APPOINT_ONE_CORP_ID}, #{APPOINT_ONE_CORP_NAME}, #{APPOINT_ONE_DEPARTMENT_ID}, - #{APPOINT_ONE_DEPARTMENT_NAME} + #{APPOINT_ONE_DEPARTMENT_NAME}, + #{APPOINT_ONE_USER_ID}, + #{APPOINT_ONE_USER_NAME} @@ -286,10 +298,14 @@ zzName = #{zzName}, APPOINT_DEPARTMENT_ID = #{APPOINT_DEPARTMENT_ID}, APPOINT_DEPARTMENT_NAME = #{APPOINT_DEPARTMENT_NAME}, + APPOINT_USER_ID = #{APPOINT_USER_ID}, + APPOINT_USER_NAME = #{APPOINT_USER_NAME}, APPOINT_ONE_CORP_ID = #{APPOINT_ONE_CORP_ID}, APPOINT_ONE_CORP_NAME = #{APPOINT_ONE_CORP_NAME}, APPOINT_ONE_DEPARTMENT_ID = #{APPOINT_ONE_DEPARTMENT_ID}, - APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME} + APPOINT_ONE_DEPARTMENT_NAME = #{APPOINT_ONE_DEPARTMENT_NAME}, + APPOINT_ONE_USER_ID = #{APPOINT_ONE_USER_ID}, + APPOINT_ONE_USER_NAME = #{APPOINT_ONE_USER_NAME} where XGF_USER_DETAILS_ID = #{XGF_USER_DETAILS_ID} diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index ddbff968..78e7a597 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -21,7 +21,8 @@ f.STATUS, f.OPERATOR_TIME, f.ISFLOW, - f.STUDY_STATUS + f.STUDY_STATUS, + f.CHECK_STATUS @@ -38,7 +39,8 @@ STATUS, OPERATOR_TIME, ISFLOW, - STUDY_STATUS + STUDY_STATUS, + CHECK_STATUS @@ -55,7 +57,8 @@ #{STATUS}, #{OPERATOR_TIME}, #{ISFLOW}, - #{STUDY_STATUS} + #{STUDY_STATUS}, + #{CHECK_STATUS} @@ -95,7 +98,8 @@ STATUS = #{STATUS}, OPERATOR_TIME = #{OPERATOR_TIME}, ISFLOW = #{ISFLOW}, - STUDY_STATUS = #{STUDY_STATUS} + STUDY_STATUS = #{STUDY_STATUS}, + CHECK_STATUS = #{CHECK_STATUS} where XGF_USER_ID = #{XGF_USER_ID} @@ -229,6 +233,9 @@ and a.VALID_FLAG = #{pd.VALID_FLAG} + + and a.CHECK_STATUS = #{pd.CHECK_STATUS} + +