From 8e941a8eac3329725cdd59cfa2bf3482ccbf057a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java | 9 +++++++++
src/main/resources/mapper/device/DeviceRepairMapper.xml | 11 ++++++-----
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 11 +++++++++--
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 19 +++++++++++++++----
src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java | 2 +-
src/main/resources/mapper/quality/QualityInspectMapper.xml | 6 +++++-
6 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 3fa0ab2..a9c8c10 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -3,13 +3,19 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.Date;
@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class DeviceRepairDto {
@ApiModelProperty("璁惧鎶ヤ慨id")
@@ -24,10 +30,15 @@
@ApiModelProperty("璁惧鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
- private Date repairTime;
-
- private String repairTimeStr;
+ @ApiModelProperty("鎶ヤ慨鏃堕棿寮�濮�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime repairTimeStart;
+
+ @ApiModelProperty("鎶ヤ慨鏃堕棿缁撴潫")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime repairTimeEnd;
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 7c42d0d..6925278 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -26,8 +26,15 @@
private String deviceModel;
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
- private Date repairTime;
+ @ApiModelProperty("鎶ヤ慨鏃堕棿寮�濮�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime repairTimeStart;
+
+ @ApiModelProperty("鎶ヤ慨鏃堕棿缁撴潫")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime repairTimeEnd;
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
index 10c4f5f..7e0b7bd 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
@@ -39,7 +39,7 @@
deviceRepair.setRemark(deviceDefectRecord.getDefectDescription());
//鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
deviceRepair.setRepairName(SecurityUtils.getUsername());
- deviceRepair.setRepairTime(new Date());
+// deviceRepair.setRepairTime(new Date());
deviceRepairMapper.insert(deviceRepair);
return deviceDefectRecordMapper.insert(deviceDefectRecord) > 0;
} else if (status.equals("涓�鑸己闄�")) {
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
index dd11354..ed6cbce 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -94,4 +94,13 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @ApiModelProperty(value = "鐢熶骇鍓嶆槸鍚﹀瓨鍦ㄥ紓甯�")
+ private Boolean hasExceptionBefore;
+
+ @ApiModelProperty(value = "鐢熶骇涓槸鍚﹀瓨鍦ㄥ紓甯�")
+ private Boolean hasExceptionAfter;
+
+ @ApiModelProperty(value = "鐢熶骇鍚庢槸鍚﹀瓨鍦ㄥ紓甯�")
+ private Boolean hasExceptionIssue;
}
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index de750a8..d82119b 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -8,10 +8,11 @@
<select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
select dr.id,
dr.device_ledger_id,
- dr.repair_time,
dr.repair_name,
dr.remark,
dr.repair_project,
+ dr.repair_time_start as repairTimeStart,
+ dr.repair_time_end as repairTimeEnd,
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
@@ -46,21 +47,21 @@
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>
+ order by dr.status asc, dr.create_time desc
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
select dr.id,
dr.device_ledger_id,
- dr.repair_time,
dr.repair_name,
dr.remark,
dr.repair_project,
+ dr.repair_time_start as repairTimeStart,
+ dr.repair_time_end as repairTimeEnd,
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index a9ebc19..7b883c3 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -43,7 +43,11 @@
<if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
AND qi.check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
</if>
- ORDER BY qi.check_time DESC
+ ORDER BY
+ CASE WHEN qi.check_result IS NULL OR qi.check_result = '' THEN 0 ELSE 1 END,
+ inspect_state,
+ qi.check_time DESC,
+ qi.id DESC
</select>
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
--
Gitblit v1.9.3