生产年度sql修改

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

@@ -2,39 +2,63 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.chinaitop.depot.intelligent.basicdata.mapper.WareHouseBasicInfoMapper" >
     <select id="getStorehouseInfo" parameterType="java.util.Map" resultType="java.util.Map">
-      SELECT
-        t2.storehouse_type,
-        t2.storehouse_code,
-        t2.storehouse_name,
-        t2.design_capacity,
-        t2.house_doot_position,
-        t2.storehouse_state,
-        t2.dutyStoreman,
-        t1.lkmc,
-        t1.pz,
-        t1.hwxz,
-        t1.dj,
-        t1.kcsl,
-        DATE_FORMAT(t1.rq,'%Y') AS rq,
-        DATE_FORMAT(t1.rq,'%Y-%m-%d') AS rcrq,
-        DATE_FORMAT(t1.cjsj,'%Y-%m-%d') AS cjsj,
-        t1.UnitID
-      FROM
-        `lsreport_ts`.data_kcgl_kcsw_default AS t1
-      LEFT JOIN `depot`.`basic_storehouse` t2 ON t1.UnitID = t2.org_id AND t1.ch = t2.storehouse_id AND del_flag = 1
-      <where>
-          <if test="org_id != null">
-              t2.org_id = #{org_id}
-          </if>
-          <if test="library_type != null">
-              AND t2.library_type = #{library_type}
-          </if>
-          <if test="cfCdoe != null">
-              AND t2.storehouse_code = #{cfCdoe}
-          </if>
-      </where>
-      GROUP BY
-        t2.storehouse_code
+        SELECT
+          t.*
+        FROM
+        (
+            SELECT
+                t2.storehouse_type,
+                t2.storehouse_code,
+                t2.storehouse_name,
+                t2.design_capacity,
+                t2.house_doot_position,
+                t2.storehouse_state,
+                t2.dutyStoreman,
+                t1.lkmc,
+                t1.pz,
+                t1.hwxz,
+                t1.dj,
+                t1.kcsl,
+                t5.EnumItemName rq,
+                t1.rq AS rcrq,
+                t1.cjsj AS cjsj,
+                t1.UnitID
+            FROM
+            `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 (
+                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">
+                AND t2.org_id = #{org_id}
+            </if>
+            <if test="library_type != null">
+                AND t2.library_type = #{library_type}
+            </if>
+            <if test="cfCdoe != null">
+                AND t2.storehouse_code = #{cfCdoe}
+            </if>
+        </where>
+        ) t
+        GROUP BY
+        t.storehouse_code
     </select>
 
     <select id="getColumn1Max" parameterType="java.util.Map" resultType="java.util.Map">