统一日期控件

src/main/java/com/chinaitop/depot/storage/controller/StorageFoodbasicInfoController.java

@@ -165,7 +165,7 @@ public class StorageFoodbasicInfoController {
                     }
                 }
                 for(StorageQualitycheckInspection sqki : SqciList){
-                    if(sqki.getInsolubleImpurity()!=null ){
+                    if(sqki.getInsolubleImpurity()!=null && sqki.getInsolubleImpurity()!="" && !sqki.getInsolubleImpurity().equals("") ){
                         foodbasicinfo.setImpurity(sqki.getInsolubleImpurity());
                         continue;
                     }

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

@@ -897,8 +897,8 @@
         bs.storehouse_code storehouseCode,
         bs.storehouse_type house_type,
         bs.design_capacity design_house_capacity,
-        bs.length,
-        bs.width,
+        sf.length,
+        sf.width,
         bs.storeHouse_name storehouseName,
         bw.warehouse_name wareHouseName,
         <!--bs.depot_name keep_unite,-->
@@ -908,6 +908,7 @@
         temp_sqk.keeper keeperNames,
         temp_sqk.water,
         temp_sqk.impurity,
+        temp_sqk.location,
         temp_sqk.badpart unsound,
         temp_sqk.capacity weight,
         temp_sqk. LEVEL,
@@ -938,7 +939,7 @@
         <if test="warehouseId != null">
         AND sqk.warehouse_id = #{warehouseId}
         </if>
-        AND sqk.type = 1
+        AND sqk.type = 0
         AND sqk.history_status = 0
         ORDER BY
             id DESC