收获年度sql更新

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/basicdata/mapper/WareHouseBasicInfoMapper.xml

@@ -19,7 +19,7 @@
                 t1.hwxz,
                 t1.dj,
                 t1.kcsl,
-                t4.EnumItemName rq,
+                t5.EnumItemName rq,
                 t1.rq AS rcrq,
                 t1.cjsj AS cjsj,
                 t1.UnitID
@@ -27,9 +27,23 @@
             `lsreport_ts`.data_kcgl_kcsw_default AS t1
             LEFT JOIN basic_storehouse t2 ON t1.UnitID = t2.org_id
             AND t1.ch = t2.storehouse_id
-            LEFT JOIN `lsreport_ts`.`data_kcgl_fcbgz_default` t3 ON t2.org_id = t3.UnitID
-            AND t2.storehouse_id = t3.ch
-            LEFT JOIN `lsreport_ts`.`enumitem` t4 ON t3.scnf = t4.EnumItemId
+            LEFT JOIN (
+                SELECT
+                    t4.EnumItemId,
+                    t4.EnumItemName,
+                    MAX(t4.EnumItemName) scnf,
+                    t3.UnitID,
+                    t3.ch,
+                    t3.scnf scnfEnumId
+                FROM
+                `lsreport_ts`.data_kcgl_fcbgz_default t3
+                INNER JOIN `lsreport_ts`.enumitem t4 ON t3.scnf = t4.EnumItemId
+                AND t3.srsl > 0
+                AND t3.UnitID = #{org_id}
+                GROUP BY
+                t3.ch
+            ) t5 ON t2.org_id = t5.UnitID
+            AND t2.storehouse_id = t5.ch
             <where>
                 t2.del_flag = 1
                 <if test="org_id != null">
@@ -42,8 +56,6 @@
                     AND t2.storehouse_code = #{cfCdoe}
                 </if>
             </where>
-            ORDER BY
-              t3.ModifyDate DESC
         ) t
         GROUP BY
           t.storehouse_code