From 4e214289ec907ecb1d14de3e6fcd17b4582257f0 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 12 Jul 2021 19:17:02 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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 0053d74..d4f103b 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -165,7 +165,8 @@
 		proj_name,
 		tcName,
 		deductionNum,
-		is_course
+		is_course,
+	    create_by
 		)
 		VALUES (
 		#{id},
@@ -187,7 +188,8 @@
 		#{projName},
 		#{tcName},
 		#{deductionNum},
-		#{isCourse}
+		#{isCourse},
+		#{createBy}
 		)
 	</insert>
 
@@ -334,7 +336,8 @@
         a.*,
         d.id as orderId,
         b.TIME_LENGTH,
-        b.img
+        b.img,
+        b.code
         from sys_proj_use a
         left join shopping_goods b on a.proj_id=b.id
         left join sys_order_item c on a.ORDER_ITEM_ID=c.id
@@ -525,11 +528,8 @@
 
     <!-- 根据id查询 -->
     <select id="selectById" resultMap="SysProjUseMap">
-		select a.*,
-        b.TIME_LENGTH,
-        b.img
+		select a.*
         from sys_proj_use a
-        left join shopping_goods b on a.proj_id=b.id
 		where
 		a.id=#{id}
 	</select>
@@ -859,4 +859,8 @@
     </select>
 
 
+    <select id="selectProjUse" resultMap="SysProjUseMap">
+        select * from sys_proj_use
+        where is_course='N'
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1