封仓确认单-仓房获取

src/main/java/com/chinaitop/depot/grainSituationCard/controller/StorageSealedConfirmationController.java

@@ -105,8 +105,8 @@ public class StorageSealedConfirmationController {
      * @param warehouseId 必传
      * @return 储备信息为空表示非储备粮
      */
-    @RequestMapping(value = "/checkGrainAttribute/{orgId}/{houseId}/{warehouseId}", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
-    public ResponseEntity checkGrainAttribute(@PathVariable("orgId") Integer orgId, @PathVariable("houseId") Integer houseId, @PathVariable("warehouseId") Integer warehouseId) {
+    @RequestMapping(value = "/checkGrainAttribute/{orgId}/{houseId}", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    public ResponseEntity checkGrainAttribute(@PathVariable("orgId") Integer orgId, @PathVariable("houseId") Integer houseId, Integer warehouseId) {
         return ResponseEntity.ok(confirmationService.checkGrainAttribute(orgId, houseId, warehouseId));
     }
 

src/main/java/com/chinaitop/depot/grainSituationCard/mapper/StorageSealedConfirmationMapper.xml

@@ -417,18 +417,23 @@
         harvest_time harvestYear
     from
         storage_qualitycheck
-    where
-        org_id = #{orgId}
-        and house_id = #{houseId}
+    <where>
+      history_status = 0
+      and type_update = '0'
+      and org_id = #{orgId}
+      and house_id = #{houseId}
+      <if test="warehouseId != null and warehouseId != ''">
         and warehouse_id = #{warehouseId}
-        and quality in(
-            6864,
-            6865,
-            6877,
-            6878,
-            6879,
-            6866
-        )
+      </if>
+      and quality in(
+              6864,
+              6865,
+              6877,
+              6878,
+              6879,
+              6866
+            )
+    </where>
     order by id desc limit 0,1
   </select>
   <select id="checkNoticeReceive" parameterType="integer" resultType="integer">