|
@@ -122,7 +122,7 @@
|
122
|
122
|
ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
|
123
|
123
|
) cy on cx.id=cy.CWXX_ID
|
124
|
124
|
) t2 on t2.KQID=ck.id
|
125
|
|
- left join DELIVERY_DK dk on dk.KQ_ID = ck.id AND dk.DK_TYPE=1
|
|
125
|
+ left join DELIVERY_DK dk on dk.KQ_ID = ck.id AND dk.DK_TYPE = 1
|
126
|
126
|
<where>
|
127
|
127
|
cd.qyxz!='10' and cd.DELETED=0
|
128
|
128
|
<if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
|
|
@@ -159,7 +159,8 @@
|
159
|
159
|
ck.LXDH lxdh,
|
160
|
160
|
ifnull(t1.HYRY_NAME, '-') hyry_name,
|
161
|
161
|
t1.hy_state,
|
162
|
|
- t1.rdyh_name
|
|
162
|
+ t1.rdyh_name,
|
|
163
|
+ dk.PZXX file_ids
|
163
|
164
|
from DELIVERY_DWXX cd
|
164
|
165
|
join DELIVERY_KQXX ck on ck.DWID=cd.id
|
165
|
166
|
join
|
|
@@ -175,6 +176,7 @@
|
175
|
176
|
group by KQ_ID
|
176
|
177
|
having count(CA_ID)>0
|
177
|
178
|
) t1 on t1.KQ_ID=ck.id
|
|
179
|
+ left join DELIVERY_DK dk on dk.KQ_ID = ck.id AND dk.DK_TYPE = 2
|
178
|
180
|
<where>
|
179
|
181
|
cd.qyxz!='10' and cd.DELETED=0
|
180
|
182
|
<if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
|