From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
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