From b97306686e7ac770ba7626dda6835838bdc9fc77 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 19 十二月 2024 15:38:44 +0800
Subject: [PATCH] cnas:1.添加检验下单审核通过后新增7.1检验委托单+2.添加报告编制批准通过后新增7.4报告结果+3.用户控制层一些常用的方法
---
performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml
index 133dc87..7977187 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml
@@ -5,6 +5,7 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.AuxiliaryWorkingHours">
<id column="id" property="id" />
+ <result column="number" property="number"/>
<result column="AuxiliaryProject" property="auxiliaryProject" />
<result column="approved_working_hour" property="approvedWorkingHour" />
<result column="remarks" property="remarks" />
@@ -12,9 +13,9 @@
<result column="update_user" property="updateUser" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
- <result column="e_id" property="eId" />
<result column="department" property="department" />
<result column="laboratory" property="laboratory" />
+ <result column="unit" property="unit"/>
</resultMap>
<select id="selectAuxiliaryWorkingHours" resultType="com.yuanchu.mom.pojo.AuxiliaryWorkingHours">
select data.*
@@ -24,12 +25,11 @@
awh.number,
awh.auxiliary_project,
awh.laboratory,
- enu.label,
+ awh.unit,
awh.approved_working_hour,
awh.department,
awh.remarks
FROM auxiliary_working_hours awh
- left JOIN enums enu on enu.id = awh.e_id
) data
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
--
Gitblit v1.9.3