From 2a5bab6a898b6c35e9489ca5b26f079facaed264 Mon Sep 17 00:00:00 2001
From: TL <2445390702@qq.com>
Date: Mon, 14 Jul 2025 15:12:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/supplier/common/CoscoDateUtils.java  |  7 ++++
 .../impl/CoscoBlacklistServiceImpl.java       |  4 +-
 .../zyhy/ebtp/supplier/util/DateUtils.java    | 16 --------
 .../CoscoSupplierTianyanchaIcMapper.xml       |  2 +-
 .../dao/mapper/CoscoSupplierexitMapper.xml    | 37 ++++++++++---------
 5 files changed, 29 insertions(+), 37 deletions(-)
 delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/util/DateUtils.java

diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoDateUtils.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoDateUtils.java
index dbf8d80..c261755 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoDateUtils.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoDateUtils.java
@@ -34,6 +34,13 @@ public class CoscoDateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String YYYY_MM_DD__HH_MM_SS = "yyyy-MM-dd+HH:mm:ss";
     private static String[] parsePatterns = {"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
+    public static Date plusYears(int year){
+        LocalDate currentDate = LocalDate.now(); // 获取当前日期
+        LocalDate futureDate = currentDate.plusYears(year); // 加年限
+        return  Date.from(futureDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+    }
+
+
     /**
      * 获取当前Date型日期
      *
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java
index 77bfadd..8eb3e12 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java
@@ -8,6 +8,7 @@ import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.EvaluateTaskConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
 import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.dao.CoscoBlacklistMapper;
@@ -23,7 +24,6 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.BlackApproveVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
 import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
-import com.chinaunicom.zyhy.ebtp.supplier.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -192,7 +192,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
             coscoBlacklist.setApproveStatus(list.getApproveStatus());
             coscoBlacklist.setStartTime(new Date());
             //获取加入黑名单时间
-            coscoBlacklist.setEndTime(DateUtils.plusYears(Integer.parseInt(coscoBlacklist.getTimelimitType())));
+            coscoBlacklist.setEndTime(CoscoDateUtils.plusYears(Integer.parseInt(coscoBlacklist.getTimelimitType())));
             coscoBlacklistMapper.updateCoscoBlacklist(coscoBlacklist);
             if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(list.getApproveStatus())) {
                 CoscoBlacklistSupplier coscoBlacklistSupplier = new CoscoBlacklistSupplier();
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/util/DateUtils.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/util/DateUtils.java
deleted file mode 100644
index 23805b6..0000000
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/util/DateUtils.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.chinaunicom.zyhy.ebtp.supplier.util;
-
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Date;
-
-public class DateUtils {
-
-    public static Date plusYears(int year){
-        LocalDate currentDate = LocalDate.now(); // 获取当前日期
-        LocalDate futureDate = currentDate.plusYears(year); // 加年限
-        return  Date.from(futureDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
-    }
-
-
-}
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierTianyanchaIcMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierTianyanchaIcMapper.xml
index b5070e1..0d0b56d 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierTianyanchaIcMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierTianyanchaIcMapper.xml
@@ -27,7 +27,7 @@
             <result property="orgNumber" column="org_number"/>
             <result property="creditCode" column="credit_code"/>
             <result property="property3" column="property3"/>
-            <result property="updatetime" column="updatetime"/>
+            <result property="updateTime" column="updatetime"/>
             <result property="companyId" column="company_id"/>
             <result property="taxNumber" column="tax_number"/>
             <result property="email" column="email"/>
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml
index c3b007e..710ea1c 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml
@@ -80,25 +80,26 @@
     <select id="selectCoscoSupplierexitList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierexit" resultMap="CoscoSupplierexitResult">
         <include refid="selectCoscoSupplierexitVo"/>
         <where>
-                        <if test="exitTheme != null  and exitTheme != ''">
-                            and exit_theme = #{exitTheme}
-                        </if>
-                        <if test="exitReason != null  and exitReason != ''">
-                            and exit_reason = #{exitReason}
-                        </if>
-                        <if test="deptId != null  and deptId != ''">
-                            and dept_id = #{deptId}
-                        </if>
-                        <if test="approveStatus != null ">
-                            and approve_status = #{approveStatus}
-                        </if>
-                        <if test="workFlowId != null  and workFlowId != ''">
-                            and work_flow_id = #{workFlowId}
-                        </if>
-                        <if test="lastUpdateTime != null ">
-                            and last_update_time = #{lastUpdateTime}
-                        </if>
+            <if test="exitTheme != null  and exitTheme != ''">
+                and exit_theme = #{exitTheme}
+            </if>
+            <if test="exitReason != null  and exitReason != ''">
+                and exit_reason = #{exitReason}
+            </if>
+            <if test="deptId != null  and deptId != ''">
+                and dept_id = #{deptId}
+            </if>
+            <if test="approveStatus != null ">
+                and approve_status = #{approveStatus}
+            </if>
+            <if test="workFlowId != null  and workFlowId != ''">
+                and work_flow_id = #{workFlowId}
+            </if>
+            <if test="lastUpdateTime != null ">
+                and last_update_time = #{lastUpdateTime}
+            </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectCoscoSupplierexitById" parameterType="String"