优化修改

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

@@ -71,13 +71,13 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
 	private String settleDomainName;
 
 	/**
-	 * 社保缴纳地
+	 * 生成月份
 	 */
-	@ExcelAttribute(name = "社保缴纳地" )
-	@Schema(description ="社保缴纳地")
+	@ExcelAttribute(name = "生成月份")
+	@Schema(description ="生成月份")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("社保缴纳地")
-	private String socialPayAddr;
+	@ExcelProperty("生成月份")
+	private String socialCreateMonth;
 
 	/**
 	 * 缴纳月份
@@ -89,13 +89,22 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
 	private String socialPayMonth;
 
 	/**
-	 * 生成月份
+	 * 社保户
 	 */
-	@ExcelAttribute(name = "生成月份")
-	@Schema(description ="生成月份")
+	@ExcelAttribute(name = "社保户" )
+	@Schema(description ="社保户")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("生成月份")
-	private String socialCreateMonth;
+	@ExcelProperty("社保户")
+	private String socialHousehold;
+
+	/**
+	 * 社保缴纳地
+	 */
+	@ExcelAttribute(name = "社保缴纳地" )
+	@Schema(description ="社保缴纳地")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("社保缴纳地")
+	private String socialPayAddr;
 
 	/**
 	 * 养老金额
@@ -147,14 +156,6 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("补缴利息")
 	private BigDecimal accrualSum;
 
-	/**
-	 * 社保户
-	 */
-	@ExcelAttribute(name = "社保户" )
-	@Schema(description ="社保户")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("社保户")
-	private String socialHousehold;
 
 	/**
 	 * 社保合计

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

@@ -1338,10 +1338,6 @@
 		GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
 		)
 		) w
-		<where>
-			1 = 1
-			<include refid="tPaymentInfo_export_socialFund_where"/>
-		</where>
 		GROUP BY w.keyGroup
 	</select>