异常粮情机构列表

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

@@ -83,32 +83,30 @@
     </select>
     <select id="getGrainErrorCount" resultType="com.unissoft.model.GrainError">
         SELECT
-            gr.id pId,
-            grc.id cId,
-            gr.depot_id depotId,
-            gr.check_year checkYear,
-            gr.check_year_week checkYearWeek,
-            gr.house_id houseId,
-            grc.anomalous_status anomalousStatus,
-            grc.enum_id enumId,
-            grc.operation_time operationTime
+            CONCAT(
+            check_year,
+            '年',
+            check_year_week,
+            '周'
+            ) yearJoinWeek,
+            depot_id depotId,
+            COUNT(house_id) houseCount,
+            COUNT(grain_error) grainErrorCount,
+            max(operation_time) operationTime
         FROM
-            grain_condition_record gr
-        INNER JOIN grain_condition_record_child grc ON gr.id = grc.parent_id
-        AND grc.enum_id = 191
-        AND gr.enum_id = 19
-        AND grc.anomalous_status = 1
-        AND gr.anomalous_status = 1
-        <if test="params.checkYear != null">
-            AND gr.check_year = #{params.checkYear}
-        </if>
-        <if test="params.checkYearWeek != null">
-            AND gr.check_year_week = #{params.checkYearWeek}
-        </if>
-        AND gr.depot_id IN
-        <foreach item="depotId" collection="params.depotIds" separator="," open="(" close=")">#{depotId}</foreach>
-        ORDER BY
-            gr.check_year_week
+          grain_condition_record
+        <where>
+            <if test="params.checkYear != null">
+                AND check_year = #{params.checkYear}
+            </if>
+            <if test="params.checkYearWeek != null">
+                AND check_year_week = #{params.checkYearWeek}
+            </if>
+            AND depot_id IN
+            <foreach item="depotId" collection="params.depotIds" separator="," open="(" close=")">#{depotId}</foreach>
+        </where>
+        GROUP BY
+          depot_id
     </select>
 
   <!--  <select id="getByPersonAndTime"  resultType="com.unissoft.model.GrainConditionRecord">

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

@@ -24,30 +24,14 @@ import java.util.Date;
 public class GrainError implements Serializable {
     private static final long serialVersionUID = 2162086215502754428L;
 
-    @ApiModelProperty(value = "粮情检测记录id")
-    private Integer pId;
-
-    @ApiModelProperty(value = "粮情检测记录子表id")
-    private Integer cId;
-
+    @ApiModelProperty(value = "2021年11周")
+    private String yearJoinWeek;
     @ApiModelProperty(value = "库id")
     private Integer depotId;
-
-    @ApiModelProperty(value = "检查年份(用于粮情异常等,做年统计)")
-    private Integer checkYear;
-
-    @ApiModelProperty(value = "检查所在年第几周")
-    private Integer checkYearWeek;
-
-    @ApiModelProperty(value = "仓房id")
-    private Integer houseId;
-
-    @ApiModelProperty(value = "是否异常_选项(0:否,1:是)")
-    private Integer anomalousStatus;
-
-    @ApiModelProperty(value = "检查类型(子表检查项)")
-    private Integer enumId;
-
+    @ApiModelProperty(value = "仓房个数")
+    private Integer houseCount;
+    @ApiModelProperty(value = "异常粮情个数")
+    private Integer grainErrorCount;
     @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")