Merge remote-tracking branch 'origin/master'

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwinvoice/mapper/xml/HlwDutyApplyMapper.xml

@@ -6,7 +6,7 @@
 		a.id AS "id",
 		a.duty_paid_id AS "dutyPaidId",
 		a.amount AS "amount",
-		a.apply_time AS "applyTime",
+		pd.payment_result_time AS "applyTime",
 		a.apply_by AS "applyBy",
 		app.application_name AS "applicationName",
 		pay.payment_code AS "paymentCode",
@@ -131,18 +131,19 @@
 		WHERE id = #{id}
 	</update>
 
+    <!--新版-->
 	<select id="findApplyList" resultType="org.jeecg.modules.hlwinvoice.entity.HlwDutyApply" >
 		SELECT
 		t.*
 		FROM
 		(
 			SELECT
-				DATE_FORMAT(a.apply_time,'%Y-%m') AS "applyMonth",
-				sum(a.amount) AS "sumAmount",
-				a.id AS "id",
-				a.duty_paid_id AS "dutyPaidId",
-				a.apply_time AS "applyTime",
-				a.apply_by AS "applyBy",
+				DATE_FORMAT(a.payment_result_time,'%Y-%m') AS "applyMonth",
+				sum(a.net_payment) AS "sumAmount",
+				hda.id AS "id",
+				hda.duty_paid_id AS "dutyPaidId",
+				a.payment_result_time AS "applyTime",
+				a.create_by AS "applyBy",
 				app.application_name AS "applicationName",
 				pay.payment_code AS "paymentCode",
 				com.company_name AS "companyName",
@@ -156,45 +157,46 @@
 		   		hdp.tax_payment_receipt AS "taxPaymentReceipt",
                 hdp.upload_time AS "uploadTime"
 			FROM
-				hlw_duty_apply a
-			LEFT JOIN (SELECT payment_id,duty_apply_id from hlw_payment_detail group by duty_apply_id) as pd ON pd.duty_apply_id = a.id
-			LEFT JOIN hlw_payment pay ON pay.id = pd.payment_id
+              hlw_payment_detail a
+            LEFT JOIN hlw_duty_apply hda ON hda.id = a.duty_apply_id
+			LEFT JOIN hlw_payment pay ON pay.id = a.payment_id
 			LEFT JOIN hlw_application_setting app ON app.id = pay.application_id
 			LEFT JOIN hlw_subcontractor sub ON sub.id = pay.subcontractor_id
 			LEFT JOIN hlw_company com ON com.id = pay.company_id
 			LEFT JOIN hlw_cp_setting cs ON cs.id = pay.cp_id
-			LEFT JOIN hlw_duty_paid hdp ON hdp.id = a.duty_paid_id
+			LEFT JOIN hlw_duty_paid hdp ON hdp.id = hda.duty_paid_id
 			<where>
 				${ew.sqlSegment}
 				and pay.cp_id IS NULL
+                AND a.duty_apply_id IS NOT NULL
 				<if test="hlwDutyApply.applyMonth != null and hlwDutyApply.applyMonth != ''">
-					and DATE_FORMAT(a.apply_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
+					and DATE_FORMAT(a.payment_result_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
 				</if>
 				<if test="hlwDutyApply.subcontractorName != null and hlwDutyApply.subcontractorName != ''">
 					and sub.name like concat(concat('%',#{hlwDutyApply.subcontractorName}),'%')
 				</if>
 				<if test="hlwDutyApply.dutyStatus != null">
 					<if test="hlwDutyApply.dutyStatus == 0">
-						and a.duty_paid_id is null
+						and hda.duty_paid_id is null
 					</if>
 					<if test="hlwDutyApply.dutyStatus == 1">
-						and a.duty_paid_id is not null
+						and hda.duty_paid_id is not null
 					</if>
 				</if>
 			</where>
 			GROUP BY
-				EXTRACT(YEAR_MONTH FROM a.apply_time),
+				EXTRACT(YEAR_MONTH FROM a.payment_result_time),
 				pay.company_id,
 				pay.subcontractor_id,
 				pay.application_id
 			UNION ALL
 			SELECT
-				DATE_FORMAT(a.apply_time,'%Y-%m') AS "applyMonth",
-				sum(a.amount) AS "sumAmount",
-				a.id AS "id",
-				a.duty_paid_id AS "dutyPaidId",
-				a.apply_time AS "applyTime",
-				a.apply_by AS "applyBy",
+				DATE_FORMAT(a.payment_result_time,'%Y-%m') AS "applyMonth",
+				sum(a.net_payment) AS "sumAmount",
+				hda.id AS "id",
+				hda.duty_paid_id AS "dutyPaidId",
+				a.payment_result_time AS "applyTime",
+				a.create_by AS "applyBy",
 				app.application_name AS "applicationName",
 				pay.payment_code AS "paymentCode",
 				com.company_name AS "companyName",
@@ -208,34 +210,35 @@
 				hdp.tax_payment_receipt AS "taxPaymentReceipt",
                 hdp.upload_time AS "uploadTime"
 			FROM
-				hlw_duty_apply a
-			LEFT JOIN (SELECT payment_id,duty_apply_id from hlw_payment_detail group by duty_apply_id) as pd ON pd.duty_apply_id = a.id
-			LEFT JOIN hlw_payment pay ON pay.id = pd.payment_id
+              hlw_payment_detail a
+            LEFT JOIN hlw_duty_apply hda ON hda.id = a.duty_apply_id
+			LEFT JOIN hlw_payment pay ON pay.id = a.payment_id
 			LEFT JOIN hlw_application_setting app ON app.id = pay.application_id
 			LEFT JOIN hlw_subcontractor sub ON sub.id = pay.subcontractor_id
 			LEFT JOIN hlw_company com ON com.id = pay.company_id
 			LEFT JOIN hlw_cp_setting cs ON cs.id = pay.cp_id
-			LEFT JOIN hlw_duty_paid hdp ON hdp.id = a.duty_paid_id
+			LEFT JOIN hlw_duty_paid hdp ON hdp.id = hda.duty_paid_id
 			<where>
 				${ew.sqlSegment}
 				and pay.cp_id IS NOT NULL
+                AND a.duty_apply_id IS NOT NULL
 				<if test="hlwDutyApply.applyMonth != null and hlwDutyApply.applyMonth != ''">
-					and DATE_FORMAT(a.apply_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
+					and DATE_FORMAT(a.payment_result_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
 				</if>
 				<if test="hlwDutyApply.subcontractorName != null and hlwDutyApply.subcontractorName != ''">
 					and sub.name like concat(concat('%',#{hlwDutyApply.subcontractorName}),'%')
 				</if>
 				<if test="hlwDutyApply.dutyStatus != null">
 					<if test="hlwDutyApply.dutyStatus == 0">
-						and a.duty_paid_id is null
+						and hda.duty_paid_id is null
 					</if>
 					<if test="hlwDutyApply.dutyStatus == 1">
-						and a.duty_paid_id is not null
+						and hda.duty_paid_id is not null
 					</if>
 				</if>
 			</where>
 			GROUP BY
-				EXTRACT(YEAR_MONTH FROM a.apply_time),
+				EXTRACT(YEAR_MONTH FROM a.payment_result_time),
 				pay.company_id,
 				pay.subcontractor_id,
 				pay.application_id,
@@ -246,24 +249,23 @@
 
 	<select id="findDutyApplyUser" resultType="org.jeecg.modules.hlwpayment.entity.HlwPaymentDetail">
 		SELECT
-		a.id AS "id",
-		a.user_name AS "userName",
-		a.phone AS "phone",
-		a.idcard_number AS "idcardNumber",
-		a.card_number AS "cardNumber",
-		a.bnkflg AS "bnkflg",
-		a.eacbnk AS "eacbnk",
-		a.rcveaa AS "rcveaa",
-		a.net_payment AS "netPayment"
+            a.id AS "id",
+            a.user_name AS "userName",
+            a.phone AS "phone",
+            a.idcard_number AS "idcardNumber",
+            a.card_number AS "cardNumber",
+            a.bnkflg AS "bnkflg",
+            a.eacbnk AS "eacbnk",
+            a.rcveaa AS "rcveaa",
+            a.net_payment AS "netPayment"
 		FROM hlw_payment_detail a
-		LEFT JOIN hlw_duty_apply hda ON hda.id = a.duty_apply_id
 		LEFT JOIN hlw_payment pay ON pay.id = a.payment_id
 		LEFT JOIN hlw_application_setting app ON app.id = pay.application_id
 		LEFT JOIN hlw_subcontractor sub ON sub.id = pay.subcontractor_id
 		LEFT JOIN hlw_company com ON com.id = pay.company_id
 		<where>
 			<if test="hlwDutyApply.applyMonth != null and hlwDutyApply.applyMonth != ''">
-				and DATE_FORMAT(hda.apply_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
+				and DATE_FORMAT(a.payment_result_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
 			</if>
 			<if test="hlwDutyApply.companyId != null">
 				and pay.company_id = #{hlwDutyApply.companyId}
@@ -288,38 +290,39 @@
 		t.*
 		FROM
 		(
-		SELECT
-		DATE_FORMAT(a.apply_time,'%Y-%m') AS "applyMonth",
-		sum(a.amount) AS "sumAmount",
-		a.id AS "id",
-		a.duty_paid_id AS "dutyPaidId",
-		a.apply_time AS "applyTime",
-		a.apply_by AS "applyBy",
-		app.application_name AS "applicationName",
-		pay.payment_code AS "paymentCode",
-		com.company_name AS "companyName",
-		pay.is_through_platform AS "isThroughPlatform",
-		sub.name AS "subcontractorName",
-		com.id AS "companyId",
-		sub.id AS "subcontractorId",
-		cs.cp_name AS "cpName",
-		pay.cp_id AS "cpId",
-		pay.application_id AS "applicationId",
-		hdp.tax_payment_receipt AS "taxPaymentReceipt",
-		hdp.upload_time AS "uploadTime"
-		FROM
-		hlw_duty_apply a
-		LEFT JOIN (SELECT payment_id,duty_apply_id from hlw_payment_detail group by duty_apply_id) as pd ON pd.duty_apply_id = a.id
-		LEFT JOIN hlw_payment pay ON pay.id = pd.payment_id
-		LEFT JOIN hlw_application_setting app ON app.id = pay.application_id
-		LEFT JOIN hlw_subcontractor sub ON sub.id = pay.subcontractor_id
-		LEFT JOIN hlw_company com ON com.id = pay.company_id
-		LEFT JOIN hlw_cp_setting cs ON cs.id = pay.cp_id
-		LEFT JOIN hlw_duty_paid hdp ON hdp.id = a.duty_paid_id
+        SELECT
+            DATE_FORMAT(a.payment_result_time,'%Y-%m') AS "applyMonth",
+            sum(a.net_payment) AS "sumAmount",
+            hda.id AS "id",
+			hda.duty_paid_id AS "dutyPaidId",
+            a.payment_result_time AS "applyTime",
+            a.create_by AS "applyBy",
+            app.application_name AS "applicationName",
+            pay.payment_code AS "paymentCode",
+            com.company_name AS "companyName",
+            pay.is_through_platform AS "isThroughPlatform",
+            sub.name AS "subcontractorName",
+            com.id AS "companyId",
+            sub.id AS "subcontractorId",
+            cs.cp_name AS "cpName",
+            pay.cp_id AS "cpId",
+            pay.application_id AS "applicationId",
+            hdp.tax_payment_receipt AS "taxPaymentReceipt",
+            hdp.upload_time AS "uploadTime"
+        FROM
+        hlw_payment_detail a
+        LEFT JOIN hlw_duty_apply hda ON hda.id = a.duty_apply_id
+        LEFT JOIN hlw_payment pay ON pay.id = a.payment_id
+        LEFT JOIN hlw_application_setting app ON app.id = pay.application_id
+        LEFT JOIN hlw_subcontractor sub ON sub.id = pay.subcontractor_id
+        LEFT JOIN hlw_company com ON com.id = pay.company_id
+        LEFT JOIN hlw_cp_setting cs ON cs.id = pay.cp_id
+        LEFT JOIN hlw_duty_paid hdp ON hdp.id = hda.duty_paid_id
 		<where>
 			pay.cp_id IS NULL
+            AND a.duty_apply_id IS NOT NULL
 			<if test="hlwDutyApply.applyMonth != null and hlwDutyApply.applyMonth != ''">
-				and DATE_FORMAT(a.apply_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
+				and DATE_FORMAT(a.payment_result_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
 			</if>
 			<if test="hlwDutyApply.companyId != null">
 				and pay.company_id = #{hlwDutyApply.companyId}
@@ -335,43 +338,44 @@
 			</if>
 		</where>
 		GROUP BY
-		EXTRACT(YEAR_MONTH FROM a.apply_time),
-		pay.company_id,
-		pay.subcontractor_id,
-		pay.application_id
+            EXTRACT(YEAR_MONTH FROM a.payment_result_time),
+            pay.company_id,
+            pay.subcontractor_id,
+            pay.application_id
 		UNION ALL
-		SELECT
-		DATE_FORMAT(a.apply_time,'%Y-%m') AS "applyMonth",
-		sum(a.amount) AS "sumAmount",
-		a.id AS "id",
-		a.duty_paid_id AS "dutyPaidId",
-		a.apply_time AS "applyTime",
-		a.apply_by AS "applyBy",
-		app.application_name AS "applicationName",
-		pay.payment_code AS "paymentCode",
-		com.company_name AS "companyName",
-		pay.is_through_platform AS "isThroughPlatform",
-		sub.name AS "subcontractorName",
-		com.id AS "companyId",
-		sub.id AS "subcontractorId",
-		cs.cp_name AS "cpName",
-		pay.cp_id AS "cpId",
-		pay.application_id AS "applicationId",
-		hdp.tax_payment_receipt AS "taxPaymentReceipt",
-		hdp.upload_time AS "uploadTime"
-		FROM
-		hlw_duty_apply a
-		LEFT JOIN (SELECT payment_id,duty_apply_id from hlw_payment_detail group by duty_apply_id) as pd ON pd.duty_apply_id = a.id
-		LEFT JOIN hlw_payment pay ON pay.id = pd.payment_id
-		LEFT JOIN hlw_application_setting app ON app.id = pay.application_id
-		LEFT JOIN hlw_subcontractor sub ON sub.id = pay.subcontractor_id
-		LEFT JOIN hlw_company com ON com.id = pay.company_id
-		LEFT JOIN hlw_cp_setting cs ON cs.id = pay.cp_id
-		LEFT JOIN hlw_duty_paid hdp ON hdp.id = a.duty_paid_id
+        SELECT
+            DATE_FORMAT(a.payment_result_time,'%Y-%m') AS "applyMonth",
+            sum(a.net_payment) AS "sumAmount",
+            hda.id AS "id",
+			hda.duty_paid_id AS "dutyPaidId",
+            a.payment_result_time AS "applyTime",
+            a.create_by AS "applyBy",
+            app.application_name AS "applicationName",
+            pay.payment_code AS "paymentCode",
+            com.company_name AS "companyName",
+            pay.is_through_platform AS "isThroughPlatform",
+            sub.name AS "subcontractorName",
+            com.id AS "companyId",
+            sub.id AS "subcontractorId",
+            cs.cp_name AS "cpName",
+            pay.cp_id AS "cpId",
+            pay.application_id AS "applicationId",
+            hdp.tax_payment_receipt AS "taxPaymentReceipt",
+            hdp.upload_time AS "uploadTime"
+        FROM
+        	hlw_payment_detail a
+        LEFT JOIN hlw_duty_apply hda ON hda.id = a.duty_apply_id
+        LEFT JOIN hlw_payment pay ON pay.id = a.payment_id
+        LEFT JOIN hlw_application_setting app ON app.id = pay.application_id
+        LEFT JOIN hlw_subcontractor sub ON sub.id = pay.subcontractor_id
+        LEFT JOIN hlw_company com ON com.id = pay.company_id
+        LEFT JOIN hlw_cp_setting cs ON cs.id = pay.cp_id
+        LEFT JOIN hlw_duty_paid hdp ON hdp.id = hda.duty_paid_id
 		<where>
 			pay.cp_id IS NOT NULL
+            AND a.duty_apply_id IS NOT NULL
 			<if test="hlwDutyApply.applyMonth != null and hlwDutyApply.applyMonth != ''">
-				and DATE_FORMAT(a.apply_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
+				and DATE_FORMAT(a.payment_result_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
 			</if>
 			<if test="hlwDutyApply.companyId != null">
 				and pay.company_id = #{hlwDutyApply.companyId}
@@ -387,11 +391,11 @@
 			</if>
 		</where>
 		GROUP BY
-		EXTRACT(YEAR_MONTH FROM a.apply_time),
-		pay.company_id,
-		pay.subcontractor_id,
-		pay.application_id,
-		pay.cp_id
+            EXTRACT(YEAR_MONTH FROM a.payment_result_time),
+            pay.company_id,
+            pay.subcontractor_id,
+            pay.application_id,
+            pay.cp_id
 		) t
 		ORDER BY t.applyTime DESC, t.id ASC
 	</select>
@@ -400,11 +404,10 @@
 		SELECT
 		a.duty_apply_id AS "id"
 		FROM hlw_payment_detail a
-		LEFT JOIN hlw_duty_apply hda ON hda.id = a.duty_apply_id
 		LEFT JOIN hlw_payment pay ON pay.id = a.payment_id
 		<where>
 			<if test="hlwDutyApply.applyMonth != null and hlwDutyApply.applyMonth != ''">
-				and DATE_FORMAT(hda.apply_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
+				and DATE_FORMAT(a.payment_result_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
 			</if>
 			<if test="hlwDutyApply.companyId != null">
 				and pay.company_id = #{hlwDutyApply.companyId}
@@ -429,33 +432,33 @@
         FROM
         (
         SELECT
-        DATE_FORMAT(a.apply_time,'%Y-%m') AS "applyMonth",
-        sum(a.amount) AS "sumAmount",
-        a.id AS "id",
-        a.duty_paid_id AS "dutyPaidId",
-        a.apply_time AS "applyTime",
-        a.apply_by AS "applyBy",
-        app.application_name AS "applicationName",
-        pay.payment_code AS "paymentCode",
-        com.company_name AS "companyName",
-        pay.is_through_platform AS "isThroughPlatform",
-        sub.name AS "subcontractorName",
-        com.id AS "companyId",
-        sub.id AS "subcontractorId",
-        cs.cp_name AS "cpName",
-        pay.cp_id AS "cpId",
-        pay.application_id AS "applicationId",
-        hdp.tax_payment_receipt AS "taxPaymentReceipt",
-        hdp.upload_time AS "uploadTime"
+            DATE_FORMAT(a.payment_result_time,'%Y-%m') AS "applyMonth",
+            sum(a.net_payment) AS "sumAmount",
+            hda.id AS "id",
+			hda.duty_paid_id AS "dutyPaidId",
+            a.payment_result_time AS "applyTime",
+            a.create_by AS "applyBy",
+            app.application_name AS "applicationName",
+            pay.payment_code AS "paymentCode",
+            com.company_name AS "companyName",
+            pay.is_through_platform AS "isThroughPlatform",
+            sub.name AS "subcontractorName",
+            com.id AS "companyId",
+            sub.id AS "subcontractorId",
+            cs.cp_name AS "cpName",
+            pay.cp_id AS "cpId",
+            pay.application_id AS "applicationId",
+            hdp.tax_payment_receipt AS "taxPaymentReceipt",
+            hdp.upload_time AS "uploadTime"
         FROM
-        hlw_duty_apply a
-        LEFT JOIN (SELECT payment_id,duty_apply_id from hlw_payment_detail group by duty_apply_id) as pd ON pd.duty_apply_id = a.id
-        LEFT JOIN hlw_payment pay ON pay.id = pd.payment_id
+          hlw_payment_detail a
+        LEFT JOIN hlw_duty_apply hda ON hda.id = a.duty_apply_id
+        LEFT JOIN hlw_payment pay ON pay.id = a.payment_id
         LEFT JOIN hlw_application_setting app ON app.id = pay.application_id
         LEFT JOIN hlw_subcontractor sub ON sub.id = pay.subcontractor_id
         LEFT JOIN hlw_company com ON com.id = pay.company_id
         LEFT JOIN hlw_cp_setting cs ON cs.id = pay.cp_id
-        LEFT JOIN hlw_duty_paid hdp ON hdp.id = a.duty_paid_id
+        LEFT JOIN hlw_duty_paid hdp ON hdp.id = hda.duty_paid_id
         <where>
             pay.application_id = #{applicationId}
             <if test="companyCodeList != null and companyCodeList.size() != 0">
@@ -465,55 +468,56 @@
                 </foreach>
             </if>
             and pay.cp_id IS NULL
+            AND a.duty_apply_id IS NOT NULL
             <if test="hlwDutyApply.applyMonth != null and hlwDutyApply.applyMonth != ''">
-                and DATE_FORMAT(a.apply_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
+                and DATE_FORMAT(a.payment_result_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
             </if>
             <if test="hlwDutyApply.subcontractorName != null and hlwDutyApply.subcontractorName != ''">
                 and sub.name like concat(concat('%',#{hlwDutyApply.subcontractorName}),'%')
             </if>
             <if test="hlwDutyApply.dutyStatus != null">
                 <if test="hlwDutyApply.dutyStatus == 0">
-                    and a.duty_paid_id is null
+                    and hda.duty_paid_id is null
                 </if>
                 <if test="hlwDutyApply.dutyStatus == 1">
-                    and a.duty_paid_id is not null
+                    and hda.duty_paid_id is not null
                 </if>
             </if>
         </where>
         GROUP BY
-        EXTRACT(YEAR_MONTH FROM a.apply_time),
-        pay.company_id,
-        pay.subcontractor_id,
-        pay.application_id
+            EXTRACT(YEAR_MONTH FROM a.payment_result_time),
+            pay.company_id,
+            pay.subcontractor_id,
+            pay.application_id
         UNION ALL
         SELECT
-        DATE_FORMAT(a.apply_time,'%Y-%m') AS "applyMonth",
-        sum(a.amount) AS "sumAmount",
-        a.id AS "id",
-        a.duty_paid_id AS "dutyPaidId",
-        a.apply_time AS "applyTime",
-        a.apply_by AS "applyBy",
-        app.application_name AS "applicationName",
-        pay.payment_code AS "paymentCode",
-        com.company_name AS "companyName",
-        pay.is_through_platform AS "isThroughPlatform",
-        sub.name AS "subcontractorName",
-        com.id AS "companyId",
-        sub.id AS "subcontractorId",
-        cs.cp_name AS "cpName",
-        pay.cp_id AS "cpId",
-        pay.application_id AS "applicationId",
-        hdp.tax_payment_receipt AS "taxPaymentReceipt",
-        hdp.upload_time AS "uploadTime"
+            DATE_FORMAT(a.payment_result_time,'%Y-%m') AS "applyMonth",
+            sum(a.net_payment) AS "sumAmount",
+            hda.id AS "id",
+			hda.duty_paid_id AS "dutyPaidId",
+            a.payment_result_time AS "applyTime",
+            a.create_by AS "applyBy",
+            app.application_name AS "applicationName",
+            pay.payment_code AS "paymentCode",
+            com.company_name AS "companyName",
+            pay.is_through_platform AS "isThroughPlatform",
+            sub.name AS "subcontractorName",
+            com.id AS "companyId",
+            sub.id AS "subcontractorId",
+            cs.cp_name AS "cpName",
+            pay.cp_id AS "cpId",
+            pay.application_id AS "applicationId",
+            hdp.tax_payment_receipt AS "taxPaymentReceipt",
+            hdp.upload_time AS "uploadTime"
         FROM
-        hlw_duty_apply a
-        LEFT JOIN (SELECT payment_id,duty_apply_id from hlw_payment_detail group by duty_apply_id) as pd ON pd.duty_apply_id = a.id
-        LEFT JOIN hlw_payment pay ON pay.id = pd.payment_id
+          hlw_payment_detail a
+        LEFT JOIN hlw_duty_apply hda ON hda.id = a.duty_apply_id
+        LEFT JOIN hlw_payment pay ON pay.id = a.payment_id
         LEFT JOIN hlw_application_setting app ON app.id = pay.application_id
         LEFT JOIN hlw_subcontractor sub ON sub.id = pay.subcontractor_id
         LEFT JOIN hlw_company com ON com.id = pay.company_id
         LEFT JOIN hlw_cp_setting cs ON cs.id = pay.cp_id
-        LEFT JOIN hlw_duty_paid hdp ON hdp.id = a.duty_paid_id
+        LEFT JOIN hlw_duty_paid hdp ON hdp.id = hda.duty_paid_id
         <where>
             pay.application_id = #{applicationId}
             <if test="companyCodeList != null and companyCodeList.size() != 0">
@@ -523,51 +527,51 @@
                 </foreach>
             </if>
             and pay.cp_id IS NOT NULL
+            AND a.duty_apply_id IS NOT NULL
             <if test="hlwDutyApply.applyMonth != null and hlwDutyApply.applyMonth != ''">
-                and DATE_FORMAT(a.apply_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
+                and DATE_FORMAT(a.payment_result_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
             </if>
             <if test="hlwDutyApply.subcontractorName != null and hlwDutyApply.subcontractorName != ''">
                 and sub.name like concat(concat('%',#{hlwDutyApply.subcontractorName}),'%')
             </if>
             <if test="hlwDutyApply.dutyStatus != null">
                 <if test="hlwDutyApply.dutyStatus == 0">
-                    and a.duty_paid_id is null
+                    and hda.duty_paid_id is null
                 </if>
                 <if test="hlwDutyApply.dutyStatus == 1">
-                    and a.duty_paid_id is not null
+                    and hda.duty_paid_id is not null
                 </if>
             </if>
         </where>
         GROUP BY
-        EXTRACT(YEAR_MONTH FROM a.apply_time),
-        pay.company_id,
-        pay.subcontractor_id,
-        pay.application_id,
-        pay.cp_id
+            EXTRACT(YEAR_MONTH FROM a.payment_result_time),
+            pay.company_id,
+            pay.subcontractor_id,
+            pay.application_id,
+            pay.cp_id
         ) t
         ORDER BY t.applyTime DESC, t.id ASC
     </select>
 
     <select id="findDutyUserApiList" resultType="org.jeecg.modules.hlwpayment.entity.HlwPaymentDetail">
         SELECT
-        a.id AS "id",
-        a.user_name AS "userName",
-        a.phone AS "phone",
-        a.idcard_number AS "idcardNumber",
-        a.card_number AS "cardNumber",
-        a.bnkflg AS "bnkflg",
-        a.eacbnk AS "eacbnk",
-        a.rcveaa AS "rcveaa",
-        a.net_payment AS "netPayment"
+            a.id AS "id",
+            a.user_name AS "userName",
+            a.phone AS "phone",
+            a.idcard_number AS "idcardNumber",
+            a.card_number AS "cardNumber",
+            a.bnkflg AS "bnkflg",
+            a.eacbnk AS "eacbnk",
+            a.rcveaa AS "rcveaa",
+            a.net_payment AS "netPayment"
         FROM hlw_payment_detail a
-        LEFT JOIN hlw_duty_apply hda ON hda.id = a.duty_apply_id
         LEFT JOIN hlw_payment pay ON pay.id = a.payment_id
         LEFT JOIN hlw_application_setting app ON app.id = pay.application_id
         LEFT JOIN hlw_subcontractor sub ON sub.id = pay.subcontractor_id
         LEFT JOIN hlw_company com ON com.id = pay.company_id
         <where>
             <if test="hlwDutyApply.applyMonth != null and hlwDutyApply.applyMonth != ''">
-                and DATE_FORMAT(hda.apply_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
+                and DATE_FORMAT(a.payment_result_time, '%Y%m') = DATE_FORMAT(#{hlwDutyApply.applyMonth}, '%Y%m')
             </if>
             <if test="hlwDutyApply.companyId != null">
                 and pay.company_id = #{hlwDutyApply.companyId}