From a07284a705e2c239ae829d560d2f559224c11364 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Mon, 20 Jan 2025 18:31:09 +0800
Subject: [PATCH] bugfix

---
 .../src/main/java/com/ruoyi/tcZz/domain/TcFb.java    |  4 ++--
 .../com/ruoyi/tcZz/service/impl/TcFbServiceImpl.java |  1 +
 .../ruoyi/tcZz/service/impl/TcYqbgServiceImpl.java   |  2 ++
 .../resources/mapper/tcZz/netWorkYq/TcYqbgMapper.xml | 12 +++++++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFb.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFb.java
index 547c5582..8f728112 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFb.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcFb.java
@@ -67,8 +67,8 @@ public class TcFb extends BaseEntity {
      */
     @ApiModelProperty(value = "发布时间")
     @Excel(name = "发布时间", dateFormat = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date dateTime;
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcFbServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcFbServiceImpl.java
index 303f428e..4751a9da 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcFbServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcFbServiceImpl.java
@@ -100,6 +100,7 @@ public class TcFbServiceImpl implements ITcFbService
         StringBuilder successMsg = new StringBuilder();
         if (!tccFbList.isEmpty()) {
             for (TcFb tcFb : tccFbList) {
+                tcFb.setCreateTime(DateUtils.getNowDate());
                 tcFbMapper.insertTcFb(tcFb);
             }
             successMsg.append("导入成功");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcYqbgServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcYqbgServiceImpl.java
index 84ccd30f..fe3ec561 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcYqbgServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcYqbgServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.tcZz.service.impl;
 
+import java.util.Date;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.tcZz.domain.TcWljgtj;
@@ -100,6 +101,7 @@ public class TcYqbgServiceImpl implements ITcYqbgService
             StringBuilder successMsg = new StringBuilder();
             if (!tcYqbgList.isEmpty()) {
                 for (TcYqbg tcYqbg : tcYqbgList) {
+                    tcYqbg.setCreateTime(new Date());
                     tcYqbgMapper.insertTcYqbg(tcYqbg);
                 }
                 successMsg.append("导入成功");
diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqbgMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqbgMapper.xml
index f7203c2e..6ff6e18c 100644
--- a/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqbgMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqbgMapper.xml
@@ -39,7 +39,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
             <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
-        order by title desc
+        <choose>
+            <when test="type == 3">
+                order by create_time,update_time desc
+            </when>
+            <when test="type == 4">
+                order by create_time,update_time desc
+            </when>
+            <otherwise>
+                order by title  desc
+            </otherwise>
+        </choose>
     </select>
     
     <select id="selectTcYqbgById" parameterType="Long" resultMap="TcYqbgResult">