|
@@ -87,7 +87,7 @@
|
87
|
87
|
ck.LXDH lxdh,
|
88
|
88
|
ifnull(t1.HYRY_NAME, '-') hyry_name,
|
89
|
89
|
t1.hy_state,
|
90
|
|
- t1.file_ids
|
|
90
|
+ dk.file_ids
|
91
|
91
|
from DELIVERY_DWXX cd
|
92
|
92
|
join DELIVERY_KQXX ck on ck.DWID=cd.id
|
93
|
93
|
join
|
|
@@ -122,6 +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.DEPT_ID=cd.id
|
|
125
|
+ left join DELIVERY_DK dk on dk.KQ_ID = ck.id
|
125
|
126
|
<where>
|
126
|
127
|
cd.qyxz!='10' and cd.DELETED=0
|
127
|
128
|
<if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
|