Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -249,9 +249,9 @@
 		a.DEPART_NO,
 		a.DEPART_NAME,
 		a.INSURANCE_SETTLE_TYPE,
-		c.ID AS 'customerId',
-		c.CUSTOMER_NAME as 'customerName',
-		c.CUSTOMER_CODE as 'customerCode',
+		a.CUSTOMER_ID AS 'customerId',
+		a.CUSTOMER_NAME as 'customerName',
+		a.CUSTOMER_NO as 'customerCode',
 		a.BUSINESS_PRIMARY_TYPE,
 		a.BUSINESS_SECOND_TYPE,
 		a.BUSINESS_THIRD_TYPE,
@@ -259,7 +259,6 @@
 		a.INVOICE_TITLE_SALARY,
 		a.INVOICE_TITLE_INSURANCE
 		FROM t_settle_domain a
-				 LEFT JOIN t_customer_info c ON a.CUSTOMER_ID = c.ID
 		where 1=1
 			<if test="codes != null and codes.size() > 0">
 				and  a.DEPART_NO in

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

@@ -134,10 +134,10 @@ public class IncomeExportVo implements Serializable {
 	/**
 	 * 数据生成月份
 	 */
-	@Length(max = 6, message = "数据生成时间 不能超过6 个字符")
-	@ExcelAttribute(name = "数据生成时间", maxLength = 6)
-	@Schema(description = "数据生成时间")
-	@ExcelProperty("数据生成时间")
+	@Length(max = 6, message = "数据生成月份 不能超过6 个字符")
+	@ExcelAttribute(name = "数据生成月份", maxLength = 6)
+	@Schema(description = "数据生成月份")
+	@ExcelProperty("数据生成月份")
 	private String dataCreateMonth;
 	/**
 	 * 推送状态：0未推送1已推送

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

@@ -532,6 +532,10 @@
 			<if test="tSocialFundInfo.id != null and tSocialFundInfo.id.trim() != ''">
 				AND a.ID = #{tSocialFundInfo.id}
 			</if>
+			<if test="tSocialFundInfo.settleDomainCode != null and tSocialFundInfo.settleDomainCode.trim() != ''">
+				AND a.SETTLE_DOMAIN_CODE = #{tSocialFundInfo.settleDomainCode}
+			</if>
+
 			<if test="tSocialFundInfo.empId != null and tSocialFundInfo.empId.trim() != ''">
 				AND a.EMP_ID = #{tSocialFundInfo.empId}
 			</if>