鸭只编号字段修改

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

@@ -44,7 +44,7 @@ public class EnvMoveCall implements Serializable {
     /**
      * 鸭只编号
      */
-    private String duckCode;
+    private String duckNum;
 
     /**
      * 体重

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

@@ -43,7 +43,7 @@ public class EnvRegularCallEgg implements Serializable {
     /**
      * 鸭只编号
      */
-    private String duckCode;
+    private String duckNum;
 
     /**
      * 鸡蛋重量 克

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

@@ -43,7 +43,7 @@ public class EnvRegularCallFeeding implements Serializable {
     /**
      * 鸭只编号
      */
-    private String duckCode;
+    private String duckNum;
 
     /**
      * 采食重量 克

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

@@ -103,7 +103,7 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         String eggNum = paramsMap.get("eggNum");
         String eggWeight = paramsMap.get("eggWeight");
         EnvRegularCallEgg egg = new EnvRegularCallEgg();
-        egg.setDuckCode(baseDuckInfo.getDuckNum());
+        egg.setDuckNum(baseDuckInfo.getDuckNum());
         egg.setFarmId(Integer.parseInt(farmId));
         egg.setDuckWeight(Integer.parseInt(eggWeight));
         egg.setEggNum(Integer.parseInt(eggNum));
@@ -130,10 +130,10 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
     public void printEgg(HttpServletResponse response, Map<String, String> paramsMap) throws Exception {
         String duckCode = paramsMap.get("duckCode");
         QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("duck_code", duckCode);
+        queryWrapper.eq("duck_num", duckCode);
         List<EnvRegularCallEgg> eggs = eggMapper.printEggList(queryWrapper);
         QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("duck_code", duckCode);
+        queryWrapper1.eq("duck_num", duckCode);
         List<EnvRegularCallFeeding> feedings = feedingMapper.listDay(queryWrapper1);
         Print.printEgg(eggs, feedings);
     }

huimv-admin/src/main/java/com/huimv/guowei/admin/utils/Print.java

@@ -85,7 +85,7 @@ public class Print {
             EnvRegularCallEggVo eggVo = new EnvRegularCallEggVo();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             eggVo.setDate(sdf.format(feeding.getCallDate()));
-            eggVo.setDuckCode(feeding.getDuckCode());
+            eggVo.setDuckCode(feeding.getDuckNum());
             eggVo.setFeed(feeding.getDuckWeight());
             Integer eggNum = eggs.get(i).getEggNum();
             eggVo.setEggNum(eggNum);

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

@@ -7,7 +7,7 @@
         <id column="id" property="id" />
         <result column="call_name" property="callName" />
         <result column="call_code" property="callCode" />
-        <result column="duck_code" property="duckCode" />
+        <result column="duck_num" property="duckNum" />
         <result column="duck_weight" property="duckWeight" />
         <result column="call_date" property="callDate" />
         <result column="dayage" property="dayage" />

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

@@ -7,7 +7,7 @@
         <id column="id" property="id" />
         <result column="call_name" property="callName" />
         <result column="call_code" property="callCode" />
-        <result column="duck_code" property="duckCode" />
+        <result column="duck_num" property="duckNum" />
         <result column="duck_weight" property="duckWeight" />
         <result column="duck_feeding_original" property="duckFeedingOriginal" />
         <result column="call_date" property="callDate" />
@@ -30,7 +30,7 @@
     </select>
 
     <select id="printEggList" resultType="com.huimv.guowei.admin.entity.EnvRegularCallEgg">
-        SELECT (IFNUll(sum(egg_num),'0')) 'eggNum',(IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_code 'duckCode',call_date 'callDate' FROM `env_regular_call_egg`
+        SELECT (IFNUll(sum(egg_num),'0')) 'eggNum',(IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_num 'duckNum',call_date 'callDate' FROM `env_regular_call_egg`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
         ORDER BY call_date ASC

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

@@ -7,7 +7,7 @@
         <id column="id" property="id"/>
         <result column="call_name" property="callName"/>
         <result column="call_code" property="callCode"/>
-        <result column="duck_code" property="duckCode"/>
+        <result column="duck_num" property="duckNum"/>
         <result column="duck_weight" property="duckWeight"/>
         <result column="duck_feeding_original" property="duckFeedingOriginal"/>
         <result column="call_date" property="callDate"/>
@@ -15,7 +15,7 @@
         <result column="duck_id" property="duckId"/>
     </resultMap>
     <select id="listDay" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
-        SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_code 'duckCode',call_date 'callDate' FROM `env_regular_call_feeding`
+        SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_num 'duckNum',call_date 'callDate' FROM `env_regular_call_feeding`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
         ORDER BY call_date ASC