ソースを参照

虫害检查-默认值

hanqingsong 1 年間 前
コミット
dda856e18c

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/mapper/TCcdataMapper.java

@@ -48,5 +48,5 @@ public interface TCcdataMapper {
48
     // 获取廒间编码-查询视图(货位id)
48
     // 获取廒间编码-查询视图(货位id)
49
     String getAJBM(@Param("hwCode") String hwCode);
49
     String getAJBM(@Param("hwCode") String hwCode);
50
 
50
 
51
-    TCcdata getCheckGrainAttribute(@Param("orgId") Integer orgId, @Param("houseId") Integer houseId, @Param("warehouseId") Integer warehouseId);
51
+    Map<String, Object> getCheckGrainAttribute(@Param("orgId") Integer orgId, @Param("houseId") Integer houseId, @Param("warehouseId") Integer warehouseId);
52
 }
52
 }

+ 2 - 2
src/main/java/com/chinaitop/depot/storage/mapper/TCcdataMapper.xml

@@ -545,10 +545,10 @@
545
   <select id="getAJBM" parameterType="string" resultType="string">
545
   <select id="getAJBM" parameterType="string" resultType="string">
546
     select ajdm from ods_up_hwxxjk_final where id = #{hwCode}
546
     select ajdm from ods_up_hwxxjk_final where id = #{hwCode}
547
   </select>
547
   </select>
548
-  <select id="getCheckGrainAttribute" parameterType="integer" resultType="com.chinaitop.depot.storage.model.TCcdata">
548
+  <select id="getCheckGrainAttribute" parameterType="integer" resultType="map">
549
     select
549
     select
550
         sub_type lypz,
550
         sub_type lypz,
551
-        number_update/1000 kcsl
551
+        case number_update when null then 0 else number_update/1000 end kcsl
552
     from
552
     from
553
         storage_qualitycheck
553
         storage_qualitycheck
554
     where
554
     where

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/service/InsectPestDetectionService.java

@@ -72,5 +72,5 @@ public interface InsectPestDetectionService {
72
      */
72
      */
73
 	void saveOrUpdate(String insectPests) throws Exception;
73
 	void saveOrUpdate(String insectPests) throws Exception;
74
 
74
 
75
-    TCcdata getCheckGrainAttribute(Integer orgId, Integer houseId, Integer warehouseId);
75
+    Map<String, Object> getCheckGrainAttribute(Integer orgId, Integer houseId, Integer warehouseId);
76
 }
76
 }

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/service/impl/InsectPestDetectionServiceImpl.java

@@ -252,7 +252,7 @@ public class InsectPestDetectionServiceImpl implements InsectPestDetectionServic
252
 	}
252
 	}
253
 
253
 
254
     @Override
254
     @Override
255
-    public TCcdata getCheckGrainAttribute(Integer orgId, Integer houseId, Integer warehouseId) {
255
+    public Map<String, Object> getCheckGrainAttribute(Integer orgId, Integer houseId, Integer warehouseId) {
256
         return tCcdataMapper.getCheckGrainAttribute(orgId, houseId, warehouseId);
256
         return tCcdataMapper.getCheckGrainAttribute(orgId, houseId, warehouseId);
257
     }
257
     }
258
 
258