diff --git a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java index 91bb1e22..14169e38 100644 --- a/src/main/java/com/zcloud/controller/xgf/XgfUserController.java +++ b/src/main/java/com/zcloud/controller/xgf/XgfUserController.java @@ -38,7 +38,6 @@ public class XgfUserController extends BaseController { public Object approve() throws Exception { PageData request = this.getPageData(); xgfUserService.approve(request); - PageData response = new PageData(); response.put("result", "success"); response.put("data", request); @@ -49,10 +48,23 @@ public class XgfUserController extends BaseController { @ResponseBody public Object regulatoryUserList() throws Exception{ PageData request = this.getPageData(); - PageData response = new PageData(); response.put("result", "success"); response.put("data", request); return response; } + + @RequestMapping(value = "/getInfo") + @ResponseBody + public Object getInfo() throws Exception { + PageData request = this.getPageData(); + PageData condition = new PageData(); + condition.put("XGF_USER_ID", request.getString("XGF_USER_ID")); + PageData entity = xgfUserService.findInfo(condition); + PageData response = new PageData(); + response.put("result", "success"); + response.put("info", entity); + 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 d60b51cf..aaf87245 100644 --- a/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java @@ -66,4 +66,6 @@ public interface XgfUserMapper { void graduationstudent(PageData condition); List flowlistPage(Page page); + + PageData getInfoById(PageData condition); } diff --git a/src/main/java/com/zcloud/service/xgf/XgfUserService.java b/src/main/java/com/zcloud/service/xgf/XgfUserService.java index 60dd151a..8e0f2c92 100644 --- a/src/main/java/com/zcloud/service/xgf/XgfUserService.java +++ b/src/main/java/com/zcloud/service/xgf/XgfUserService.java @@ -20,4 +20,6 @@ public interface XgfUserService { List flowlistPage(Page page)throws Exception; void approve(PageData request) throws Exception; + + PageData findInfo(PageData condition); } 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 11627079..e25efcb5 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -67,7 +67,7 @@ public class XgfUserServiceImpl implements XgfUserService { x.put("CREATED_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime()); condition.clear(); - condition.put("DEPARTMENT_ID","MANAGER_DEPARTMENT_ID"); + condition.put("DEPARTMENT_ID",x.get("MANAGER_DEPARTMENT_ID")); PageData regDepartmentEntity = departmentService.getCorpDepartment(condition); x.put("MANAGER_DEPARTMENT_NAME",regDepartmentEntity.get("NAME")); xgfUserMapper.save(x); @@ -141,4 +141,9 @@ public class XgfUserServiceImpl implements XgfUserService { } } } + + @Override + public PageData findInfo(PageData condition) { + return xgfUserMapper.getInfoById(condition); + } } diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml index a04a52a5..409d2f14 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml @@ -51,7 +51,14 @@ f.IS_BODY_ADAPT, f.IS_SPECIAL_JOB, f.CORPINFO_ID, - f.MANAGER_DEPARTMENT_ID + f.MANAGER_DEPARTMENT_ID, + f.CARD_ID, + f.DEPARTMENT_ID, + f.DEPARTMENT_NAME, + f.IS_BF, + f.IS_SOCIAL, + f.SOCIAL_NUMBER, + f.zzName @@ -99,7 +106,14 @@ IS_SPECIAL_JOB, CORPINFO_ID, MANAGER_DEPARTMENT_ID, - MANAGER_DEPARTMENT_NAME + MANAGER_DEPARTMENT_NAME, + CARD_ID, + DEPARTMENT_ID, + DEPARTMENT_NAME, + IS_BF, + IS_SOCIAL, + SOCIAL_NUMBER, + zzName @@ -147,7 +161,14 @@ #{IS_SPECIAL_JOB}, #{CORPINFO_ID}, #{MANAGER_DEPARTMENT_ID}, - #{MANAGER_DEPARTMENT_NAME} + #{MANAGER_DEPARTMENT_NAME}, + #{CARD_ID}, + #{DEPARTMENT_ID}, + #{DEPARTMENT_NAME}, + #{IS_BF}, + #{IS_SOCIAL}, + #{SOCIAL_NUMBER}, + #{zzName} @@ -219,7 +240,14 @@ IS_SPECIAL_JOB = #{IS_SPECIAL_JOB}, CORPINFO_ID = #{CORPINFO_ID}, MANAGER_DEPARTMENT_ID = #{MANAGER_DEPARTMENT_ID}, - MANAGER_DEPARTMENT_NAME = #{MANAGER_DEPARTMENT_NAME} + MANAGER_DEPARTMENT_NAME = #{MANAGER_DEPARTMENT_NAME}, + CARD_ID = #{CARD_ID}, + DEPARTMENT_ID = #{DEPARTMENT_ID}, + DEPARTMENT_NAME = #{DEPARTMENT_NAME}, + IS_BF = #{IS_BF}, + IS_SOCIAL = #{IS_SOCIAL}, + SOCIAL_NUMBER = #{SOCIAL_NUMBER}, + zzName = #{zzName} 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 1517d39d..ad1548bc 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -205,5 +205,68 @@ and a.STATUS = #{pd.STATUS} +