From be98bd60f3332f4960d8a5a27778e2d6c2cdcb7f Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 15:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 99f36ef..d3edbfd 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -375,7 +375,7 @@
and a.FAIL_TIME = #{record.failTime}
</if>
<if test="record.targetFailTime != null ">
- and date_format(#{record.failTime}, '%Y-%m-%d') > date_format(a.FAIL_TIME, '%Y-%m-%d')
+ and date_format(#{record.targetFailTime}, '%Y-%m-%d') > date_format(a.FAIL_TIME, '%Y-%m-%d')
</if>
<if test="record.price != null and record.price !='' ">
and a.PRICE = #{record.price}
@@ -510,10 +510,13 @@
<!-- 根据id查询 -->
<select id="selectById" resultMap="SysProjUseMap">
- select *
- from sys_proj_use
+ select a.*,
+ b.TIME_LENGTH,
+ b.img
+ from sys_proj_use a
+ left join shopping_goods b on a.proj_id=b.id
where
- id=#{id}
+ a.id=#{id}
</select>
<!-- 根据id查询 -->
@@ -739,7 +742,7 @@
and a.proj_name like concat('%',#{projName},'%')
</if>
<if test="cateId != null and cateId != '' ">
- and b.PROJ_TYPE_ID=#{cateId}
+ and b.cate_id=#{cateId}
</if>
</where>
--
Gitblit v1.9.1