From 6daf3ccd465e4838d57d03051336365e087ab328 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 17 Jan 2025 14:04:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=A3=80=E9=AA=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/business/SupAoolyMapper.xml       | 5 +++--
 .../resources/mappers/business/backstage/ContractMapper.xml  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mappers/business/SupAoolyMapper.xml b/src/main/resources/mappers/business/SupAoolyMapper.xml
index e128d10..2620053 100644
--- a/src/main/resources/mappers/business/SupAoolyMapper.xml
+++ b/src/main/resources/mappers/business/SupAoolyMapper.xml
@@ -40,9 +40,10 @@
     </update>
     <select id="getPageList" resultType="com.bonus.aqgqj.business.backstage.entity.SupApplyVo">
         select  spos.sup_name supName,spos.sup_id supId,count(spos.pro_id) proNum,spos.contract_id contractId,
-                if(CURRENT_DATE()  between  sc.start_time and   sc.end_time,'已生效','未生效') status
+        if(CURRENT_DATE() BETWEEN 	sc.start_time and sc.end_time,'已生效', if(CURRENT_DATE() &lt; sc.start_time,'未生效','已失效')) status
+
         from  st_plan_out_sup  spos
-                  LEFT JOIN st_contract sc on sc.id=spos.contract_id
+            LEFT JOIN st_contract sc on sc.id=spos.contract_id
         <where >
                 <if test="keyWord!=null and keyWord!=''">
                         and  spos.sup_name like concat('%',#{keyWord},'%')
diff --git a/src/main/resources/mappers/business/backstage/ContractMapper.xml b/src/main/resources/mappers/business/backstage/ContractMapper.xml
index 1519fb9..955ed69 100644
--- a/src/main/resources/mappers/business/backstage/ContractMapper.xml
+++ b/src/main/resources/mappers/business/backstage/ContractMapper.xml
@@ -66,7 +66,7 @@
         stc.is_active isActive, stc.creator,ifNULL(file.num,0) fileNum,
         stc.create_time createTime, stc.updater,
         stc.update_time updateTime, stc.remark,
-        if(CURRENT_DATE()  between  stc.start_time and   stc.end_time,'已生效','未生效') status
+        if(CURRENT_DATE() BETWEEN 	stc.start_time and stc.end_time,'已生效', if(CURRENT_DATE() &lt; stc.start_time,'未生效','已失效')) status
         from st_contract stc
         left join(
         select count(1) num,own_id  from  bm_file_upload file  where  model_table='st_contract'  GROUP BY own_id