查询

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.entity.DuckBodySizeInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.guowei.admin.entity.vo.DuckBodySizeInfoVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,7 +20,7 @@ public interface DuckBodySizeInfoMapper extends BaseMapper<DuckBodySizeInfo> {
 
     List<DuckBodySizeInfoVo> listLimitInfo(String num, String farmId);
 
-    Page<DuckBodySizeInfoVo> listPageInfo(Page<DuckBodySizeInfoVo> page, String unitName, String farmId);
+    Page<DuckBodySizeInfoVo> listPageInfo(Page<DuckBodySizeInfoVo> page, @Param("chiNum") String chiNum,@Param("unitName") String unitName,@Param("farmId") String farmId);
 
     DuckBodySizeInfo getLastInfo(String duckNum);
 }

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

@@ -55,9 +55,10 @@ public class DuckBodySizeInfoServiceImpl extends ServiceImpl<DuckBodySizeInfoMap
         String farmId = paramsMap.get("farmId");
         String pageNo = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
+        String chiNum = paramsMap.get("chiNum");
         String unitName = paramsMap.get("unitName");
         Page<DuckBodySizeInfoVo> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
-        Page<DuckBodySizeInfoVo> duckBodySizeInfoPage = duckBodySizeInfoMapper.listPageInfo(page,unitName,farmId);
+        Page<DuckBodySizeInfoVo> duckBodySizeInfoPage = duckBodySizeInfoMapper.listPageInfo(page,chiNum,unitName,farmId);
         return new Result(ResultCode.SUCCESS,duckBodySizeInfoPage);
     }
 

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

@@ -56,11 +56,12 @@ public class DuckEggTextureInfoServiceImpl extends ServiceImpl<DuckEggTextureInf
     public Result listPageInfo(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String pageNo = paramsMap.get("pageNum");
+        String chiNum = paramsMap.get("chiNum");
         String pageSize = paramsMap.get("pageSize");
         String unitName = paramsMap.get("unitName");
         Page<DuckEggTextureInfo> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
         Page<DuckEggTextureInfo> duckEggTextureInfoPage = duckEggTextureInfoMapper.selectPage(page,
-                new QueryWrapper<DuckEggTextureInfo>().like("unit_name", unitName)
+                new QueryWrapper<DuckEggTextureInfo>().like(!StringUtils.isEmpty(chiNum),"chi_num",chiNum).like("unit_name", unitName)
                         .or(wrapper -> wrapper.like("chi_num", unitName).or().like("jiao_num", unitName))
                         .eq("farm_id",farmId).orderByDesc("id"));
         return new Result(ResultCode.SUCCESS,duckEggTextureInfoPage);

huimv-admin/src/main/resources/mapper/DuckBodySizeInfoMapper.xml

@@ -31,6 +31,9 @@
     <select id="listPageInfo" resultType="com.huimv.guowei.admin.entity.vo.DuckBodySizeInfoVo">
         SELECT s.*,b.day_age FROM `duck_body_size_info` s LEFT JOIN `base_duck_info` b ON s.duck_num = b.duck_num
         WHERE s.farm_id = #{farmId}
+        <if test="chiNum != null and chiNum != ''">
+        AND s.chi_num LIKE CONCAT('%', #{chiNum}, '%')
+        </if>
         <if test="unitName != null and unitName != ''">
             AND (
             s.unit_name LIKE CONCAT('%', #{unitName}, '%')