Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAutoPaymentDetail.java

@@ -54,7 +54,7 @@ public class TAutoPaymentDetail extends BaseEntity {
 	/**
 	 * 是否重新办理 0 是 1 否
 	 */
-	@ExcelAttribute(name = "是否重新办理 0 是 1 否", maxLength = 1)
+	@ExcelAttribute(name = "是否重新办理 0 是 1 否", maxLength = 1, readConverterExp = "0=是,1=否")
 	@Length(max = 1, message = "是否重新办理 0 是 1 否不能超过1个字符")
 	@ExcelProperty("是否重新办理")
 	@Schema(description = "是否重新办理 0 是 1 否")
@@ -161,12 +161,12 @@ public class TAutoPaymentDetail extends BaseEntity {
 	@Schema(description = "社保户")
 	private String socialSecurityAccount;
 	/**
-	 * 资源类型：1日常申报导出；2人员缴费明细打印；3单位缴费明细查询；4单位缴费明细下载
+	 * 资源类型：1日常申报导出；2单位个人缴费信息查询；3单位缴费明细查询；4单位缴费明细下载
 	 */
-	@ExcelAttribute(name = "资源类型", maxLength = 100)
+	@ExcelAttribute(name = "资源类型", maxLength = 100, readConverterExp = "1=日常申报导出,2=单位个人缴费信息查询,3=单位缴费明细查询,4=单位缴费明细下载")
 	@Length(max = 100, message = "资源类型不能超过100个字符")
 	@ExcelProperty("资源类型")
-	@Schema(description = "资源类型：1日常申报导出；2人员缴费明细打印；3单位缴费明细查询；4单位缴费明细下载")
+	@Schema(description = "资源类型：1日常申报导出；2单位个人缴费信息查询；3单位缴费明细查询；4单位缴费明细下载")
 	private String sourceType;
 
 	/**

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

@@ -173,7 +173,8 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
 		if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
 			wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
 		}
-		wrapper.orderByDesc(BaseEntity::getCreateTime);
+		wrapper.orderByAsc(TAutoPaymentDetail::getSourceType);
+		wrapper.orderByAsc(BaseEntity::getCreateTime);
 		return baseMapper.selectList(wrapper);
 	}