Browse Source

小程序修改

wwh 1 year ago
parent
commit
e55ce290c4

+ 8 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BreedServiceImpl.java

@@ -65,6 +65,14 @@ public class BreedServiceImpl extends ServiceImpl<BreedMapper, Breed> implements
         }
         QueryWrapper<Breed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName),"unit_name", unitName)
+                .or()
+                .like(StringUtils.isNotBlank(unitName),"male_chi_num", unitName)
+                .or()
+                .like(StringUtils.isNotBlank(unitName),"female_chi_num", unitName)
+                .or()
+                .like(StringUtils.isNotBlank(unitName),"male_jiao_num", unitName)
+                .or()
+                .like(StringUtils.isNotBlank(unitName),"female_jiao_num", unitName)
                 .orderByDesc("id");
         Page<Breed> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, breedMapper.selectPage(page, queryWrapper));

+ 4 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DepartureServiceImpl.java

@@ -68,6 +68,10 @@ public class DepartureServiceImpl extends ServiceImpl<DepartureMapper, Departure
         }
         QueryWrapper<Departure> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName),"unit_name", unitName)
+                .or()
+                .like(StringUtils.isNotBlank(unitName),"chi_num", unitName)
+                .or()
+                .like(StringUtils.isNotBlank(unitName),"jiao_num", unitName)
                 .orderByDesc("id");
         Page<Departure> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, departureMapper.selectPage(page, queryWrapper));

+ 4 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckImmunityInfoServiceImpl.java

@@ -110,6 +110,10 @@ public class DuckImmunityInfoServiceImpl extends ServiceImpl<DuckImmunityInfoMap
         }
         QueryWrapper<DuckImmunityInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName),"unit_name", unitName)
+                .or()
+                .like(StringUtils.isNotBlank(unitName),"chi_num", unitName)
+                .or()
+                .like(StringUtils.isNotBlank(unitName),"jiao_num", unitName)
         .orderByDesc("health_date");
         Page<DuckImmunityInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, infoMapper.selectPage(page, queryWrapper));

+ 3 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallEggServiceImpl.java

@@ -179,6 +179,9 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
 
         QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName), "unit_name", unitName)
+                .or()
+                .like(StringUtils.isNotBlank(unitName), "chi_num", unitName).or()
+                .like(StringUtils.isNotBlank(unitName), "jiao_num", unitName)
                 .select("IFNULL(SUM(duck_weight),'0') duckWeight, IFNULL(SUM(egg_num),'0') eggNum,duck_num duckNum,unit_name unitName,duck_id duckId")
                 .groupBy("duck_num")
                 .orderByDesc("call_date");

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

@@ -121,7 +121,9 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         } else {
 
             QueryWrapper<EnvRegularCallFeeding> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName), "unit_name", unitName)
+            queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName), "unit_name", unitName).or()
+                    .like(StringUtils.isNotBlank(unitName), "chi_num", unitName).or()
+                    .like(StringUtils.isNotBlank(unitName), "jiao_num", 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");