From 978a13e543afbb9210b923361af17aa006947244 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期三, 23 七月 2025 14:12:17 +0800 Subject: [PATCH] yys 人员,质量,设备增加时间筛选 --- src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml | 7 +++ src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 3 + src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 3 + src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 6 +++ src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 4 ++ src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 5 ++ src/main/java/com/ruoyi/dto/DateQueryDto.java | 24 ++++++++++++ src/main/resources/mapper/quality/QualityInspectMapper.xml | 6 +++ src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 3 + src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 3 + src/main/resources/mapper/staff/StaffOnJobMapper.xml | 6 +++ src/main/resources/mapper/device/DeviceRepairMapper.xml | 7 +++ src/main/resources/mapper/device/DeviceLedgerMapper.xml | 7 +++ 13 files changed, 78 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java index f299773..65faef8 100644 --- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java +++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.dto.DateQueryDto; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -15,7 +16,7 @@ */ @Data @TableName("device_ledger") -public class DeviceLedgerDto { +public class DeviceLedgerDto extends DateQueryDto { /** * 涓婚敭ID锛岃嚜澧� diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java index c101bc0..92cfe8c 100644 --- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java +++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java @@ -26,6 +26,8 @@ @ApiModelProperty("鎶ヤ慨鏃堕棿") private Date repairTime; + + private String repairTimeStr; @ApiModelProperty("鎶ヤ慨浜�") private String repairName; @@ -39,6 +41,8 @@ @ApiModelProperty("缁翠慨鏃堕棿") private Date maintenanceTime; + private String maintenanceTimeStr; + @ApiModelProperty("缁翠慨缁撴灉") private String maintenanceResult; diff --git a/src/main/java/com/ruoyi/dto/DateQueryDto.java b/src/main/java/com/ruoyi/dto/DateQueryDto.java new file mode 100644 index 0000000..c653fea --- /dev/null +++ b/src/main/java/com/ruoyi/dto/DateQueryDto.java @@ -0,0 +1,24 @@ +package com.ruoyi.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author :yys + * @date : 2025/7/23 11:31 + */ +@Data +@ApiModel +public class DateQueryDto { + + @ApiModelProperty(value = "寮�濮嬫椂闂�") + @TableField(exist = false) + private String entryDateStart; + + @ApiModelProperty(value = "缁撴潫鏃堕棿") + @TableField(exist = false) + private String entryDateEnd; + +} diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java index 008752c..5aa0219 100644 --- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java +++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.dto.DateQueryDto; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ */ @TableName(value = "quality_inspect") @Data -public class QualityInspect implements Serializable { +public class QualityInspect extends DateQueryDto implements Serializable { private static final long serialVersionUID = 1L; /** @@ -42,6 +43,8 @@ private Date checkTime; + + /** * 渚涘簲鍟嗗悕绉�(鍘熸潗鏂欐楠�) */ diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java index 2479add..5636c2f 100644 --- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java +++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.dto.DateQueryDto; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ */ @TableName(value = "quality_unqualified") @Data -public class QualityUnqualified implements Serializable { +public class QualityUnqualified extends DateQueryDto implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java index bdd8077..d2ce38d 100644 --- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java +++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.dto.DateQueryDto; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +19,7 @@ */ @TableName(value = "staff_join_leave_record") @Data -public class StaffJoinLeaveRecord implements Serializable { +public class StaffJoinLeaveRecord extends DateQueryDto implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java index 19fb2bf..ca54c4c 100644 --- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java +++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.dto.DateQueryDto; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +17,7 @@ */ @TableName(value = "staff_on_job") @Data -public class StaffOnJob implements Serializable { +public class StaffOnJob extends DateQueryDto implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml index 588e518..4a8f435 100644 --- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml +++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml @@ -55,6 +55,13 @@ AND update_user LIKE CONCAT('%', #{deviceLedger.updateUser}, '%') </if> + <if test="deviceLedger.entryDateStart != null and deviceLedger.entryDateStart != '' "> + AND dl.create_time >= DATE_FORMAT(#{deviceLedger.entryDateStart},'%Y-%m-%d') + </if> + <if test="deviceLedger.entryDateEnd != null and deviceLedger.entryDateEnd != '' "> + AND dl.create_time <= DATE_FORMAT(#{deviceLedger.entryDateEnd},'%Y-%m-%d') + </if> + <!-- 绉熸埛ID --> <if test="deviceLedger.tenantId != null"> AND tenant_id = #{deviceLedger.tenantId} diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml index 6b6929a..e8565d6 100644 --- a/src/main/resources/mapper/device/DeviceRepairMapper.xml +++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml @@ -38,6 +38,13 @@ <if test="deviceRepairDto.maintenanceName != null"> and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%') </if> + + <if test="deviceRepairDto.repairTimeStr != null and deviceRepairDto.repairTimeStr != '' "> + and dr.repair_time like concat('%',#{deviceRepairDto.repairTimeStr},'%') + </if> + <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' "> + and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%') + </if> </where> </select> <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto"> diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml index f17aca8..1c75087 100644 --- a/src/main/resources/mapper/quality/QualityInspectMapper.xml +++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml @@ -19,6 +19,12 @@ <if test="qualityInspect.productName != null and qualityInspect.productName != '' "> AND product_name = #{qualityInspect.productName} </if> + <if test="qualityInspect.entryDateStart != null and qualityInspect.entryDateStart != '' "> + AND check_time >= DATE_FORMAT(#{qualityInspect.entryDateStart},'%Y-%m-%d') + </if> + <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' "> + AND check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d') + </if> </select> <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect"> SELECT diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml index f28dbd1..b15e3f9 100644 --- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml +++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml @@ -16,6 +16,12 @@ <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' "> AND product_name = #{qualityUnqualified.productName} </if> + <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' "> + AND check_time >= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d') + </if> + <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' "> + AND check_time <= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d') + </if> </select> <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified"> SELECT diff --git a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml index 82b7609..7b11511 100644 --- a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml +++ b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml @@ -10,7 +10,12 @@ <if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' "> AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%') </if> - + <if test="staffJoinLeaveRecord.entryDateStart != null and staffJoinLeaveRecord.entryDateStart != '' "> + and contract_start_time like concat('%',#{staffJoinLeaveRecord.entryDateStart},'%') + </if> + <if test="staffJoinLeaveRecord.entryDateEnd != null and staffJoinLeaveRecord.entryDateEnd != '' "> + and contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%') + </if> </select> <select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord"> SELECT diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml index 37811f4..25e79b8 100644 --- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml +++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml @@ -12,6 +12,12 @@ <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' "> AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%') </if> + <if test="staffOnJob.entryDateStart != null and staffOnJob.entryDateStart != '' "> + AND contract_expire_time >= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d') + </if> + <if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' "> + AND contract_expire_time <= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d') + </if> </select> <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffOnJob"> SELECT -- Gitblit v1.9.3