器材库

src/main/java/com/unissoft/equipmentStroe/controller/EquipmentStroeController.java

@@ -29,7 +29,7 @@ public class EquipmentStroeController {
 
     @ApiOperation(value = "分页条件查询",
             notes = "提交参数：{\"pageIndex\":1,\"pageSize\":10,\"," +
-                    "\"condition\":\"{'table_name':'grain_condition_record'," +
+                    "\"condition\":\"{'table_name':'equipment_stroe'," +
                     "'field_name':'check_list'\"}")
     @PostMapping("/authority/getPage")
     public ResultView getPage(@RequestBody PageParam pageParam) {

src/main/java/com/unissoft/equipmentStroe/service/impl/EquipmentStroeServiceImpl.java

@@ -40,6 +40,7 @@ public class EquipmentStroeServiceImpl extends ServiceImpl<EquipmentStroeMapper,
             String equipmentNameCode = object.optString("equipment_name_code").trim();
             String standardsType = object.optString("standards_type").trim();
             String arrivalTime = object.optString("arrival_time").trim();
+            String state = object.optString("state").trim();
             if (!StringUtils.isEmpty(depotId)) {
                 ew.eq("depot_id", depotId);
             }
@@ -55,6 +56,9 @@ public class EquipmentStroeServiceImpl extends ServiceImpl<EquipmentStroeMapper,
             if (!StringUtils.isEmpty(standardsType)) {
                 ew.eq("standards_type", standardsType);
             }
+            if (!StringUtils.isEmpty(state)) {
+                ew.eq("state", state);
+            }
         }
         ew.orderByDesc("arrival_time");
         Page page = new Page();