From 19dc607fe5fd18531d6deaa4fe8540b602585723 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 27 Jan 2021 09:12:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 4ec9f20..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}
@@ -742,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