Newspaper 1 rok temu
rodzic
commit
971f608829

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

@@ -60,7 +60,10 @@ public class DuckEggTextureInfoServiceImpl extends ServiceImpl<DuckEggTextureInf
         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).eq("farm_id",farmId).orderByDesc("id"));
+                new QueryWrapper<DuckEggTextureInfo>().like("unit_name",unitName)
+                        .or().like("chi_num",unitName)
+                        .or().like("jiao_num",unitName)
+                        .eq("farm_id",farmId).orderByDesc("id"));
         return new Result(ResultCode.SUCCESS,duckEggTextureInfoPage);
     }
     @Override

+ 4 - 1
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckIncubateInfoServiceImpl.java

@@ -46,7 +46,10 @@ public class DuckIncubateInfoServiceImpl extends ServiceImpl<DuckIncubateInfoMap
         String unitName = paramsMap.get("unitName");
         Page<DuckIncubateInfo> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
         Page<DuckIncubateInfo> duckIncubateInfoPage = duckIncubateInfoMapper.selectPage(page,
-                new QueryWrapper<DuckIncubateInfo>().eq("farm_id",farmId).like("unit_name",unitName).orderByDesc("id"));
+                new QueryWrapper<DuckIncubateInfo>().eq("farm_id",farmId)
+                        .like("unit_name",unitName)
+                        .or().like("chi_num",unitName)
+                        .or().like("jiao_num",unitName).orderByDesc("id"));
         return new Result(ResultCode.SUCCESS,duckIncubateInfoPage);
     }
 

+ 5 - 1
huimv-admin/src/main/resources/mapper/DuckBodySizeInfoMapper.xml

@@ -30,7 +30,11 @@
 
     <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} AND s.unit_name Like '%${unitName}%' ORDER BY s.id DESC
+        WHERE s.farm_id = #{farmId}
+        <if test="unitName != null and unitName != ''">
+            or s.unit_name LIKE '%${unitName}%' or s.chi_num LIKE '%${unitName}%' or s.jiao_num LIKE '%${unitName}%'
+        </if>
+        ORDER BY s.id DESC
     </select>
 
     <select id="getLastInfo" resultType="com.huimv.guowei.admin.entity.DuckBodySizeInfo">