From 443a9510ba9c032d83139048f73201706a1d9c45 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 10 五月 2024 22:19:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml
new file mode 100644
index 0000000..7977187
--- /dev/null
+++ b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.mom.mapper.AuxiliaryWorkingHoursMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <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" />
+        <result column="create_user" property="createUser" />
+        <result column="update_user" property="updateUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <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.*
+      from (
+      select
+      awh.id,
+      awh.number,
+      awh.auxiliary_project,
+      awh.laboratory,
+      awh.unit,
+      awh.approved_working_hour,
+      awh.department,
+      awh.remarks
+      FROM auxiliary_working_hours awh
+      ) data
+      <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+          ${ew.customSqlSegment}
+      </if>
+  </select>
+</mapper>

--
Gitblit v1.9.3