开心灵工订单列表查询接口-sql调整，针对合同上传与否

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlworder/mapper/xml/HlwOrderMapper.xml

@@ -45,15 +45,23 @@
     <select id="queryOrderList" resultType="org.jeecg.modules.hlworder.entity.HlwOrder">
         SELECT
         t.*,
-        case when count(usId) = (SELECT count(su.id) from hlw_subcontractor su ) then 1 ELSE 0 end as "contractStatus"
+        case when count(DISTINCT usId) = (
+        SELECT count(DISTINCT su.id) from hlw_subcontractor su
+        inner JOIN hlw_payment hpk on hpk.application_id = #{applicationId} and hpk.subcontractor_id = su.id
+        inner join hlw_user hu
+        inner JOIN hlw_payment_detail hdk on hdk.idcard_number = hu.idcard_number and hpk.id = hdk.payment_id
+        where hpk.application_id = #{applicationId} and hu.idcard_number = idcardNumber
+        ) then 1 ELSE 0 end as "contractStatus"
         FROM
         (
             SELECT
-            a.*, us.id as "usId"
+            a.*, us.id as "usId", hd.idcard_number as "idcardNumber"
             FROM hlw_order a
             LEFT JOIN hlw_requirement r ON r.id = a.requirement_id
             LEFT JOIN hlw_company com ON com.id = r.company_id
-            left join hlw_user_subcontractor us on us.order_code = a.order_code
+            LEFT JOIN hlw_payment_detail hd on hd.order_id = a.id
+            LEFT JOIN hlw_payment hp on hd.payment_id = hp.id
+            left join hlw_user_subcontractor us on us.order_code = a.order_code and us.subcontractor_id = hp.subcontractor_id
             <where>
                 1=1
                 and r.application_id = #{applicationId}
@@ -94,15 +102,23 @@
     <select id="queryOrderListNoPage" resultType="org.jeecg.modules.hlworder.entity.HlwOrder">
         SELECT
         t.*,
-        case when count(usId) = (SELECT count(su.id) from hlw_subcontractor su ) then 1 ELSE 0 end as "contractStatus"
+        case when count(DISTINCT usId) = (
+        SELECT count(DISTINCT su.id) from hlw_subcontractor su
+        inner JOIN hlw_payment hpk on hpk.application_id = #{applicationId} and hpk.subcontractor_id = su.id
+        inner join hlw_user hu
+        inner JOIN hlw_payment_detail hdk on hdk.idcard_number = hu.idcard_number and hpk.id = hdk.payment_id
+        where hpk.application_id = #{applicationId} and hu.idcard_number = idcardNumber
+        ) then 1 ELSE 0 end as "contractStatus"
         FROM
         (
         SELECT
-        a.*, us.id as "usId"
+        a.*, us.id as "usId", hd.idcard_number as "idcardNumber"
         FROM hlw_order a
         LEFT JOIN hlw_requirement r ON r.id = a.requirement_id
         LEFT JOIN hlw_company com ON com.id = r.company_id
-        left join hlw_user_subcontractor us on us.order_code = a.order_code
+        LEFT JOIN hlw_payment_detail hd on hd.order_id = a.id
+        LEFT JOIN hlw_payment hp on hd.payment_id = hp.id
+        left join hlw_user_subcontractor us on us.order_code = a.order_code and us.subcontractor_id = hp.subcontractor_id
         <where>
             1=1
             and r.application_id = #{applicationId}