接受数据修改7

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

@@ -6,6 +6,7 @@ import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.entity.Departure;
+import com.huimv.guowei.admin.entity.vo.DepartureVo;
 import com.huimv.guowei.admin.service.IBaseDuckInfoService;
 import com.huimv.guowei.admin.service.IDepartureService;
 import com.huimv.guowei.admin.service.IDuckHealthInfoService;
@@ -17,11 +18,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author author
@@ -40,11 +44,36 @@ public class DepartureController {
     public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return departureService.list(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listByDuckId")
     public Result listByDuckId(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
-        return new Result(ResultCode.SUCCESS,departureService.getById(id));
+        Departure departure = departureService.getById(id);
+        if (1 == departure.getType()) {
+            return new Result(ResultCode.SUCCESS, departure);
+        } else {
+            QueryWrapper<Departure> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("batch_num", departure.getBatchNum()).eq("farm_id", departure.getFarmId());
+            List<Departure> departures = departureService.list(queryWrapper1);
+            DepartureVo departureVo = new DepartureVo();
+            departureVo.setBatchNum(departure.getBatchNum());
+            departureVo.setDate(departures.get(0).getDate());
+            departureVo.setFarmId(departure.getFarmId());
+            String s = "";
+            for (int i = 0; i < departures.size(); i++) {
+                if (i == departures.size() - 1) {
+                    s = s + departures.get(i).getChiNum();
+                } else {
+                    s = s + departures.get(i).getChiNum() + ",";
+                }
+            }
+            departureVo.setReason(departures.get(0).getReason());
+            departureVo.setChiNum(s);
+            departureVo.setType(2);
+            return new Result(ResultCode.SUCCESS, departureVo);
+        }
     }
+
     @RequestMapping("/listSelect")
     public Result listSelect(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return departureService.listSelect(httpServletRequest, paramsMap);
@@ -63,6 +92,7 @@ public class DepartureController {
         departure.setChiNum(infoServiceOne.getChiNum());
         departure.setJiaoNum(infoServiceOne.getJiaoNum());
         departure.setBatchNum(infoServiceOne.getBatchNum());
+        departure.setType(1);
         departureService.save(departure);
         infoService.updateById(infoServiceOne);
         return new Result(10000, "添加成功！", true);
@@ -73,6 +103,7 @@ public class DepartureController {
         departureService.updateById(departure);
         return new Result(10000, "修改成功！", true);
     }
+
     @RequestMapping("/deleteDuck")
     public Result deleteDuck(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
@@ -81,7 +112,7 @@ public class DepartureController {
     }
 
     @RequestMapping("/editBatch")
-    public Result editBatch(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+    public Result editBatch(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return departureService.editBatch(httpServletRequest, paramsMap);
     }
 }

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

@@ -65,4 +65,6 @@ public class Departure implements Serializable {
 
     private String batchNum;
 
+    private Integer type;
+
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/DepartureVo.java

@@ -0,0 +1,54 @@
+package com.huimv.guowei.admin.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("departure")
+public class DepartureVo implements Serializable {
+
+//    private static final long serialVersionUID = 1L;
+//
+//    /**
+//     * id
+//     */
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Integer id;
+
+
+    /**
+     * 离场日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date date;
+
+
+    private Integer farmId;
+
+    private String chiNum;
+
+    private String batchNum;
+
+    private Integer type;
+
+    private String reason;
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IDepartureService.java

@@ -5,6 +5,7 @@ import com.huimv.guowei.admin.entity.Departure;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
 import java.util.Map;
 
 /**
@@ -22,6 +23,6 @@ public interface IDepartureService extends IService<Departure> {
 
     Result listBatch(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
-    Result editBatch(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+    Result editBatch(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws ParseException;
 
 }

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

@@ -18,6 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +50,7 @@ public class DepartureServiceImpl extends ServiceImpl<DepartureMapper, Departure
         queryWrapper.eq("farm_id", farmId)
                 .like(StringUtils.isNotBlank(unitName),"unit_name", unitName)
                 .orderByDesc("date").last(" limit 10");
+
         return new Result(ResultCode.SUCCESS, departureMapper.selectList(queryWrapper));
     }
 
@@ -77,9 +80,12 @@ public class DepartureServiceImpl extends ServiceImpl<DepartureMapper, Departure
     }
 
     @Override
-    public Result editBatch(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+    public Result editBatch(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
         String farmId = paramsMap.get("farmId");
         String batchNum = paramsMap.get("batchNum");
+        String reason = paramsMap.get("reason");
+        String date = paramsMap.get("date");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("batch_num", batchNum);
         List<BaseDuckInfo> baseDuckInfos = infoMapper.selectList(queryWrapper);
@@ -90,11 +96,13 @@ public class DepartureServiceImpl extends ServiceImpl<DepartureMapper, Departure
                 departure.setBatchNum(baseDuckInfo.getBatchNum());
                 departure.setJiaoNum(baseDuckInfo.getJiaoNum());
                 departure.setChiNum(baseDuckInfo.getChiNum());
-                departure.setDate(new Date());
+                departure.setDate(sdf.parse(date));
                 departure.setFarmId(baseDuckInfo.getFarmId());
                 departure.setUnitName(baseDuckInfo.getUnitName());
                 departure.setUnitId(baseDuckInfo.getUnitId());
                 departure.setDuckNum(baseDuckInfo.getDuckNum());
+                departure.setReason(reason);
+                departure.setType(2);
                 infoMapper.updateById(baseDuckInfo);
                 departureMapper.insert(departure);
             }