2 次代碼提交 c38fa8ded5 ... 909e60d2f9

作者 SHA1 備註 提交日期
  guobing 909e60d2f9 Merge remote-tracking branch 'origin/master' 2 周之前
  guobing a082d3601a 省级备选交收库附件问题修改 2 周之前

+ 2 - 1
delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/caxx/CaxxMapper.xml

@@ -87,7 +87,7 @@
87
             ck.LXDH lxdh,
87
             ck.LXDH lxdh,
88
             ifnull(t1.HYRY_NAME, '-') hyry_name,
88
             ifnull(t1.HYRY_NAME, '-') hyry_name,
89
             t1.hy_state,
89
             t1.hy_state,
90
-            t1.file_ids
90
+            dk.file_ids
91
         from DELIVERY_DWXX cd
91
         from DELIVERY_DWXX cd
92
         join DELIVERY_KQXX ck on ck.DWID=cd.id
92
         join DELIVERY_KQXX ck on ck.DWID=cd.id
93
         join
93
         join
@@ -122,6 +122,7 @@
122
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
122
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
123
                    )  cy  on cx.id=cy.CWXX_ID
123
                    )  cy  on cx.id=cy.CWXX_ID
124
         ) t2 on t2.DEPT_ID=cd.id
124
         ) t2 on t2.DEPT_ID=cd.id
125
+        left join DELIVERY_DK dk on dk.KQ_ID = ck.id
125
         <where>
126
         <where>
126
             cd.qyxz!='10' and cd.DELETED=0
127
             cd.qyxz!='10' and cd.DELETED=0
127
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
128
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">