出清

src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.storage.mapper;
 import com.chinaitop.depot.storage.model.ClearanceConfirmation;
 import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
@@ -30,12 +31,12 @@ public interface ClearanceConfirmationMapper {
 
     Map<String, BigDecimal> getexcessLossQuantity(Integer warehouseId);
 
-    Map<String, Object> getStoreHouse(Integer warehouseId);
+    Map<String, Object> getStoreHouse(@Param("warehouseId")Integer warehouseId);
 
 
-    List<StorageStorehouseBusiness> findStorehouseList(Integer orgId);
+    List<StorageStorehouseBusiness> findStorehouseList(@Param("orgId") Integer orgId);
 
-    List<StorageStorehouseBusiness> findByWarehouseList(Integer storehouseId);
+    List<StorageStorehouseBusiness> findByWarehouseList(@Param("storehouseId")Integer storehouseId);
 
     ClearanceConfirmation selectByCqqrd(String warehouseId);
 }

src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.xml

@@ -232,21 +232,23 @@ cc.updatename updatename,cc.updatedate updatedate,cc.warehouse_id
   where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="findStorehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
-    select DISTINCT bs.storehouse_id,bs.storehouse_name
-    from
+    SELECT DISTINCT
+      bs.storehouse_id storehouseId,
+      bs.storehouse_name storehouseName
+    FROM
       depot_qh.basic_storehouse bs
-        left join data_kcgl_kcsw_default dkkd on bs.storehouse_id =dkkd.ch
+        LEFT JOIN data_kcgl_kcsw_default dkkd ON bs.storehouse_id = dkkd.ch
+        LEFT JOIN 	depot_qh.basic_warehouse bw on bw.storehouse_id =bs.storehouse_id
 
-    where bs.org_id=#{orgId} and dkkd.ch is null
+    where bs.org_id=#{orgId} and dkkd.ch is null and bw.storehouse_id is not null
   </select>
   <select id="findByWarehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
 
-    select DISTINCT bw.warehouse_id,bw.warehouse_name
+    select DISTINCT bw.warehouse_id warehouseId,bw.warehouse_name warehouseName
     from
       depot_qh.basic_warehouse bw
-        left join depot_qh.data_kcgl_kcsw_default dkkd on bw.warehouse_id =dkkd.hwh
 
-    where bw.storehouse_id=#{storehouseId} and dkkd.hwh is null
+    where bw.storehouse_id=#{storehouseId}
 
   </select>
 

src/main/java/com/chinaitop/depot/storage/service/impl/ClearanceConfirmationServiceImpl.java

@@ -172,6 +172,7 @@ public class ClearanceConfirmationServiceImpl implements ClearanceConfirmationSe
 
     @Override
     public List<StorageStorehouseBusiness> findStorehouse(Integer orgId) {
+        System.out.print(ClearanceConfirmationMapper.findStorehouseList(orgId));
         return ClearanceConfirmationMapper.findStorehouseList(orgId);
     }
 

src/main/resources/bootstrap-dev.yml

@@ -39,6 +39,9 @@ spring:
 #  jackson:
 #    date-format: yyyy-MM-dd
 #    time-zone: GMT+8
+logging:
+  level:
+    org.hibernate.SQL: DEBUG
 web:
   upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
 cxf: