bug修复

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;
+    }
 }

src/main/java/com/zcloud/mapper/datasource/xgf/XgfUserMapper.java

@@ -66,4 +66,6 @@ public interface XgfUserMapper {
     void graduationstudent(PageData condition);
 
     List<PageData> flowlistPage(Page page);
+
+    PageData getInfoById(PageData condition);
 }

src/main/java/com/zcloud/service/xgf/XgfUserService.java

@@ -20,4 +20,6 @@ public interface XgfUserService {
     List<PageData> flowlistPage(Page page)throws Exception;
 
     void approve(PageData request) throws Exception;
+
+    PageData findInfo(PageData condition);
 }

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);
+    }
 }

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
     </sql>
 
     <!-- 字段用于新增 -->
@@ -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
     </sql>
 
     <!-- 字段值 -->
@@ -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}
     </sql>
 
     <!-- 新增-->
@@ -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}
     </update>

src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml

@@ -205,5 +205,68 @@
             and a.STATUS = #{pd.STATUS}
         </if>
     </select>
+	<select id="getInfoById" resultType="com.zcloud.entity.PageData">
+		select a.XGF_USER_ID,
+		       a.ISFLOW,
+		       a.NAME,
+			   b.XGF_USER_DETAILS_ID,
+			   b.XGF_USER_ID,
+			   b.XGF_USER_NAME,
+			   b.BELONG_TO_CORP,
+			   b.BELONG_TO_CORP_NAME,
+			   b.PHONE,
+			   b.CREAT_TIME,
+			   b.DEPART_STATE,
+			   b.ISDELETE,
+			   b.AGE,
+			   b.HKLOCAL,
+			   b.ADDRESS,
+			   b.DEGREE_OF_EDUCATION,
+			   b.DEGREE_OF_EDUCATION_NAME,
+			   b.CORP_START_DATE,
+			   b.POST_ID,
+			   b.POST_NAME,
+			   b.WORK_SIGN,
+			   b.JOINED_DATE,
+			   b.WORK_DATE,
+			   b.PHOTO,
+			   b.DATE_OF_BIRTH,
+			   b.ISPAY,
+			   b.ISPAY_NUMBER,
+			   b.IS_SAFETY_TELL,
+			   b.IS_SAFETY_TIME,
+			   b.IS_INJURIES_PAY,
+			   b.IS_SIGN_LABOR,
+			   b.SEX,
+			   b.ENTRY_DATE,
+			   b.PERSON_WORK_TYPE,
+			   b.PERSON_WORK_TYPE_NAME,
+			   b.NATIONALITY,
+			   b.NATIONALITY_NAME,
+			   b.POLITICAL_TIME,
+			   b.POLITICAL_STATUS,
+			   b.POLITICAL_STATUS_NAME,
+			   b.IS_INJURIES_PAY_TIME,
+			   b.IS_LEVEL_THREE,
+			   b.IS_BODY_ADAPT,
+			   b.IS_SPECIAL_JOB,
+			   b.CORPINFO_ID,
+			   b.MANAGER_DEPARTMENT_ID,
+			   b.MANAGER_DEPARTMENT_NAME,
+			   b.CARD_ID,
+			   b.DEPARTMENT_ID,
+			   b.DEPARTMENT_NAME,
+			   b.IS_SOCIAL,
+			   b.IS_BF,
+			   b.SOCIAL_NUMBER,
+			   b.zzName,
+			   b.POLITICAL_TIME
+		from xgf_user a
+				 left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID
+		where a.IS_DELETE = '0'
+		<if test="XGF_USER_ID != null and XGF_USER_ID != ''">
+			and a.XGF_USER_ID = #{XGF_USER_ID}
+		</if>
+	</select>
 
 </mapper>