From 9b1860f14489c81a9dd581d29e83289a5e114ace Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Mon, 12 Jul 2021 09:02:43 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 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 295413f..8e39c76 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml @@ -854,10 +854,14 @@ 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> + <update id="updateInvalidProjUse" > + update sys_proj_use set STATUS='无效' + where + ( date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d') + or SURPLUS_COUNT=0 + or balance =0 ) + and STATUS='有效' + </update> <resultMap type="SysProjUse" id="TaoCanWithProjMap"> @@ -896,6 +900,7 @@ <result property="timeLength" column="proj_time_length"/> <result property="img" column="proj_img"/> <result property="projId" column="proj_projId"/> + <result property="status" column="proj_status"/> </collection> </resultMap> @@ -911,6 +916,7 @@ e.SURPLUS_COUNT proj_SURPLUS_COUNT, e.id proj_info_id, e.proj_id proj_projId, + e.status proj_status, f.time_length proj_time_length, f.img proj_img from sys_proj_use a -- Gitblit v1.9.1