小程序修改

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseDuckInfoController.java

@@ -186,4 +186,12 @@ public class BaseDuckInfoController {
     public Result listDuckByScreen2(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return duckInfoService.listDuckByScreen2(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/listDuckAll")
+    public Result listDuckAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        return new Result(ResultCode.SUCCESS, duckInfoService.list(queryWrapper));
+    }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/EnvRegularCallFeeding.java

@@ -69,5 +69,11 @@ public class EnvRegularCallFeeding implements Serializable {
     private Integer unitId;
     private String unitName;
 
+    private String chiNum;
+
+    private String jiaoNum;
+
+    private String batchNum;
+
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.java

@@ -43,6 +43,7 @@ public interface EnvRegularCallFeedingMapper extends BaseMapper<EnvRegularCallFe
     List<EnvRegularCallEggVo> listCount(String duckNum);
 
     IPage<EnvRegularCallFeeding> listSelect(Page<EnvRegularCallFeeding> page, Date date,String farmId);
+    IPage<EnvRegularCallFeeding> listSelect1(Page<EnvRegularCallFeeding> page, Date date,String farmId,String num);
 
     String listScreen3(QueryWrapper<Object> objectQueryWrapper);
 }

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

@@ -189,8 +189,14 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         baseDuckInfo.setSpecialNeeds(paramsMap.get("specialNeeds"));
         baseDuckInfo.setIsCage(0);
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("duck_num", paramsMap.get("duckCode"));
+        queryWrapper.eq("chi_num", paramsMap.get("chiNum")).eq("farm_id", paramsMap.get("farmId"));
         Integer integer = duckInfoMapper.selectCount(queryWrapper);
+        QueryWrapper<BaseDuckInfo> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("jiao_num", paramsMap.get("jiaoNum")).eq("farm_id", paramsMap.get("farmId"));
+        Integer integer1 = duckInfoMapper.selectCount(queryWrapper2);
+        if (integer1 != 0) {
+            return new Result(10001, "鸭只脚号已存在", false);
+        }
         if (integer == 0) {
             QueryWrapper<BaseDuckInfo> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("unit_id", paramsMap.get("unitId"));
@@ -216,7 +222,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
             duckInfoMapper.insert(baseDuckInfo);
             return new Result(10000, "添加成功！", true);
         } else {
-            return new Result(10001, "鸭只编码已存在", false);
+            return new Result(10001, "鸭只翅号已存在", false);
         }
 
     }
@@ -403,10 +409,10 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                 breed.setUnitId(baseBuilding.getId());
                 breed.setUnitList(baseBuilding.getParentId() + "," + baseBuilding.getId());
                 breed.setFarmId(Integer.parseInt(farmId));
-                if ("雄性".equals(breed.getDuckSex())) {
+                if ("雄鸭".equals(breed.getDuckSex())) {
                     breed.setDuckSex("0");
                 }
-                if ("雌性".equals(breed.getDuckSex())) {
+                if ("雄鸭".equals(breed.getDuckSex())) {
                     breed.setDuckSex("1");
                 }
                 QueryWrapper<BaseDuckBreedImg> queryWrapper1 = new QueryWrapper<>();

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

@@ -1,5 +1,6 @@
 package com.huimv.guowei.admin.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -118,12 +119,7 @@ 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));
+            return new Result(ResultCode.SUCCESS, feedingMapper.listSelect1(page, timesMonthmorning, farmId, unitName));
         }
 
     }

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.xml

@@ -120,12 +120,22 @@ ON DATE_FORMAT(t1.call_date,"%Y-%m-%d") = DATE_FORMAT(t2.call_date,"%Y-%m-%d")
 ORDER BY t1.call_date Desc;
     </select>
     <select id="listSelect" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
-SELECT a.duck_num duckNum,a.unit_name unitName,a.id duckId,IFNULL(b.duckWeight,'0') duckWeight,IFNULL(b.callDate,#{date}) callDate  ,b.callCode callCode
+SELECT a.duck_num duckNum,a.unit_name unitName,a.id duckId,IFNULL(b.duckWeight,'0') duckWeight,IFNULL(b.callDate,#{date}) callDate  ,b.callCode callCode,
+a.chi_num chiNum,a.jiao_num jiaoNum,a.batch_num batchNum
 from base_duck_info a LEFT JOIN
 (select IFNULL(SUM(duck_weight),0) duckWeight,duck_num duckNum,duck_id duckId,call_date callDate ,call_code callCode from env_regular_call_feeding where call_date>#{date} and farm_id=#{farmId} GROUP BY call_code) b ON a.id=b.duckId
 where farm_id=#{farmId} and a.is_cage='0'
 ORDER BY b.callDate DESC
     </select>
+    <select id="listSelect1" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
+SELECT a.duck_num duckNum,a.unit_name unitName,a.id duckId,IFNULL(b.duckWeight,'0') duckWeight,IFNULL(b.callDate,#{date}) callDate  ,b.callCode callCode,
+a.chi_num chiNum,a.jiao_num jiaoNum,a.batch_num batchNum
+from base_duck_info a LEFT JOIN
+(select IFNULL(SUM(duck_weight),0) duckWeight,duck_num duckNum,duck_id duckId,call_date callDate ,call_code callCode,
+ chi_num chiNum,jiao_num jiaoNum,batch_num batchNum,unit_name unitName from env_regular_call_feeding where call_date>#{date} and farm_id=#{farmId} GROUP BY call_code) b ON a.id=b.duckId
+where farm_id=#{farmId} and a.is_cage='0' and (a.chi_num like concat('%',#{num},'%') or a.jiao_num like concat('%',#{num},'%') or a.unit_name like concat('%',#{num},'%'))
+ORDER BY b.callDate DESC
+    </select>
     <select id="listScreen3" resultType="java.lang.String">
 
   SELECT (IFNULL(SUM(duck_weight),'0')) 'duckWeight'  FROM `env_regular_call_feeding`