From 112d964cbc94154dd4ca75851231d0c477ebc571 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 20 五月 2025 10:29:22 +0800
Subject: [PATCH] 其他功能合并

---
 cnas-process/src/main/resources/mapper/ProcessDealMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml b/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
index 282eaa7..037afa8 100644
--- a/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
@@ -24,7 +24,7 @@
         </if>
     </select>
 
-    <select id="selectDeal" resultType="com.ruoyi.process.pojo.ProcessDeal">
+    <select id="selectDeal" resultType="com.ruoyi.process.dto.ProcessDealDto">
         select ROW_NUMBER() OVER (ORDER BY id) AS indexs,
                id,
                sample_name,
@@ -32,7 +32,7 @@
                sample_supplier,
                num,
                deal_method,
-               deal_time
+               DATE_FORMAT(deal_time, '%Y-%m-%d') dealTimeStr
         from cnas_process_deal
         where totaldeal_id = #{id}
     </select>

--
Gitblit v1.9.3