派单查询接口修改

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

@@ -118,12 +118,6 @@
 		<result property="providentCreateMonth" column="PROVIDENT_CREATE_MONTH"/>
 		<result property="providentHousehold" column="PROVIDENT_HOUSEHOLD"/>
 		<result property="providentPayAddr" column="PROVIDENT_PAY_ADDR"/>
-		<result property="fundProvince" column="FUND_PROVINCE"/>
-		<result property="fundCity" column="FUND_CITY"/>
-		<result property="fundTown" column="FUND_TOWN"/>
-		<result property="socialProvince" column="SOCIAL_PROVINCE"/>
-		<result property="socialCity" column="SOCIAL_CITY"/>
-		<result property="socialTown" column="SOCIAL_TOWN"/>
 		<result property="socialSum" column="SOCIAL_SUM"/>
 		<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
 		<result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/>
@@ -604,9 +598,6 @@
 		<result property="personalMedicalMoney" column="PERSONAL_MEDICAL_MONEY"/>
 		<result property="personalUnemploymentMoney" column="PERSONAL_UNEMPLOYMENT_MONEY"/>
 		<result property="personalBigmailmentMoney" column="PERSONAL_BIGMAILMENT_MONEY"/>
-		<result property="socialSum" column="SOCIAL_SUM"/>
-		<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
-		<result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/>
 		<result property="socialProvince" column="SOCIAL_PROVINCE"/>
 		<result property="socialCity" column="SOCIAL_CITY"/>
 		<result property="socialTown" column="SOCIAL_TOWN"/>
@@ -622,7 +613,6 @@
 		<result property="unitProvidentSum" column="UNIT_PROVIDENT_SUM"/>
 		<result property="personalProidentSet" column="PERSONAL_PROIDENT_SET"/>
 		<result property="personalProvidentSum" column="PERSONAL_PROVIDENT_SUM"/>
-		<result property="providentSum" column="PROVIDENT_SUM"/>
 		<result property="fundProvince" column="FUND_PROVINCE"/>
 		<result property="fundCity" column="FUND_CITY"/>
 		<result property="fundTown" column="FUND_TOWN"/>
@@ -663,9 +653,52 @@
 	</select>
 
 	<!--tPaymentInfo不分页查询-->
-	<select id="getTPaymentInfoNoPage" resultMap="tPaymentInfoMap">
+	<select id="getTPaymentInfoNoPage" resultMap="tPaymentInfoMap" resultType="com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo">
 		SELECT
-		<include refid="Base_Column_List"/>
+		a.EMP_NAME,
+		a.EMP_NO,
+		a.EMP_IDCARD,
+		a.UNIT_NAME,
+		a.SETTLE_DOMAIN_NAME,
+		a.SOCIAL_HOUSEHOLD,
+		a.SOCIAL_SECURITY_NO,
+		a.SOCIAL_PAY_MONTH,
+		a.SOCIAL_CREATE_MONTH,
+		a.SUM_ALL,
+		a.PROVIDENT_PAY_MONTH,
+		a.PROVIDENT_CREATE_MONTH,
+		a.PROVIDENT_HOUSEHOLD,
+		a.SOCIAL_SUM,
+		a.UNIT_SOCIAL_SUM,
+		a.SOCIAL_PAY_ADDR,
+		a.SOCIAL_SECURITY_PERSONAL_SUM,
+		a.PROVIDENT_SUM,
+		a.INAUGURAL_TEAM,
+		a.COMPANY_ACCRUAL,
+		a.PERSONAL_ACCRUAL,
+		a.UNIT_PENSION_SET,
+		a.UNIT_MEDICAL_SET,
+		a.UNIT_UNEMPLOYMENT_SET,
+		a.UNIT_INJURY_SET,
+		a.UNIT_BIRTH_SET,
+		a.PROVIDENT_PAY_ADDR,
+		a.UNIT_PENSION_MONEY,
+		a.UNIT_MEDICAL_MONEY,
+		a.UNIT_UNEMPLOYMENT_MONEY,
+		a.UNIT_INJURY_MONEY,
+		a.UNIT_BIRTH_MONEY,
+		a.UNIT_BIGMAILMENT_MONEY,
+		a.PERSONAL_PENSION_MONEY,
+		a.PERSONAL_MEDICAL_MONEY,
+		a.PERSONAL_UNEMPLOYMENT_MONEY,
+		a.PERSONAL_BIGMAILMENT_MONEY,
+		a.PROVIDENT_NO,
+		a.UNIT_PROVIDENT_SET,
+		a.PROVIDENT_PERCENT,
+		a.UNIT_PROVIDENT_SUM,
+		a.PERSONAL_PROIDENT_SET,
+		a.PERSONAL_PROVIDENT_SUM,
+		a.CREATE_TIME
 		FROM t_payment_info a
 		<where>
 			1=1
@@ -707,12 +740,6 @@
 		MAX( w.PROVIDENT_CREATE_MONTH ) AS PROVIDENT_CREATE_MONTH,
 		MAX( w.PROVIDENT_HOUSEHOLD ) AS PROVIDENT_HOUSEHOLD,
 		MAX( w.PROVIDENT_PAY_ADDR ) AS PROVIDENT_PAY_ADDR,
-		MAX( w.FUND_PROVINCE ) AS FUND_PROVINCE,
-		MAX( w.FUND_CITY ) AS FUND_CITY,
-		MAX( w.FUND_TOWN ) AS FUND_TOWN,
-		w.SOCIAL_PROVINCE,
-		w.SOCIAL_CITY,
-		w.SOCIAL_TOWN,
 		w.SOCIAL_SUM,
 		w.UNIT_SOCIAL_SUM,
 		w.SOCIAL_SECURITY_PERSONAL_SUM,
@@ -764,12 +791,6 @@
 		a.PROVIDENT_CREATE_MONTH,
 		a.PROVIDENT_HOUSEHOLD,
 		a.PROVIDENT_PAY_ADDR,
-		a.FUND_PROVINCE,
-		a.FUND_CITY,
-		a.FUND_TOWN,
-		a.SOCIAL_PROVINCE,
-		a.SOCIAL_CITY,
-		a.SOCIAL_TOWN,
 		SUM( a.SOCIAL_SUM ) AS SOCIAL_SUM,
 		SUM( a.UNIT_SOCIAL_SUM ) AS UNIT_SOCIAL_SUM,
 		SUM( a.SOCIAL_SECURITY_PERSONAL_SUM ) AS SOCIAL_SECURITY_PERSONAL_SUM,
@@ -828,12 +849,6 @@
 		a.PROVIDENT_CREATE_MONTH,
 		a.PROVIDENT_HOUSEHOLD,
 		a.PROVIDENT_PAY_ADDR,
-		a.FUND_PROVINCE,
-		a.FUND_CITY,
-		a.FUND_TOWN,
-		a.SOCIAL_PROVINCE,
-		a.SOCIAL_CITY,
-		a.SOCIAL_TOWN,
 		a.SOCIAL_SUM,
 		a.UNIT_SOCIAL_SUM,
 		a.SOCIAL_SECURITY_PERSONAL_SUM,