Merge remote-tracking branch 'origin/master'

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/UserFilesInfo.java

@@ -122,7 +122,7 @@ public class UserFilesInfo extends BaseEntity {
 	* 政治面貌
 	*/
 	@ApiModelProperty(value = "政治面貌")
-		private String political;
+		private Integer politicalType;
 	/**
 	* 开户行名称
 	*/

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/UserFilesInfoVO.java

@@ -91,9 +91,12 @@ public class UserFilesInfoVO extends UserFilesInfo {
 	@ApiModelProperty(value = "部门名称")
 	private String deptName;
 
-	@ApiModelProperty(value = "合同附件名称")
+	@ApiModelProperty(value = "合同附件URl")
 	private String conFileUrl;
 
+	@ApiModelProperty(value = "合同附件名称")
+	private String conFileName;
+
 	@ApiModelProperty(value = "学历中文")
 	private String educationName;
 
@@ -115,5 +118,4 @@ public class UserFilesInfoVO extends UserFilesInfo {
 	@ApiModelProperty(value = "合同期限")
 	private Integer conYear;
 
-
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserFilesInfoMapper.xml

@@ -21,7 +21,7 @@
         <result column="emergency_phone" property="emergencyPhone"/>
         <result column="emergency_relation" property="emergencyRelation"/>
         <result column="speciality" property="speciality"/>
-        <result column="political" property="political"/>
+        <result column="political" property="politicalType"/>
         <result column="bank_name" property="bankName"/>
         <result column="user_status" property="userStatus"/>
         <result column="bank_num" property="bankNum"/>
@@ -49,7 +49,7 @@
         <result column="emergency_phone" property="emergencyPhone"/>
         <result column="emergency_relation" property="emergencyRelation"/>
         <result column="speciality" property="speciality"/>
-        <result column="political" property="political"/>
+        <result column="political_type" property="politicalType"/>
         <result column="bank_name" property="bankName"/>
         <result column="user_status" property="userStatus"/>
         <result column="bank_num" property="bankNum"/>
@@ -60,10 +60,24 @@
     </resultMap>
 
     <select id="selectUserFilesInfoPage" resultMap="userFilesInfoResultVoMap">
-        select * from c_view_user_files_info where is_deleted = 0
+        select a.*,
+        (SELECT dict_name from c_dict_info a where a.code='marriage_status' and parent_id!=0 and dict_value =a.marriage_status) as marriageStatusName,
+        (SELECT dict_name from c_dict_info a where a.code='education_type' and parent_id!=0 and dict_value =a.education_type) as educationName,
+        (SELECT dict_name from c_dict_info a where a.code='user_type' and parent_id!=0 and dict_value =a.user_type) as userTypeName,
+        (SELECT dict_name from c_dict_info a where a.code='con_type' and parent_id!=0 and dict_value =a.con_type) as conTypeName,
+        (SELECT dict_name from c_dict_info a where a.code='user_status' and parent_id!=0 and dict_value =a.user_status) as userStatusName,
+        (SELECT dict_name from c_dict_info a where a.code='political_type' and parent_id!=0 and dict_value =a.political_type) as politicalName
+        from c_view_user_files_info a where a.is_deleted = 0
     </select>
 
     <select id="getUserFileDetail" resultMap="userFilesInfoResultVoMap">
-        select * from c_view_user_files_info where is_deleted = 0 and id=#{id}
+        select a.*,
+            (SELECT dict_name from c_dict_info a where a.code='marriage_status' and parent_id!=0 and dict_value =a.marriage_status) as marriageStatusName,
+            (SELECT dict_name from c_dict_info a where a.code='education_type' and parent_id!=0 and dict_value =a.education_type) as educationName,
+            (SELECT dict_name from c_dict_info a where a.code='user_type' and parent_id!=0 and dict_value =a.user_type) as userTypeName,
+            (SELECT dict_name from c_dict_info a where a.code='con_type' and parent_id!=0 and dict_value =a.con_type) as conTypeName,
+            (SELECT dict_name from c_dict_info a where a.code='user_status' and parent_id!=0 and dict_value =a.user_status) as userStatusName,
+            (SELECT dict_name from c_dict_info a where a.code='political_type' and parent_id!=0 and dict_value =a.political_type) as politicalName
+        from c_view_user_files_info a where a.is_deleted = 0 and id=#{id}
     </select>
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/wrapper/UserFilesWrapper.java

@@ -55,12 +55,12 @@ public class UserFilesWrapper extends BaseEntityWrapper<UserFilesInfoVO, UserFil
         userFilesInfo.setDeptName(Func.join(deptName));
         userFilesInfo.setPostName(Func.join(postName));
         userFilesInfo.setSexName(DictCache.getValue(DictEnum.SEX, userFilesInfo.getSex()));
-        userFilesInfo.setMarriageStatusName(DictCache.getValue("marriage_status", userFilesInfo.getMarriageStatus()));;
+        /*userFilesInfo.setMarriageStatusName(DictCache.getValue("marriage_status", userFilesInfo.getMarriageStatus()));;
         userFilesInfo.setEducationName(DictCache.getValue("education_type", userFilesInfo.getEducationType()));;
         userFilesInfo.setUserTypeName(DictCache.getValue("user_type", userFilesInfo.getUserType()));
         userFilesInfo.setConTypeName(DictCache.getValue("con_type", userFilesInfo.getConType()));
         userFilesInfo.setUserStatusName(DictCache.getValue("user_status", userFilesInfo.getUserStatus()));
-        userFilesInfo.setPoliticalName(DictCache.getValue("political_type", userFilesInfo.getPolitical()));
+        userFilesInfo.setPoliticalName(DictCache.getValue("political_type", userFilesInfo.getPolitical()));*/
         return userFilesInfo;
     }
 

blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DeptWrapper.java

@@ -53,6 +53,8 @@ public class DeptWrapper extends BaseEntityWrapper<Dept, DeptVO> {
         }
         String category = DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory());
         deptVO.setDeptCategoryName(category);
+
+
         return deptVO;
     }