收入优化

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

@@ -144,6 +144,6 @@ public class IncomeExportVo implements Serializable {
 	@ExcelAttribute(name = "推送状态", isDataId = true, readConverterExp = "0=未推送,1=已推送")
 	@Schema(description = "推送状态：0未推送1已推送")
 	@ExcelProperty("推送状态")
-	private String pushStatus;
+	private String sendStatus;
 
 }

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

@@ -42,7 +42,7 @@
 		<result property="payMonth" column="PAY_MONTH"/>
 		<result property="createTime" column="CREATE_TIME"/>
 		<result property="dataCreateMonth" column="DATA_CREATE_MONTH"/>
-		<result property="sendStatus" column="PUSH_STATUS"/>
+		<result property="sendStatus" column="SEND_STATUS"/>
 		<result property="redData" column="RED_DATA"/>
 		<result property="sendStatus" column="SEND_STATUS"/>
 		<result property="sendTime" column="SEND_TIME"/>
@@ -63,7 +63,7 @@
 		<result property="payMonth" column="PAY_MONTH"/>
 		<result property="createTime" column="CREATE_TIME"/>
 		<result property="dataCreateMonth" column="DATA_CREATE_MONTH"/>
-		<result property="pushStatus" column="PUSH_STATUS"/>
+		<result property="sendStatus" column="SEND_STATUS"/>
 	</resultMap>
 	<sql id="Base_Column_List">
 		a.ID,
@@ -145,8 +145,8 @@
 			<if test="tIncome.dataCreateMonth != null and tIncome.dataCreateMonth.trim() != ''">
 				AND a.DATA_CREATE_MONTH = #{tIncome.dataCreateMonth}
 			</if>
-			<if test="tIncome.pushStatus != null and tIncome.pushStatus.trim() != ''">
-				AND a.PUSH_STATUS = #{tIncome.pushStatus}
+			<if test="tIncome.sendStatus != null and tIncome.sendStatus.trim() != ''">
+				AND a.SEND_STATUS = #{tIncome.sendStatus}
 			</if>
 			<if test="tIncome.redData != null and tIncome.redData.trim() != ''">
 				AND a.RED_DATA = #{tIncome.redData}