孵化日期范围

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

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -37,7 +39,7 @@ public class DuckEggTextureInfoController {
     private IBaseDuckInfoService baseDuckInfoService;
 
     @PostMapping("/addInfo")
-    public Result addInfo(@RequestBody DuckEggTextureInfo duckEggTextureInfo){
+    public Result addInfo(@RequestBody DuckEggTextureInfo duckEggTextureInfo) throws ParseException {
         BaseDuckInfo baseDuckInfo = baseDuckInfoService.getOne(new QueryWrapper<BaseDuckInfo>().eq("duck_num", duckEggTextureInfo.getDuckNum()));
         if (baseDuckInfo.getDuckSex() == 0){
             return new Result(10001,"雄鸭无法新增蛋质信息!",false);
@@ -46,12 +48,19 @@ public class DuckEggTextureInfoController {
             return new Result(10001,"鸭只已离场!",false);
         }
         Date determineTime = duckEggTextureInfo.getDetermineTime();
-        Date layEggsTime = duckEggTextureInfo.getLayEggsTime();
+        String layEggsTime = duckEggTextureInfo.getLayEggsTime();
         duckEggTextureInfo.setDuckId(baseDuckInfo.getId());
         duckEggTextureInfo.setChiNum(baseDuckInfo.getChiNum());
         duckEggTextureInfo.setJiaoNum(baseDuckInfo.getJiaoNum());
         duckEggTextureInfo.setBatchNum(baseDuckInfo.getBatchNum());
-        if (layEggsTime.compareTo(determineTime) > 0){
+        String[] dateParts = layEggsTime.split("~");
+        String startDateString = dateParts[0];
+        String endDateString = dateParts[1];
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date startDate = sdf.parse(startDateString);
+        Date endDate = sdf.parse(endDateString);
+
+        if (startDate.compareTo(determineTime) > 0){
             return new Result(10001,"测定日期不能早于产蛋日期!",false);
         }
         duckEggTextureInfoService.save(duckEggTextureInfo);

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

@@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 
@@ -34,7 +36,7 @@ public class DuckIncubateInfoController {
     private IBaseDuckInfoService baseDuckInfoService;
 
     @PostMapping("/addInfo")
-    public Result addInfo(@RequestBody DuckIncubateInfo duckIncubateInfo){
+    public Result addInfo(@RequestBody DuckIncubateInfo duckIncubateInfo) throws ParseException {
         BaseDuckInfo baseDuckInfo = baseDuckInfoService.getOne(new QueryWrapper<BaseDuckInfo>().eq("duck_num", duckIncubateInfo.getDuckNum()));
         if (baseDuckInfo.getDuckSex() == 0){
             return new Result(10001,"雄鸭无法新增孵化信息!",false);
@@ -43,8 +45,14 @@ public class DuckIncubateInfoController {
             return new Result(10001,"鸭只已离场!",false);
         }
         Date incubateTime = duckIncubateInfo.getIncubateTime();
-        Date layEggsTime = duckIncubateInfo.getLayEggsTime();
-        if (layEggsTime.compareTo(incubateTime) > 0){
+        String layEggsTime = duckIncubateInfo.getLayEggsTime();
+        String[] dateParts = layEggsTime.split("~");
+        String startDateString = dateParts[0];
+        String endDateString = dateParts[1];
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date startDate = sdf.parse(startDateString);
+        Date endDate = sdf.parse(endDateString);
+        if (startDate.compareTo(incubateTime) > 0){
             return new Result(10001,"孵化日期不能早于产蛋日期!",false);
         }
         if (duckIncubateInfo.getFertilizedNum()>duckIncubateInfo.getLayEggsNum()){

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckEggTextureInfo.java

@@ -50,8 +50,8 @@ public class DuckEggTextureInfo implements Serializable {
     /**
      * 产蛋日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date layEggsTime;
+//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private String layEggsTime;
 
     /**
      * 测定日期

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckIncubateInfo.java

@@ -50,8 +50,8 @@ public class DuckIncubateInfo implements Serializable {
     /**
      * 产蛋日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date layEggsTime;
+//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private String layEggsTime;
 
     /**
      * 产蛋数量(枚)