From 48d97aa1f95c419c200e3770eca21377c3a46f5c Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Tue, 2 Jul 2024 08:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zc/business/mapper/DcShiftsMapper.java    | 19 ++++++++++---------
 .../service/impl/DcShiftsServiceImpl.java     |  2 +-
 .../mapper/business/DcShiftsMapper.xml        | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java
index 2726acff..a5ec7ff7 100644
--- a/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java
+++ b/zc-business/src/main/java/com/zc/business/mapper/DcShiftsMapper.java
@@ -11,15 +11,15 @@ import org.apache.poi.hssf.record.DConRefRecord;
 
 /**
  * 值班Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2024-01-04
  */
-public interface DcShiftsMapper 
+public interface DcShiftsMapper
 {
     /**
      * 查询值班
-     * 
+     *
      * @param id 值班主键
      * @return 值班
      */
@@ -27,15 +27,16 @@ public interface DcShiftsMapper
 
     /**
      * 查询值班列表
-     * 
+     *
      * @param dcShifts 值班
      * @return 值班集合
      */
     List<DcShifts> selectDcShiftsList(DcShifts dcShifts);
-
+    //导出
+    List<DcShifts> selectDcShiftsListExport(DcShifts dcShifts);
     /**
      * 新增值班
-     * 
+     *
      * @param dcShifts 值班
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface DcShiftsMapper
 
     /**
      * 修改值班
-     * 
+     *
      * @param dcShifts 值班
      * @return 结果
      */
@@ -53,7 +54,7 @@ public interface DcShiftsMapper
 
     /**
      * 删除值班
-     * 
+     *
      * @param id 值班主键
      * @return 结果
      */
@@ -61,7 +62,7 @@ public interface DcShiftsMapper
 
     /**
      * 批量删除值班
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java
index d75c4d1c..4e380bdb 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcShiftsServiceImpl.java
@@ -108,7 +108,7 @@ public class DcShiftsServiceImpl implements IDcShiftsService
 
     @Override
     public List<DcShifts> selectDcShiftsListExcel(DcShifts dcShifts) {
-        return dcShiftsMapper.selectDcShiftsList(dcShifts);
+        return dcShiftsMapper.selectDcShiftsListExport(dcShifts);
     }
 
     /**
diff --git a/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml b/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml
index b2d75161..d842ca56 100644
--- a/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcShiftsMapper.xml
@@ -112,6 +112,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEmp" resultType="java.util.HashMap">
         select id from dc_employees where organization_id=#{organizationId} and name=#{name}
     </select>
+    <select id="selectDcShiftsListExport" resultType="com.zc.business.domain.DcShifts">
+        select shifts.id, shifts.employees_id,shifts.station,
+        employees.name,employees.contact_number,post.post_name,organization.organization_name,
+        shifts.date, shifts.start_time, shifts.end_time,shifts.scheduling,
+        shifts.remark, shifts.create_time, shifts.update_time from dc_shifts as shifts
+        left join  dc_employees  as employees on employees.id=shifts.employees_id
+        left join sys_post as post on employees.post_id=post.post_id
+        left join dc_organization as organization on organization.id=shifts.station
+        <where>
+            <if test="station != null "> and shifts.station = #{station}</if>
+            <if test="employeesId != null "> and shifts.employees_id = #{employeesId}</if>
+            <if test="date != null "> and shifts.date = #{date}</if>
+            <if test="name != null  and name != ''"> and CONCAT(employees.name,employees.contact_number) like concat('%', #{name}, '%')</if>
+        </where>
+        order by shifts.date desc
+    </select>
 
 
     <insert id="insertDcShifts" parameterType="DcShifts" useGeneratedKeys="true" keyProperty="id">