添加仓房和库

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

@@ -80,7 +80,7 @@ public class GrainConditionRecordController {
         return ResultView.success();
     }
 
-    @ApiOperation(value = "根据角色和时间查询", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10}")
+    @ApiOperation(value = "根据角色和时间查询", notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\",\"condition\":\"{'house_id':'','house_id':''\"}")
     @PostMapping("/authority/getByRoleTime")
     public ResultView getByRoleTime(@RequestBody PageParam pageParam) {
         List<GrainConditionRecord> list = grainConditionRecordService.getByRoleTime(pageParam);

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

@@ -79,6 +79,8 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
             String checkPerson = object.optString("check_person").trim();
             String startTime = object.optString("check_start_time").trim();
             String endTime = object.optString("check_end_time").trim();
+            String houseId = object.optString("house_id").trim();
+            String depotId = object.optString("depot_id").trim();
             if (!StringUtils.isEmpty(checkPerson)) {
                 ew.eq("check_person", checkPerson);
             }
@@ -88,6 +90,12 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
             if (!StringUtils.isEmpty(endTime)) {
                 ew.le("check_time", endTime);
             }
+            if (!StringUtils.isEmpty(houseId)) {
+                ew.eq("house_id", houseId);
+            }
+            if (!StringUtils.isEmpty(depotId)) {
+                ew.eq("depot_id", depotId);
+            }
 
         }
         ew.orderByDesc("check_time");
@@ -195,7 +203,14 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
     @Override
     public List<GrainConditionRecord> getByRoleTime(PageParam pageParam) {
 
-        List<GrainConditionRecord> list = grainConditionRecordMapper.getByCheckPersonAndCheckTime();
+        String houseId = null;
+        String depotId = null;
+        if (!StringUtils.isEmpty(pageParam.getCondition())) {
+            JSONObject object = new JSONObject(pageParam.getCondition());
+             houseId = object.optString("house_id").trim();
+             depotId = object.optString("depot_id").trim();
+        }
+        List<GrainConditionRecord> list = grainConditionRecordMapper.getByCheckPersonAndCheckTime(houseId,depotId);
         for (GrainConditionRecord conditionRecord : list) {
             String checkDescribe = conditionRecord.getCheckDescribe();
             if(org.apache.commons.lang.StringUtils.isNotBlank(checkDescribe)){

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

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface GrainConditionRecordMapper extends BaseMapper<GrainConditionRecord> {
 
-    List<GrainConditionRecord> getByCheckPersonAndCheckTime();
+    List<GrainConditionRecord> getByCheckPersonAndCheckTime(String houseId,String depotId);
    // List<GrainConditionRecord> getByPersonAndTime();
     int  getSelectRecordId();
 }

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

@@ -13,11 +13,13 @@
         <result column="record_status" property="recordStatus" />
         <result column="anomalous_status" property="anomalousStatus" />
         <result column="uid" property="uid" />
+        <result column="house_id" property="houseId" />
+        <result column="depot_id" property="depotId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, check_time, check_list, choose, check_describe, check_person, record_status, anomalous_status, uid
+        id, check_time, check_list, choose, check_describe, check_person, record_status, anomalous_status, uid, houseId, depotId
     </sql>
 
 
@@ -37,6 +39,7 @@
             grain_condition_record gcr   left join grain_abnormal_describe gad on gcr.id = gad.grain_record_id
         WHERE
             gcr.check_time = ( SELECT max( check_time ) FROM grain_condition_record WHERE check_person = gcr.check_person )
+            and house_id = #{houseId} and depot_id = #{depotId}
         ORDER BY
             gcr.check_person
     </select>

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

@@ -69,6 +69,13 @@ public class GrainConditionRecord implements Serializable {
     @TableField("uid")
     private String uid;
 
+    @ApiModelProperty(value = "库id")
+    @TableField("house_id")
+    private String houseId;
+
+    @ApiModelProperty(value = "仓房id")
+    @TableField("depot_id")
+    private String depotId;
 
     @ApiModelProperty(value = "粮情异常描述")
     @TableField(exist = false)