From f1a2082d8b49e7483e2ef676450ae172d0ffb127 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 14 Sep 2022 15:29:52 +0800
Subject: [PATCH] 小程序查询采收列表增加溯源id

---
 src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml |   26 +++++++++++++++++---------
 src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java        |    4 ++++
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml         |    2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
index f00b69c..6a5eaac 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -4,10 +4,11 @@
 
     <!--自定义查询采收记录分页数据-->
     <select id="selectRecoveryPage" resultType="org.springblade.modules.recovery.vo.RecoveryVO">
-        select sr.*,sl.land_name landName,ss.strain_name strainName,user.real_name as realName from sys_recovery sr
+        select sr.*,sl.land_name landName,ss.strain_name strainName,user.real_name as realName,GROUP_CONCAT(tr.id) AS trIds from sys_recovery sr
         left join sys_land sl on sl.id = sr.land_id
         left join sys_strain ss on ss.id = sr.strain_id
         left join blade_user user ON user.id = sr.operator
+        LEFT JOIN sys_traceability tr ON tr.recovery_id = sr.id
         where 1=1
         <if test="recovery.strainName!=null and recovery.strainName!=''">
             and ss.strain_name like concat ('%',#{recovery.strainName},'%')
@@ -34,6 +35,13 @@
         <if test="recovery.tenantId!=null and recovery.tenantId!=''">
             and sr.tenant_id = #{recovery.tenantId}
         </if>
+        <if test="recovery.startTime != null and recovery.startTime !=''">
+            AND DATE_FORMAT(sr.time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+        </if>
+        <if test="recovery.endTime != null and recovery.endTime !=''">
+            and DATE_FORMAT(sr.time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+        </if>
+        GROUP BY sr.id
         ORDER BY sr.create_time DESC
     </select>
 
@@ -66,10 +74,10 @@
             AND sr.dept_id = #{recovery.deptId}
         </if>
         <if test="recovery.startTime != null and recovery.startTime !=''">
-            AND DATE_FORMAT(sr.create_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+            AND DATE_FORMAT(sr.time,'%Y-%m-%d') &gt;= #{recovery.startTime}
         </if>
         <if test="recovery.endTime != null and recovery.endTime !=''">
-            and DATE_FORMAT(sr.create_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+            and DATE_FORMAT(sr.time,'%Y-%m-%d') &lt;= #{recovery.endTime}
         </if>
         GROUP BY sr.strain_id
         UNION
@@ -82,10 +90,10 @@
             AND l.farm_id = #{recovery.deptId}
         </if>
         <if test="recovery.startTime != null and recovery.startTime !=''">
-            AND DATE_FORMAT(p.create_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+            AND DATE_FORMAT(p.sale_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
         </if>
         <if test="recovery.endTime != null and recovery.endTime !=''">
-            and DATE_FORMAT(p.create_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+            and DATE_FORMAT(p.sale_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
         </if>
         GROUP BY p.process_id,l.farm_id
     </select>
@@ -98,10 +106,10 @@
             AND sr.dept_id = #{recovery.deptId}
         </if>
         <if test="recovery.startTime != null and recovery.startTime !=''">
-            AND DATE_FORMAT(sr.create_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+            AND DATE_FORMAT(sr.time,'%Y-%m-%d') &gt;= #{recovery.startTime}
         </if>
         <if test="recovery.endTime != null and recovery.endTime !=''">
-            and DATE_FORMAT(sr.create_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+            and DATE_FORMAT(sr.time,'%Y-%m-%d') &lt;= #{recovery.endTime}
         </if>
         <if test="recovery.strainType != null and recovery.strainType !=''">
             AND strain.strain_type = #{recovery.strainType}
@@ -117,10 +125,10 @@
             AND l.farm_id = #{recovery.deptId}
         </if>
         <if test="recovery.startTime != null and recovery.startTime !=''">
-            AND DATE_FORMAT(p.create_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
+            AND DATE_FORMAT(p.sale_time,'%Y-%m-%d') &gt;= #{recovery.startTime}
         </if>
         <if test="recovery.endTime != null and recovery.endTime !=''">
-            and DATE_FORMAT(p.create_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
+            and DATE_FORMAT(p.sale_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
         </if>
         GROUP BY p.process_id,l.farm_id
     </select>
diff --git a/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java b/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
index 0bc2c2a..a813f47 100644
--- a/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
+++ b/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
@@ -55,4 +55,8 @@
 	 * 产业类型（0：种植业 1：水产业 2：禽畜业）
 	 */
 	private String strainType;
+	/**
+	 * 溯源码ids
+	 */
+	private String trIds;
 }
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 60a03c4..b2b206a 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -218,7 +218,7 @@
         1 = 1
         AND ( st.STATUS = '1' OR st.STATUS = '2' )
         AND st.create_time like concat('%',#{task.year},'%')
-        AND now() > st.time
+        AND now() > DATE_ADD(st.time,INTERVAL 1 DAY)
         AND sl.farm_id = #{task.farmId}
         AND st.is_deleted = 0
     </select>

--
Gitblit v1.9.3