From 5e53e2ad185c189696d96b77cbf4cb845079452a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 11 四月 2026 11:56:17 +0800
Subject: [PATCH] 合同管理字段调整
---
src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java | 3 +++
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 37 ++++++++++++++++++++++++++++++-------
src/main/resources/mapper/stock/StockInventoryMapper.xml | 3 +++
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 1 +
4 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
index e5e63df..a0b6f4a 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
@@ -26,6 +26,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractEndTime;
+ private String emergencyContact;
+ private String emergencyContactPhone;
+
private String defaultPassword;
}
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index 2881e4c..c4ef89f 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -70,6 +70,7 @@
StockInventory newStockInventory = new StockInventory();
newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
newStockInventory.setQualitity(stockInventoryDto.getQualitity());
+ newStockInventory.setSubQualitity(stockInventoryDto.getSubQualitity());
newStockInventory.setVersion(1);
newStockInventory.setProductCode(stockInventoryDto.getProductCode());
newStockInventory.setWarehouseCode(stockInventoryDto.getWarehouseCode());
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index fe35886..24c6623 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -3,15 +3,38 @@
<mapper namespace="com.ruoyi.staff.mapper.StaffOnJobMapper">
<select id="staffOnJobListPage" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
SELECT
- staff_on_job.*,
+ staff_on_job.id,
+ staff_on_job.staff_state,
+ staff_on_job.staff_no,
+ staff_on_job.staff_name,
+ staff_on_job.sex,
+ staff_on_job.age,
+ staff_on_job.native_place,
+ staff_on_job.phone,
+ staff_on_job.role_id,
+ staff_on_job.adress,
+ staff_on_job.contract_expire_time,
sp.post_name as postName,
- sd.dept_name as deptName
+ sd.dept_name as deptName,
+ sec.contact_name as emergency_contact,
+ sec.contact_phone as emergency_contact_phone
FROM staff_on_job
- LEFT JOIN
- sys_post sp ON sp.post_id = staff_on_job.sys_post_id
- LEFT JOIN
- sys_dept sd ON sd.dept_id = staff_on_job.sys_dept_id
- where 1=1
+ LEFT JOIN sys_post sp ON sp.post_id = staff_on_job.sys_post_id
+ LEFT JOIN sys_dept sd ON sd.dept_id = staff_on_job.sys_dept_id
+ LEFT JOIN (
+ SELECT
+ sec1.*
+ FROM staff_emergency_contact sec1
+ INNER JOIN (
+ SELECT
+ staff_on_job_id,
+ MAX(create_time) as max_create_time
+ FROM staff_emergency_contact
+ GROUP BY staff_on_job_id
+ ) sec2 ON sec1.staff_on_job_id = sec2.staff_on_job_id
+ AND sec1.create_time = sec2.max_create_time
+ ) sec ON sec.staff_on_job_id = staff_on_job.id
+ WHERE 1=1
<if test="staffOnJob.staffState != null">
AND staff_state = #{staffOnJob.staffState}
</if>
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index e98f910..5be7130 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -19,6 +19,9 @@
<if test="ew.qualitity != null">
qualitity = qualitity + #{ew.qualitity},
</if>
+ <if test="ew.subQualitity != null">
+ sub_qualitity = sub_qualitity + #{ew.subQualitity},
+ </if>
<if test="ew.version != null">
version = version + 1,
</if>
--
Gitblit v1.9.3