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

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

@@ -50,12 +50,12 @@
         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
+        where hpk.application_id = #{applicationId} and hu.idcard_number = idcardNumber and hdk.order_id = orderId
         ) then 1 ELSE 0 end as "contractStatus"
         FROM
         (
             SELECT
-            a.*, us.id as "usId", hd.idcard_number as "idcardNumber"
+            a.id as "orderId", 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
@@ -107,12 +107,12 @@
         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
+        where hpk.application_id = #{applicationId} and hu.idcard_number = idcardNumber and hdk.order_id = orderId
         ) then 1 ELSE 0 end as "contractStatus"
         FROM
         (
         SELECT
-        a.*, us.id as "usId", hd.idcard_number as "idcardNumber"
+        a.id as "orderId", 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