后台修改

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

@@ -168,9 +168,14 @@ public class BaseDuckInfoController {
     }
 
     @GetMapping("/printDuck")
-    public void printDuck(HttpServletResponse response, @RequestParam(name = "duckCode") String duckCode) throws Exception {
+    public void printDuck(HttpServletResponse response, @RequestParam(name = "duckCode") String duckCode,
+                          @RequestParam(name = "startTime") String startTime,
+                          @RequestParam(name = "endTime") String endTime
+                          ) throws Exception {
         Map<String, String> map = new HashMap<>();
         map.put("duckCode", duckCode);
+        map.put("startTime", startTime);
+        map.put("endTime", endTime);
         duckInfoService.printDuck(response, map);
         String path = "/opt/guowei/duckTest.xls";
         PdfUtil.returnPdfStream3(response, path, "鸭只档案列表");

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

@@ -25,5 +25,5 @@ public interface EnvMoveCallMapper extends BaseMapper<EnvMoveCall> {
 
     String listScreen3(QueryWrapper<EnvMoveCall> queryWrapper);
 
-    List<EnvMoveCall> listPrint(@Param(Constants.WRAPPER) QueryWrapper<EnvMoveCall> queryWrapper);
+    List<EnvMoveCall> listPrint(String chiNum,String startTime,String endTime);
 }

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

@@ -89,11 +89,20 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         }
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
-        queryWrapper.like(StringUtils.isNotBlank(batchNum), "batch_num", batchNum)
-                .like(StringUtils.isNotBlank(location), "unit_name", location)
-                .like(StringUtils.isNotBlank(chiNum), "chi_num", chiNum)
-                .or().like(StringUtils.isNotBlank(chiNum), "jiao_num", chiNum)
-                .orderByDesc("id");
+
+        if (ObjectUtil.isNotEmpty(chiNum) && ObjectUtil.isNotEmpty(batchNum)) {
+            queryWrapper.like(StringUtils.isNotBlank(batchNum), "batch_num", batchNum)
+                    .like(StringUtils.isNotBlank(location), "unit_name", location)
+                    .and(wrapper -> wrapper.like(StringUtils.isNotBlank(chiNum), "chi_num", chiNum)
+                            .or().like(StringUtils.isNotBlank(chiNum), "jiao_num", chiNum))
+                    .orderByDesc("id");
+        } else {
+            queryWrapper.like(StringUtils.isNotBlank(batchNum), "batch_num", batchNum)
+                    .like(StringUtils.isNotBlank(chiNum), "chi_num", chiNum)
+                    .or().like(StringUtils.isNotBlank(chiNum), "jiao_num", chiNum)
+                    .like(StringUtils.isNotBlank(location), "unit_name", location)
+                    .orderByDesc("id");
+        }
         Page<BaseDuckInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, duckInfoMapper.selectPage(page, queryWrapper));
     }
@@ -141,7 +150,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         baseDuckInfo.setGenotype(paramsMap.get("genotype"));
         BigDecimal big = new BigDecimal(paramsMap.get("nowWeight"));
         baseDuckInfo.setNowWeight(big);
-        if (StringUtils.isNotBlank(paramsMap.get("unitId"))){
+        if (StringUtils.isNotBlank(paramsMap.get("unitId"))) {
             baseDuckInfo.setUnitId(Integer.parseInt(paramsMap.get("unitId")));
         }
         if (StringUtils.isNotBlank(paramsMap.get("breedEnv"))) {
@@ -377,10 +386,10 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
             queryWrapper.eq("duck_num", duckCode);
             BaseDuckInfo baseDuckInfo = duckInfoMapper.selectOne(queryWrapper);//鸭只档案
 
-            QueryWrapper<EnvMoveCall> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("chi_num", baseDuckInfo.getChiNum()).
-                    between(StringUtils.isNotBlank(startTime), "call_date", startTime, endTime);
-            List<EnvMoveCall> envMoveCalls = moveCallMapper.listPrint(queryWrapper1);//日龄体重
+//            QueryWrapper<EnvMoveCall> queryWrapper1 = new QueryWrapper<>();
+//            queryWrapper1.eq("chi_num", baseDuckInfo.getChiNum()).
+//                    between(StringUtils.isNotBlank(startTime), "call_date", startTime, endTime);
+            List<EnvMoveCall> envMoveCalls = moveCallMapper.listPrint(baseDuckInfo.getChiNum(),startTime,endTime);//日龄体重
 
             QueryWrapper<EnvRegularCallFeeding> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("chi_num", baseDuckInfo.getChiNum()).
@@ -434,7 +443,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
 
     @Transactional
     @Override
-    public Result importData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap, MultipartFile files)throws Exception {
+    public Result importData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap, MultipartFile files) throws Exception {
         String farmId = paramsMap.get("farmId");
 
         Map<String, String> map = new HashMap<>();
@@ -473,7 +482,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                     BaseBuilding baseBuilding = buildingMapper.selectOne(queryWrapper);
                     Integer integer = baseMapper.selectCount(new QueryWrapper<BaseDuckInfo>().lambda()
                             .eq(BaseDuckInfo::getUnitId, baseBuilding.getId()).eq(BaseDuckInfo::getFarmId, farmId)
-                            .eq(BaseDuckInfo::getIsCage, 0).ne(BaseDuckInfo::getChiNum,breed.getChiNum()));
+                            .eq(BaseDuckInfo::getIsCage, 0).ne(BaseDuckInfo::getChiNum, breed.getChiNum()));
                     if (integer > 0) {
                         return new Result(10001, breed.getUnitName() + "已存在鸭只!", false);
                     }
@@ -554,7 +563,6 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                 }
 
 
-
                 BaseDuckInfo baseDuckInfo = new BaseDuckInfo();
                 BeanUtil.copyProperties(breed, baseDuckInfo);
 

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

@@ -4,14 +4,14 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.huimv.guowei.admin.entity.EnvMoveCall">
-        <id column="id" property="id" />
-        <result column="call_name" property="callName" />
-        <result column="call_code" property="callCode" />
-        <result column="duck_num" property="duckNum" />
-        <result column="duck_weight" property="duckWeight" />
-        <result column="call_date" property="callDate" />
-        <result column="dayage" property="dayage" />
-        <result column="farm_id" property="farmId" />
+        <id column="id" property="id"/>
+        <result column="call_name" property="callName"/>
+        <result column="call_code" property="callCode"/>
+        <result column="duck_num" property="duckNum"/>
+        <result column="duck_weight" property="duckWeight"/>
+        <result column="call_date" property="callDate"/>
+        <result column="dayage" property="dayage"/>
+        <result column="farm_id" property="farmId"/>
         <result column="duck_id" property="duckId"/>
         <result column="unit_id" property="unitId"/>
         <result column="unit_name" property="unitName"/>
@@ -44,9 +44,13 @@
     </select>
 
     <select id="listPrint" resultType="com.huimv.guowei.admin.entity.EnvMoveCall">
-        SELECT * FROM `env_move_call`
-         ${ew.customSqlSegment}
-        GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
-        ORDER BY call_date ASC
+        SELECT a.*  FROM `env_move_call` a
+INNER JOIN
+(select max(call_date) da FROM `env_move_call` where chi_num='${chiNum}'
+<if test="startTime!=null and startTime!=''">
+        and call_date between '${startTime}' and '${endTime}'
+</if>
+GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d'))
+AS b ON a.call_date=b.da
     </select>
 </mapper>