打印修改

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

@@ -1,10 +1,13 @@
 package com.huimv.guowei.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.entity.DuckImmunityInfo;
 import com.huimv.guowei.admin.entity.EnvMoveCall;
+import com.huimv.guowei.admin.service.IBaseDuckInfoService;
 import com.huimv.guowei.admin.service.IEnvMoveCallService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -33,6 +36,8 @@ public class EnvMoveCallController {
 
     @Autowired
     private IEnvMoveCallService moveCallService;
+    @Autowired
+    private IBaseDuckInfoService duckInfoService;
 
     @RequestMapping("/listById")
     public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
@@ -49,6 +54,11 @@ public class EnvMoveCallController {
         if (envMoveCall.getDuckWeight().compareTo(BigDecimal.ZERO) !=1) {
             return new Result(10001, "体重必须大于0", false);
         } else {
+            QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", envMoveCall.getFarmId()).eq("duck_num", envMoveCall.getDuckNum());
+            BaseDuckInfo duckInfo = duckInfoService.getOne(queryWrapper);
+            envMoveCall.setDayage(duckInfo.getDayAge());
+            envMoveCall.setDuckId(duckInfo.getId());
             moveCallService.save(envMoveCall);
             return new Result(10000, "添加成功！", true);
         }

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

@@ -80,7 +80,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         }
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(code), "duck_num", code)
-                .eq(StringUtils.isNotBlank(location), "unit_name", location).eq("farm_id", farmId);
+                .eq(StringUtils.isNotBlank(location), "unit_name", location).eq("farm_id", farmId).orderByDesc("duck_birthday");
         Page<BaseDuckInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, duckInfoMapper.selectPage(page, queryWrapper));
     }
@@ -132,7 +132,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
             } else {
 
                 if (father.getDayAge() < 100) {
-                    return new Result(10001, "该鸭只日龄小于100天，暂不能作为种鸭！", false);
+                    return new Result(10001, "该鸭只日龄小于100天，暂不能作为公种鸭！", false);
                 } else {
                     QueryWrapper<BaseDuckInfo> duckInfoQueryWrapper1 = new QueryWrapper<>();
                     duckInfoQueryWrapper1.eq("farm_id", paramsMap.get("farmId")).eq("duck_num", motherNum).eq("is_cage",0);
@@ -141,7 +141,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                         return new Result(10001, "母亲编号不存在，请重新输入！", false);
                     } else {
                         if (mother.getDayAge() < 100) {
-                            return new Result(10001, "该鸭只日龄小于100天，暂不能作为种鸭！", false);
+                            return new Result(10001, "该鸭只日龄小于100天，暂不能作为母种鸭！", false);
                         } else {
                             baseDuckInfo.setFatherNum(paramsMap.get("fatherNum"));
                             baseDuckInfo.setMotherNum(paramsMap.get("motherNum"));

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

@@ -70,7 +70,9 @@ public class DuckImmunityInfoServiceImpl extends ServiceImpl<DuckImmunityInfoMap
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("duck_num", duckImmunityInfo.getDuckNum());
         BaseDuckInfo baseDuckInfo = baseDuckInfoMapper.selectOne(queryWrapper);
-        duckImmunityInfo.setDuckId(baseDuckInfo.getUnitId());
+        duckImmunityInfo.setDuckId(baseDuckInfo.getId());
+        duckImmunityInfo.setUnitName(baseDuckInfo.getUnitName());
+        duckImmunityInfo.setUnitId(baseDuckInfo.getUnitId());
         duckImmunityInfo.setDuckNum(baseDuckInfo.getDuckNum());
         infoMapper.insert(duckImmunityInfo);
         return new Result(ResultCode.SUCCESS);

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

@@ -50,15 +50,29 @@ public class Print {
         String s2 = "";
         //健康状况
         for (DuckHealthInfo healthInfo : healthInfos) {
-            s1 = sdf.format(healthInfo.getHealthDate()) + healthInfo.getHealthResult() + ";" + "\n" + s1;
+            if ("".equals(healthInfo.getHealthResult()) || null == healthInfo.getHealthResult()) {
+                s1 = sdf.format(healthInfo.getHealthDate()) + "无"+ ";" + "\n" + s1;
+            } else {
+                s1 = sdf.format(healthInfo.getHealthDate()) + healthInfo.getHealthResult() + ";" + "\n" + s1;
+            }
         }
         //日龄体重
         for (EnvMoveCall envMoveCall : envMoveCalls) {
-            s = envMoveCall.getDayage() + "日龄 体重" + ":" + envMoveCall.getDuckWeight() + "KG;" + "\n" + s;
+            if ("".equals(envMoveCall.getDayage()) || null == envMoveCall.getDayage()) {
+                s = "0" + "日龄 体重" + ":" + envMoveCall.getDuckWeight() + "KG;" + "\n" + s;
+            } else {
+                s = envMoveCall.getDayage() + "日龄 体重" + ":" + envMoveCall.getDuckWeight() + "KG;" + "\n" + s;
+            }
+
         }
         //免疫记录
         for (DuckImmunityInfo immunityInfo : immunityInfos) {
-            s2 = sdf.format(immunityInfo.getHealthDate()) + immunityInfo.getVaccination() + ";" + "\n" + s2;
+            if (("").equals(immunityInfo.getVaccination()) || null == immunityInfo.getVaccination()) {
+                s2 = sdf.format(immunityInfo.getHealthDate()) + "无" + ";" + "\n" + s2;
+            } else {
+                s2 = sdf.format(immunityInfo.getHealthDate()) + immunityInfo.getVaccination() + ";" + "\n" + s2;
+            }
+
         }
         context.putVar("weight", s);
         context.putVar("need", duckInfo.getSpecialNeeds());