From 91e4d0c81321f9ccfec7fca41898a00ff6f57001 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Feb 2022 15:03:25 +0800
Subject: [PATCH] merge api_score_merge
---
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 957d259..335a873 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -728,13 +728,16 @@
a.type,
a.SOURCE,
e.ORDER_NO,
- a.remark
+ a.remark,
+ s.SHOP_NAME
from sys_proj_use a
left join shopping_goods b on a.proj_id = b.id
left join sys_vip_info c on c.ID = a.VIP_ID
+ left join sys_shop_info s on c.SHOP_ID=s.id
left join sys_order_item d on d.id = a.ORDER_ITEM_ID
left join sys_order e on e.id = d.ORDER_ID
left join shopping_goods_category f on f.id = b.cate_id
+
<where>
@@ -892,6 +895,8 @@
<collection property="taocanProjUse" ofType="com.matrix.system.hive.bean.SysProjUse">
<id property="id" column="proj_info_id" />
<result property="projName" column="proj_proj_name"/>
+ <result property="source" column="proj_source"/>
+ <result property="price" column="proj_price"/>
<result property="failTime" column="proj_FAIL_TIME"/>
<result property="surplusCount" column="proj_SURPLUS_COUNT"/>
<result property="timeLength" column="proj_time_length"/>
@@ -913,6 +918,8 @@
e.SURPLUS_COUNT proj_SURPLUS_COUNT,
e.id proj_info_id,
e.proj_id proj_projId,
+ e.source proj_source,
+ e.price proj_price,
e.status proj_status,
f.time_length proj_time_length,
f.img proj_img
@@ -937,4 +944,8 @@
</if>
</select>
+ <select id="selectTaocanCountForCourseAndInfinite" resultType="java.lang.Integer">
+ select count(1) from sys_proj_use
+ where taocan_id=#{taocanId} and vip_id=#{vipId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1