修改猪舍档案

shiwan/admin/src/main/java/com/huimv/admin/controller/secondary/DaLqdaController.java

@@ -18,7 +18,8 @@ public class DaLqdaController {
 	private DaLqdaService service;
 
 	@RequestMapping("/add")
-	public Result add(DaLqda childcareEntity){ return service.add(childcareEntity); }
+	public Result add(DaLqda childcareEntity){
+		return service.add(childcareEntity); }
 
 	@RequestMapping("/remove")
 	public Result remove(Integer[] ids){ return service.remove(ids); }
@@ -30,6 +31,7 @@ public class DaLqdaController {
 	public Result findAllById(Integer id){ return service.findAllById(id); }
 
 
+
 	@RequestMapping("/findAll")  //查单个  栏期下面的所有记录数据   点开查看详细信息
 	//猪舍id   现在改成牧场id来用
 	public Result findAll(String name ,Integer pageNum , Integer pageSize){

shiwan/admin/src/main/java/com/huimv/admin/domain/secondary/DaLqda.java

@@ -1,186 +1,94 @@
 package com.huimv.admin.domain.secondary;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.persistence.*;
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 
-/**
- * 档案-栏期信息
- */
+import javax.persistence.*;
+
 @Data
 @Entity
 @Table(name = "da_lqda")
 public class DaLqda implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @Id
-    @Column(name = "ID", nullable = false)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer ID;
-
-    /**
-     * 牧场编号
-     */
-    @Column(name = "ZSID", nullable = false)
-    private Integer ZSID;
-
-    /**
-     * 栏期名称
-     */
-    @Column(name = "LQMC")
-    private String LQMC;
-
-    /**
-     * 建栏时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
-    @Column(name = "JLSJ")
-    private Date JLSJ;
-
-    /**
-     * 计划栏结束时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
-    @Column(name = "JHLJSSJ")
-    private Date JHLJSSJ;
-
-    /**
-     * 实际栏结束时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
-    @Column(name = "SJLJSSJ")
-    private Date SJLJSSJ;
-
-    /**
-     * 入栏平均体重
-     */
-    @Column(name = "RLPJTZ")
-    private BigDecimal RLPJTZ;
-
-    /**
-     * 在栏动物数
-     */
-    @Column(name = "ZLS")
-    private BigDecimal ZLS;
-
-    /**
-     * 入栏动物数
-     */
-    @Column(name = "RLS")
-    private BigDecimal RLS;
-
-    /**
-     * 死亡动物数
-     */
-    @Column(name = "SWS")
-    private BigDecimal SWS;
-
-    /**
-     * 售出动物数
-     */
-    @Column(name = "SCS")
-    private BigDecimal SCS;
-
-    /**
-     * 隔离动物数
-     */
-    @Column(name = "GLS")
-    private BigDecimal GLS;
-
-    /**
-     * 耳标丢失数
-     */
-    @Column(name = "EBDSS")
-    private BigDecimal EBDSS;
-
-    /**
-     * 管理员
-     */
-    @Column(name = "GLY")
-    private String GLY;
-
-    /**
-     * 挑选开始日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
-    @Column(name = "TXKSRQ")
-    private Date TXKSRQ;
-
-    /**
-     * 挑选开始标识
-     */
-    @Column(name = "TXKSBZ")
-    private BigDecimal TXKSBZ;
-
-    /**
-     * 统计开始日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
-    @Column(name = "TJKSRQ")
-    private Date TJKSRQ;
-
-    /**
-     * 初始遗留饲料量
-     */
-    @Column(name = "CSYLSLL")
-    private BigDecimal CSYLSLL;
-
-    /**
-     * 结束剩余饲料量
-     */
-    @Column(name = "JSSYSLL")
-    private BigDecimal JSSYSLL;
-
-    /**
-     * 修改人
-     */
-    @Column(name = "XGR")
-    private String XGR;
-
-    /**
-     * 修改时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
-    @Column(name = "XGSJ")
-    private Date XGSJ;
-
-    /**
-     * 作废标识
-     */
-    @Column(name = "ZFBZ")
-    private Integer ZFBZ;
-
-    /**
-     * 出栏数
-     */
-    @Column(name = "CLS")
-    private BigDecimal CLS;
-
-    /**
-     * 淘汰数
-     */
-    @Column(name = "TTS")
-    private BigDecimal TTS;
-
-    /**
-     * 体重统计时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
-    @Column(name = "TZTJSJ")
-    private Date TZTJSJ;
-
-    /**
-     * 入栏日龄
-     */
-    @Column(name = "RLRL")
-    private String RLRL;
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "ID")
+	private Integer id;
+
+	@Column(name = "ZSID")
+	private Integer zsid;
+
+	@Column(name = "LQMC")
+	private String lqmc;
+
+	@Column(name = "JLSJ")
+	private java.sql.Date jlsj;
+
+	@Column(name = "JHLJSSJ")
+	private java.sql.Date jhljssj;
+
+	@Column(name = "SJLJSSJ")
+	private java.sql.Date sjljssj;
+
+	@Column(name = "RLPJTZ")
+	private Double rlpjtz;
+
+	@Column(name = "ZLS")
+	private Double zls;
+
+	@Column(name = "RLS")
+	private Double rls;
+
+	@Column(name = "SWS")
+	private Double sws;
+
+	@Column(name = "SCS")
+	private Double scs;
+
+	@Column(name = "GLS")
+	private Double gls;
+
+	@Column(name = "EBDSS")
+	private Double ebdss;
+
+	@Column(name = "GLY")
+	private String gly;
+
+	@Column(name = "TXKSRQ")
+	private java.sql.Date txksrq;
+
+	@Column(name = "TXKSBZ")
+	private Double txksbz;
+
+	@Column(name = "TJKSRQ")
+	private java.sql.Date tjksrq;
+
+	@Column(name = "CSYLSLL")
+	private Double csylsll;
+
+	@Column(name = "JSSYSLL")
+	private Double jssysll;
+
+	@Column(name = "XGR")
+	private String xgr;
+
+	@Column(name = "XGSJ")
+	private java.util.Date xgsj;
+
+	@Column(name = "ZFBZ")
+	private Integer zfbz;
+
+	@Column(name = "CLS")
+	private Double cls;
+
+	@Column(name = "TTS")
+	private Double tts;
+
+	@Column(name = "TZTJSJ")
+	private java.util.Date tztjsj;
+
+	@Column(name = "RLRL")
+	private String rlrl;
 
 }

shiwan/admin/src/main/java/com/huimv/admin/repo/secondary/DaLqdaRepository.java

@@ -11,8 +11,14 @@ public interface DaLqdaRepository extends JpaRepository<DaLqda, Integer>, JpaSpe
 
     @Query(nativeQuery = true ,value = "select * from da_lqda where zsid like %?1%   limit ?2 , ?3")
 
+    List<DaLqda> findAll(String name, Integer startPage, Integer pageSize);
+
+
+
+    @Query(nativeQuery = true ,value = " SELECT  * FROM  da_lqda ORDER BY id DESC  LIMIT 1   ")
+    DaLqda  findlast();
+
 
-    List<DaLqda> findAll(String name,  Integer startPage, Integer pageSize);
 
 
     @Query(nativeQuery = true ,value = "SELECT MAX(id) FROM da_zsda ")

shiwan/admin/src/main/java/com/huimv/admin/service/secondary/impl/DaLqdaServiceImpl.java

@@ -2,7 +2,9 @@ package com.huimv.admin.service.secondary.impl;
 
 
 import com.huimv.admin.domain.secondary.DaLqda;
+import com.huimv.admin.domain.secondary.DaZsda;
 import com.huimv.admin.repo.secondary.DaLqdaRepository;
+import com.huimv.admin.repo.secondary.DaZsdaRepository;
 import com.huimv.admin.service.secondary.DaLqdaService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;
@@ -14,6 +16,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.Optional;
 
 @Service
 @DS("thired")
@@ -22,14 +25,27 @@ public class DaLqdaServiceImpl implements DaLqdaService {
 	@Autowired
 	private DaLqdaRepository rep;
 
+	@Autowired
+	private DaZsdaRepository  daZsdaRepository;
+
 	@Override
 	public Result add(DaLqda entity){
 		if (entity == null){
-
 			return new Result(ResultCode.FAIL);
 		}
-		try {
+		//try {    //同时更新猪舍档案   添加数据
+
 			rep.save(entity);
+
+
+			//存储结束 获取最新一条
+			DaLqda daLqda = rep.findlast();
+			Integer ids = daLqda.getId();
+			Integer zsid = daLqda.getZsid();
+			//查找到猪舍档案，存储当前栏期
+			DaZsda daZsda = daZsdaRepository.findById(zsid).get();
+			daZsda.setDqlq(ids+"");
+
 			/*entity.setMcid(11);
 			Integer  id = rep.findMax().get(0);
 			entity.setXgsj(new Date());
@@ -39,9 +55,9 @@ public class DaLqdaServiceImpl implements DaLqdaService {
 			rep.save(entity);*/
 
 			return new Result(ResultCode.SUCCESS);
-		}catch (Exception e){
-			return new Result(ResultCode.FAIL);
-		}
+		//}catch (Exception e){
+			//return new Result(ResultCode.FAIL);
+		//}
 	}
 
 
@@ -94,7 +110,6 @@ public class DaLqdaServiceImpl implements DaLqdaService {
 
 
 
-
 	@Override
 	public Result findAllById(Integer id) {
 		try {