From c0691d2302bbaed2a47b2b703b83ed5bc204e397 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 14:31:10 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index 29058ae..1326760 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -237,6 +237,9 @@
             <if test="record.id != null and record.id !='' ">
                 and a.ID = #{record.id}
             </if>
+            <if test="record.queryKey != null and record.queryKey !='' ">
+                and (instr(b.name, #{record.queryKey}) or instr(b.zjm, #{record.queryKey}) or instr(goods_no, #{record.queryKey}))
+            </if>
             <if test="record.orderItemId != null and record.orderItemId !='' ">
                 and a.ORDER_ITEM_ID = #{record.orderItemId}
             </if>
@@ -424,8 +427,11 @@
     <!-- 根据对象查询 -->
     <select id="selectByModel" resultMap="SysProjUseMap">
         select
-        a.*
+        a.*,
+        b.time_length,
+        b.img
         from sys_proj_use a
+        left join shopping_goods b on a.proj_id=b.id
         where 1=1
         <if test="record!=null">
             <if test="record.id != null and record.id !='' ">
@@ -724,4 +730,9 @@
         group by b.id) t
     </select>
 
+    <select id="selectHasValidProjUse" resultMap="SysProjUseMap">
+        select * from sys_proj_use
+        where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d') and STATUS='有效'
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1