1

src/main/java/com/chinaitop/depot/sqr/mapper/BizSqrEnterpriseApplyMapper.xml

@@ -108,35 +108,20 @@
 
     </select>
     <select id="findById" resultType="Map" resultMap="BaseResultMap">
-        SELECT DISTINCT
-            bui.dwmc,
-            bui.id unitInfoId,
-            bui.dwdm,
-            bui.fddbr,
-            bui.dwlx,
-            bui.zcdz,
-            bui.cfs,
-            bui.ygs,
-            dict.DICT_LABEL,
-            bse.certified_storekeeper_count,
-            bse.certified_inspector_count,
-            bse.warehouse_facility_situation,
-            bse.full_time_staff_count,
-            bse.storage_expire_time,
-            bse.attachment attachment,
-            SUM(oi.depot_area) depotArea,
-            SUM(bs.actual_capacity)actualCapacity,
-            bgqa.apply_status,bgqa.apply_type,bgqa.id
+        SELECT
+        bgqa.id, A.dwmc,A.id unitInfoId, A.dwdm,A.fddbr,A.dwlx,A.zcdz,A.cfs,A.ygs,A.DICT_LABEL,bgqa.apply_status,bgqa.apply_type,
+        bse.certified_storekeeper_count ,bse.certified_inspector_count ,bse.warehouse_facility_situation ,
+        bse.full_time_staff_count ,bgqa.storage_expire_time ,bgqa.attachment attachment,bgqa.sqr_enterprise_id
         FROM
-            province_all.biz_unit_info bui
-                LEFT JOIN province_all.dev_dict dict ON bui.dwlx = dict.id
-                LEFT JOIN province_all.biz_sqr_enterprise bse ON bse.unit_info_id = bui.id
-                left join province_all.biz_sqr_enterprise_apply bgqa  on bgqa.sqr_enterprise_id =bse.id
-                left join depot_qh.org_info oi on oi.unit_info_id=bui.id
-                left join depot_qh.basic_storehouse bs on bs.org_id=oi.org_id
-        WHERE
-            bui.delete_flag = 'NOT_DELETE'
-            and bui.id =#{unitInfoId,jdbcType=VARCHAR}
+        province_all.biz_sqr_enterprise_apply bgqa
+        left join province_all.biz_sqr_enterprise  bse on bgqa.sqr_enterprise_id =bse.id
+        left join(select bui.id,bui.dwmc,bui.dwdm,bui.fddbr,bui.dwlx,bui.zcdz,bui.cfs,bui.ygs,dict.DICT_LABEL  from province_all.biz_unit_info bui left join province_all.dev_dict dict on bui.dwlx = dict.id
+        <if test="unitInfoId != null and unitInfoId != ''">
+            where bui.id =#{unitInfoId,jdbcType=VARCHAR}
+        </if>
+
+        )A  on bgqa.unit_info_id = A.id
+        where bgqa.id=#{id,jdbcType=INTEGER} and bgqa.apply_type=#{applyType,jdbcType=INTEGER}
     </select>
 
     <select id="findById1" resultType="Map" resultMap="BaseResultMap">