异常粮情列表

src/main/java/com/unissoft/grainManage/controller/GrainConditionRecordController.java

@@ -94,4 +94,11 @@ public class GrainConditionRecordController {
         return ResultView.success(page);
     }
 
+    @ApiOperation(value = "本机构异常粮情列表分页查询", notes = "提交参数: depotId 非空")
+    @PostMapping("/authority/getGrainErrorHouseList")
+    public ResultView getGrainErrorHouseList(@RequestBody PageParam pageParam) {
+        IPage<GrainError> page = grainConditionRecordService.getGrainErrorHouseList(pageParam);
+        return ResultView.success(page);
+    }
+
 }

src/main/java/com/unissoft/grainManage/service/GrainConditionRecordService.java

@@ -34,4 +34,6 @@ public interface GrainConditionRecordService extends IService<GrainConditionReco
     IPage<GrainError> getGrainErrorCount(PageParam pageParam);
 
     List<GrainErrorEChars> getGrainErrorEChars(Integer depotId);
+
+    IPage<GrainError> getGrainErrorHouseList(PageParam pageParam);
 }

src/main/java/com/unissoft/grainManage/service/impl/GrainConditionRecordServiceImpl.java

@@ -219,4 +219,26 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
         return iPage;
     }
 
+    @Override
+    public IPage<GrainError> getGrainErrorHouseList(PageParam pageParam) {
+        // 分页
+        int pageIndex = pageParam.getPageIndex();
+        int pageSize = pageParam.getPageSize();
+        // 分页对象
+        IPage<GrainError> iPage = new Page<>();
+        // 查询条件
+        if (!StringUtils.isEmpty(pageParam.getCondition())) {
+            if (pageIndex != MyConstant.ZERO && pageSize != MyConstant.ZERO) {
+                iPage.setCurrent(pageIndex);
+                iPage.setSize(pageSize);
+            }
+            // 查询map对象
+            Map<String, Object> map = JSON.parseObject(pageParam.getCondition(), Map.class);
+            // 获取分页查询数据
+            IPage<GrainError> res = grainConditionRecordMapper.getGrainErrorHouseList(iPage, map);
+            return res;
+        }
+        return iPage;
+    }
+
 }

src/main/java/com/unissoft/mapper/GrainConditionRecordMapper.java

@@ -28,6 +28,8 @@ public interface GrainConditionRecordMapper extends BaseMapper<GrainConditionRec
 
     List<GrainErrorEChars> getGrainErrorEChars(@Param("depotIds") List<Integer> depotIds);
 
+    IPage<GrainError> getGrainErrorHouseList(IPage<GrainError> iPage, @Param("params") Map<String, Object> map);
+
     // List<GrainConditionRecord> getByPersonAndTime();
 //    int getSelectRecordId();
 

src/main/java/com/unissoft/mapper/GrainConditionRecordMapper.xml

@@ -108,6 +108,33 @@
         GROUP BY
           depot_id
     </select>
+    <select id="getGrainErrorHouseList" resultType="com.unissoft.model.GrainError">
+        SELECT
+            CONCAT(
+                check_year,
+                '年',
+                check_year_week,
+                '周'
+            ) yearJoinWeek,
+            house_id houseId,
+            depot_id depotId,
+            grain_error grainError,
+            operation_time operationTime
+        FROM
+            grain_condition_record
+        <where>
+            <if test="params.depotId != null">
+                AND depot_id = #{params.depotId}
+            </if>
+            <if test="params.checkYear != null">
+                AND check_year = #{params.checkYear}
+            </if>
+            <if test="params.checkYearWeek != null">
+                AND check_year_week = #{params.checkYearWeek}
+            </if>
+        </where>
+        ORDER BY operation_time DESC
+    </select>
 
   <!--  <select id="getByPersonAndTime"  resultType="com.unissoft.model.GrainConditionRecord">
         SELECT

src/main/java/com/unissoft/model/GrainError.java

@@ -28,10 +28,14 @@ public class GrainError implements Serializable {
     private String yearJoinWeek;
     @ApiModelProperty(value = "库id")
     private Integer depotId;
+    @ApiModelProperty(value = "仓房id")
+    private Integer houseId;
     @ApiModelProperty(value = "仓房个数")
     private Integer houseCount;
     @ApiModelProperty(value = "异常粮情个数")
     private Integer grainErrorCount;
+    @ApiModelProperty(value = "本机构异常粮情 grainError != null && grainError == 191 的为黄色")
+    private Integer grainError;
     @ApiModelProperty(value = "检查(操作)时间(子表)")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")