蛋质

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

@@ -11,6 +11,7 @@ import com.huimv.guowei.admin.service.IDuckEggTextureInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -36,6 +37,11 @@ public class DuckEggTextureInfoController {
         if (baseDuckInfo.getDuckSex() == 0){
             return new Result(10001,"雄鸭无法新增蛋质信息!",false);
         }
+        Date determineTime = duckEggTextureInfo.getDetermineTime();
+        Date layEggsTime = duckEggTextureInfo.getLayEggsTime();
+        if (layEggsTime.compareTo(determineTime) > 0){
+            return new Result(10001,"产蛋日期不能晚于测定日期!",false);
+        }
         duckEggTextureInfoService.save(duckEggTextureInfo);
         return Result.SUCCESS();
     }

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

@@ -34,7 +34,7 @@ public class DuckEggTextureInfoServiceImpl extends ServiceImpl<DuckEggTextureInf
         String farmId = paramsMap.get("farmId");
         String num = paramsMap.get("num");
         List<DuckEggTextureInfo> duckEggTextureInfoList = duckEggTextureInfoMapper.selectList(new QueryWrapper<DuckEggTextureInfo>()
-                .eq("farm_id",farmId).orderByDesc("determine_time").last("limit "+num));
+                .eq("farm_id",farmId).orderByDesc("id").last("limit "+num));
         return new Result(ResultCode.SUCCESS,duckEggTextureInfoList);
     }
 

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

@@ -34,7 +34,7 @@ public class DuckIncubateInfoServiceImpl extends ServiceImpl<DuckIncubateInfoMap
         String farmId = paramsMap.get("farmId");
         String num = paramsMap.get("num");
         List<DuckIncubateInfo> duckIncubateInfoList = duckIncubateInfoMapper.selectList(new QueryWrapper<DuckIncubateInfo>()
-                .eq("farm_id",farmId).orderByDesc("incubate_time").last("limit "+num));
+                .eq("farm_id",farmId).orderByDesc("id").last("limit "+num));
         return new Result(ResultCode.SUCCESS,duckIncubateInfoList);
     }
 

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

@@ -25,12 +25,12 @@
 
     <select id="listLimitInfo" 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} ORDER BY s.measure_date DESC LIMIT ${num}
+        WHERE s.farm_id = #{farmId} ORDER BY s.id DESC LIMIT ${num}
     </select>
 
     <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.measure_date DESC
+        WHERE s.farm_id = #{farmId} AND s.unit_name Like '%${unitName}%' ORDER BY s.id DESC
     </select>
 
     <select id="getLastInfo" resultType="com.huimv.guowei.admin.entity.DuckBodySizeInfo">