社保公积金查询：档案地-省、户口性质、名族 处理

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoExportVo.java

@@ -116,7 +116,7 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("身份证所在地")
 	private String idCardAddress;
 
-	@ExcelAttribute(name = "档案-省")
+	@ExcelAttribute(name = "档案-省", isArea = true)
 	@Schema(description = "档案-省")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("档案-省")

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -1221,6 +1221,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				temp.append(DispatchConstants.DISPATCH_FUND);
 			}
 		}
+		if (Common.isNotNull(temp.toString())){
+			temp.deleteCharAt(temp.length()-1);
+		}
 		dispatch.setDispatchItem(temp.toString());
 	}
 

yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml

@@ -256,6 +256,9 @@
 		<result property="fundSum" column="FUND_SUM"/>
 
 		<result property="trustRemark" column="TRUST_REMARK"/>
+		<result property="empNational" column="EMP_NATIONAL"/>
+		<result property="empRegisType" column="EMP_REGIS_TYPE"/>
+
 	</resultMap>
 	<sql id="Base_Column_List">
 				a.ID,
@@ -1035,7 +1038,9 @@
 			a.UNEMPLOY_HANDLE,
 			a.WORK_INJURY_HANDLE,
 			a.BIRTH_HANDLE,
-			a.BIGAILMENT_HANDLE
+			a.BIGAILMENT_HANDLE,
+		    d.EMP_NATIONAL,
+		    d.EMP_REGIS_TYPE
 		from t_social_fund_info a
 		left join t_dispatch_info d on a.DISPATCH_ID=d.ID
 		<where>