LQDA-1

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

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

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

@@ -1,5 +1,6 @@
 package com.huimv.admin.domain.secondary;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -40,18 +41,21 @@ public class DaLqda implements Serializable {
     /**
      * 建栏时间
      */
+    @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;
 
@@ -106,6 +110,7 @@ public class DaLqda implements Serializable {
     /**
      * 挑选开始日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
     @Column(name = "TXKSRQ")
     private Date TXKSRQ;
 
@@ -118,6 +123,7 @@ public class DaLqda implements Serializable {
     /**
      * 统计开始日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
     @Column(name = "TJKSRQ")
     private Date TJKSRQ;
 
@@ -142,6 +148,7 @@ public class DaLqda implements Serializable {
     /**
      * 修改时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
     @Column(name = "XGSJ")
     private Date XGSJ;
 
@@ -166,6 +173,7 @@ public class DaLqda implements Serializable {
     /**
      * 体重统计时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8")
     @Column(name = "TZTJSJ")
     private Date TZTJSJ;
 

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

@@ -9,10 +9,11 @@ import java.util.List;
 
 public interface DaLqdaRepository extends JpaRepository<DaLqda, Integer>, JpaSpecificationExecutor<DaLqda> {
 
-    @Query(nativeQuery = true ,value = "select * from da_lqda where mcid like %?1% and MCID = 11 and ZFBZ = 0 limit ?2 , ?3")
-    List<DaLqda> findAll(String name, Integer startPage, Integer pageSize);
+    @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 MAX(id) FROM da_zsda ")
     List<Integer> findMax();