From 376b3bc31ba1cd95e736c1b0cd31eed649212bc8 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 15:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-=E7=8F=AD?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/wms/domain/BaseTeamT.java | 14 ++++++++++++++
 .../resources/mapper/wms/BaseEquipmentMapper.xml   |  2 +-
 .../main/resources/mapper/wms/BaseTeamTMapper.xml  |  7 ++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java
index fa6a582bc..fcfa0894e 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java
@@ -81,6 +81,10 @@ public class BaseTeamT extends BaseEntity {
 	@Excel(name = "班组长编码")
 	private String teamLeaderCode;
 
+	/** 班组长编码 */
+	@Excel(name = "班组长编码")
+	private String teamLeaderName;
+
 	/** 定编岗位数量 */
 	@Excel(name = "定编岗位数量")
 	private Integer planPostQuantity;
@@ -229,6 +233,15 @@ public class BaseTeamT extends BaseEntity {
 	public String getTeamLeaderCode() {
 		return teamLeaderCode;
 	}
+
+	public void setTeamLeaderName(String teamLeaderName) {
+		this.teamLeaderName = teamLeaderName;
+	}
+
+	public String getTeamLeaderName() {
+		return teamLeaderName;
+	}
+
 	public void setPlanPostQuantity(Integer planPostQuantity) {
 		this.planPostQuantity = planPostQuantity;
 	}
@@ -292,6 +305,7 @@ public class BaseTeamT extends BaseEntity {
 			.append("siteCode", getSiteCode())
 			.append("productionLineCode", getProductionLineCode())
 			.append("teamLeaderCode", getTeamLeaderCode())
+			.append("teamLeaderName", getTeamLeaderName())
 			.append("planPostQuantity", getPlanPostQuantity())
 			.append("actualPostQuantity", getActualPostQuantity())
 			.append("salaryType", getSalaryType())
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
index c049babf5..8f1fcca7b 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
@@ -145,7 +145,7 @@
 			<if test="createTime != null">create_time = #{createTime},</if>
 			<if test="updateBy != null">update_by = #{updateBy},</if>
 			<if test="updateTime != null">update_time = #{updateTime},</if>
-			<!--			<if test="unitWorkingHours != null and unitWorkingHours != ''">unit_working_hours = #{unitWorkingHours},</if>-->
+			<if test="unitWorkingHours != null and unitWorkingHours != ''">unit_working_hours = #{unitWorkingHours},</if>
 			<if test="workshopSection != null and workshopSection != ''">workshop_section = #{workshopSection},</if>
 			<if test="equipmentLocation != null and equipmentLocation != ''">equipment_location = #{equipmentLocation},</if>
 			<if test="hourlyUnitPrice != null and hourlyUnitPrice != ''">hourly_unit_price = #{hourlyUnitPrice},</if>
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamTMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamTMapper.xml
index 6704983fb..954896cc0 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamTMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamTMapper.xml
@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="siteCode"	column="Site_Code"	/>
 		<result property="productionLineCode"	column="production_line_code"	/>
 		<result property="teamLeaderCode"	column="team_leader_code"	/>
+		<result property="teamLeaderName"	column="team_leader_name"	/>
 		<result property="planPostQuantity"	column="plan_post_quantity"	/>
 		<result property="actualPostQuantity"	column="actual_post_quantity"	/>
 		<result property="salaryType"	column="salary_type"	/>
@@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectBaseTeamTVo">
-		select Team_Id, ORG_Id, Team_Code, Team_Desc, Team_Desc_Global, Team_Desc_Extended, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code, Site_Id, Site_Code, production_line_code, team_leader_code, plan_post_quantity, actual_post_quantity, salary_type, team_properties, attendance_quantity, assigned_quantity ,team_type from base_team_t
+		select Team_Id, ORG_Id, Team_Code, Team_Desc, Team_Desc_Global, Team_Desc_Extended, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code, Site_Id, Site_Code, production_line_code, team_leader_code, team_leader_name,plan_post_quantity, actual_post_quantity, salary_type, team_properties, attendance_quantity, assigned_quantity ,team_type from base_team_t
 	</sql>
 
 	<select id="selectBaseTeamTList" parameterType="BaseTeamT" resultMap="BaseTeamTResult">
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="siteCode != null  and siteCode != ''"> and Site_Code = #{siteCode}</if>
 			<if test="productionLineCode != null  and productionLineCode != ''"> and production_line_code = #{productionLineCode}</if>
 			<if test="teamLeaderCode != null  and teamLeaderCode != ''"> and team_leader_code = #{teamLeaderCode}</if>
+			<if test="teamLeaderName != null  and teamLeaderName != ''"> and team_leader_name = #{teamLeaderName}</if>
 			<if test="planPostQuantity != null "> and plan_post_quantity = #{planPostQuantity}</if>
 			<if test="actualPostQuantity != null "> and actual_post_quantity = #{actualPostQuantity}</if>
 			<if test="salaryType != null  and salaryType != ''"> and salary_type = #{salaryType}</if>
@@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="siteCode != null">Site_Code,</if>
 			<if test="productionLineCode != null">production_line_code,</if>
 			<if test="teamLeaderCode != null">team_leader_code,</if>
+			<if test="teamLeaderName != null">team_leader_name,</if>
 			<if test="planPostQuantity != null">plan_post_quantity,</if>
 			<if test="actualPostQuantity != null">actual_post_quantity,</if>
 			<if test="salaryType != null">salary_type,</if>
@@ -115,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="siteCode != null">#{siteCode},</if>
 			<if test="productionLineCode != null">#{productionLineCode},</if>
 			<if test="teamLeaderCode != null">#{teamLeaderCode},</if>
+			<if test="teamLeaderName != null">#{teamLeaderName},</if>
 			<if test="planPostQuantity != null">#{planPostQuantity},</if>
 			<if test="actualPostQuantity != null">#{actualPostQuantity},</if>
 			<if test="salaryType != null">#{salaryType},</if>
@@ -144,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="siteCode != null">Site_Code = #{siteCode},</if>
 			<if test="productionLineCode != null">production_line_code = #{productionLineCode},</if>
 			<if test="teamLeaderCode != null">team_leader_code = #{teamLeaderCode},</if>
+			<if test="teamLeaderName != null">team_leader_name = #{teamLeaderName},</if>
 			<if test="planPostQuantity != null">plan_post_quantity = #{planPostQuantity},</if>
 			<if test="actualPostQuantity != null">actual_post_quantity = #{actualPostQuantity},</if>
 			<if test="salaryType != null">salary_type = #{salaryType},</if>