查询

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseDuckInfoServiceImpl.java

@@ -75,8 +75,6 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
     @Override
     public Result listDuck(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String chiNum = paramsMap.get("chiNum");//前端传来的是编号
-        String jiaoNum = paramsMap.get("jiaoNum");
-        String location = paramsMap.get("location");//前端传来的是位置名字
         String farmId = paramsMap.get("farmId");//场的编码
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
@@ -87,8 +85,8 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
             pageSize = "10";
         }
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(chiNum), "chi_num", chiNum).like(StringUtils.isNotBlank(jiaoNum), "jiao_num", jiaoNum)
-                .like(StringUtils.isNotBlank(location), "unit_name", location).eq("farm_id", farmId).orderByDesc("id");
+        queryWrapper.like(StringUtils.isNotBlank(chiNum), "chi_num", chiNum).or().like(StringUtils.isNotBlank(chiNum), "jiao_num", chiNum)
+                .eq("farm_id", farmId).orderByDesc("id");
         Page<BaseDuckInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, duckInfoMapper.selectPage(page, queryWrapper));
     }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java

@@ -79,7 +79,6 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
             } else if ("3".equals(dateType)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 queryWrapper.ge("call_date", timesMonthmorning);
-
             } else {
                 String startDate = paramsMap.get("startDate");
                 String endDate = paramsMap.get("endDate");
@@ -119,13 +118,11 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         if ("".equals(unitName) || null == unitName) {
             return new Result(ResultCode.SUCCESS, feedingMapper.listSelect(page, timesMonthmorning,farmId));
         } else {
-
             QueryWrapper<EnvRegularCallFeeding> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName), "unit_name", unitName)
                     .select("IFNULL(SUM(duck_weight),0) duckWeight,duck_num duckNum,call_date callDate,unit_name unitName,duck_id duckId,call_code callCode")
                     .ge("call_date", timesMonthmorning)
                     .orderByDesc("call_date");
-
             return new Result(ResultCode.SUCCESS, feedingMapper.selectPage(page, queryWrapper));
         }
 
@@ -157,6 +154,7 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         for (BaseBuilding building : baseBuildingList) {
             unitList.add(building.getId());
         }
+
         //今日
         QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.in("d.unit_id", unitList).eq("f.farm_id", farmId).eq("f.event_type", 0).ge("f.call_date", timesmorning);
@@ -204,7 +202,6 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         resultMap.put("monthFeed", monthFeed);
         resultMap.put("monthTrend", monthTrend);
         resultMap.put("monthFeedGap", monthGap + "%");
-
         return new Result(ResultCode.SUCCESS, resultMap);
     }