From 458334ecf2bf8aa76ac6d07226ed29878c56b070 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 04 二月 2026 10:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceDetailCheckListVo.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java | 194 ++++++++++++++++++++++++++++----------
ruoyi-system/src/main/java/com/ruoyi/system/vo/ErrorListVo.java | 5
ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml | 88 +++++++++--------
ruoyi-system/src/main/resources/mapper/system/ProjectMapper.xml | 2
6 files changed, 201 insertions(+), 95 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java
index 4039536..cc417de 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/ErrorListQuery.java
@@ -19,8 +19,8 @@
private List<Integer> projectIds;
@ApiModelProperty("检查ids")
private List<Integer> recordIds;
- @ApiModelProperty("整改情况 true已整改 false未整改")
- private Boolean reformed;
+ @ApiModelProperty("整改情况0未复查1-未整改 2-部分整改 3-已整改")
+ private Integer state;
@ApiModelProperty("隐患类型 1安全 2设备")
private Integer type;
@ApiModelProperty("clientId")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
index dfa1e8b..a2ae128 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
@@ -31,7 +31,7 @@
/**
* <p>
- * 服务实现类
+ * 服务实现类
* </p>
*
* @author administrator
@@ -65,7 +65,7 @@
// 判断checkTime是否是本月的时间
if (checkTime != null && YearMonth.from(checkTime).equals(YearMonth.now())) {
deviceListVo.setCheckResult("已检查");
- }else {
+ } else {
deviceListVo.setCheckResult("未检查");
}
}
@@ -79,7 +79,7 @@
@Override
- public List<EntrustProjectVo> projectList( Page<EntrustProjectVo> page,EntrustListQuery query) {
+ public List<EntrustProjectVo> projectList(Page<EntrustProjectVo> page, EntrustListQuery query) {
Integer pageNum = query.getPageNum();
Integer pageSize = query.getPageSize();
@@ -91,10 +91,10 @@
if (query.getClientId() != null) {
projectWrapper.eq(Project::getClientId, query.getClientId());
}
- if (StringUtils.hasLength(query.getName())){
+ if (StringUtils.hasLength(query.getName())) {
projectWrapper.like(Project::getName, query.getName());
}
- switch (query.getCategory()){
+ switch (query.getCategory()) {
case 1:
// 查询在建资产项目
projectWrapper.eq(Project::getDeleted, false)
@@ -103,7 +103,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -115,7 +115,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -123,7 +123,7 @@
List<Project> projects = projectMapper.selectList(projectWrapper);
List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
- if (projectIds.isEmpty()){
+ if (projectIds.isEmpty()) {
projectIds.add(-1);
}
query.setProjectIds(projectIds);
@@ -133,7 +133,7 @@
.eq(Task::getDeleted, false);
List<Task> taskList = taskMapper.selectList(taskWrapper);
List<Integer> checkTaskIds = taskList.stream().map(Task::getId).collect(Collectors.toList());
- if (checkTaskIds.isEmpty()){
+ if (checkTaskIds.isEmpty()) {
checkTaskIds.add(-1);
}
// 查询重大隐患记录（level 表示隐患等级，0 表示重大隐患）
@@ -142,7 +142,7 @@
.in(Record::getCheckTaskId, checkTaskIds)
.eq(Record::getLevel, 0); // 重大隐患等级
List<Integer> recordIds = new ArrayList<>(recordMapper.selectList(recordWrapper).stream().map(Record::getId).toList());
- if (recordIds.isEmpty()){
+ if (recordIds.isEmpty()) {
recordIds.add(-1);
}
@@ -160,19 +160,19 @@
.in(EvalResult::getCheckTaskId, checkTaskIds)
).stream().collect(Collectors.groupingBy(EvalResult::getProjectId));
List<Record> records = recordMapper.selectList(new LambdaQueryWrapper<Record>()
- .in(Record::getId, recordIds)
+ .in(Record::getId, recordIds)
.eq(Record::getDeleted, false));
- List<EntrustProjectVo> deviceList = this.baseMapper.projectList(page,query);
+ List<EntrustProjectVo> deviceList = this.baseMapper.projectList(page, query);
for (EntrustProjectVo deviceListVo : deviceList) {
List<EvalResult> evalResults = resultMap.get(deviceListVo.getId());
- if (evalResults!=null){
- float temp =0;
- // 计算安全检查平均分
- float avgSafetyScore = (float)evalResults.stream()
- .filter(e -> e.getScore() != null)
- .mapToDouble(EvalResult::getScore)
- .average()
- .orElse(0.0);
+ if (evalResults != null) {
+ float temp = 0;
+ // 计算安全检查平均分
+ float avgSafetyScore = (float) evalResults.stream()
+ .filter(e -> e.getScore() != null)
+ .mapToDouble(EvalResult::getScore)
+ .average()
+ .orElse(0.0);
// 计算设备检查平均分（需要解析 device_res_map）
List<Float> deviceScores = evalResults.stream()
.filter(e -> StringUtils.hasText(e.getDeviceResMap()))
@@ -181,11 +181,11 @@
.toList();
if (!deviceScores.isEmpty()) {
- float avgDeviceScore =(float) deviceScores.stream()
+ float avgDeviceScore = (float) deviceScores.stream()
.mapToDouble(Float::doubleValue)
.average()
.orElse(0.0);
- temp = (avgSafetyScore + avgDeviceScore)/2;
+ temp = (avgSafetyScore + avgDeviceScore) / 2;
}
Integer clientId = projectMap.get(deviceListVo.getId());
String s = clientParamMap.get(clientId);
@@ -193,30 +193,30 @@
String a = jsonObject.getString("a");
String b = jsonObject.getString("b");
String c = jsonObject.getString("c");
- if (temp>=Float.parseFloat( a)){
+ if (temp >= Float.parseFloat(a)) {
deviceListVo.setRisk("A类");
- }else if (temp>=Float.parseFloat( b)){
+ } else if (temp >= Float.parseFloat(b)) {
deviceListVo.setRisk("B类");
- }else if (temp>=Float.parseFloat( c)){
+ } else if (temp >= Float.parseFloat(c)) {
deviceListVo.setRisk("C类");
}
- }else{
+ } else {
deviceListVo.setRisk(null);
}
List<Task> tasks = taskMap.get(deviceListVo.getId());
- if (tasks!=null&&!tasks.isEmpty()){
+ if (tasks != null && !tasks.isEmpty()) {
List<Integer> taskIds = tasks.stream().map(Task::getId).toList();
List<Record> recordList = records.stream().filter(e -> taskIds.contains(e.getCheckTaskId())).toList();
Record record = recordList.stream().max(Comparator.comparing(Record::getCreateTime)).orElse(null);
- if (record!=null){
+ if (record != null) {
deviceListVo.setCheckTime(record.getCreateTime());
deviceListVo.setCheckResult("已检查");
- }else{
+ } else {
deviceListVo.setCheckTime(null);
deviceListVo.setCheckResult("未检查");
deviceListVo.setRisk(null);
}
- }else{
+ } else {
deviceListVo.setCheckTime(null);
deviceListVo.setCheckResult("未检查");
deviceListVo.setRisk(null);
@@ -224,6 +224,7 @@
}
return deviceList;
}
+
private static Float calculateDeviceScore(String deviceResMapJson) {
try {
// 1. 解析 JSON 字符串
@@ -293,15 +294,16 @@
return null;
}
}
+
@Override
public List<EntrustProjectReportVo> projectReport(Page<EntrustProjectReportVo> page, ProjectReportListQuery query) {
- List<EntrustProjectReportVo> entrustProjectReportVoList = this.baseMapper.projectReport(page,query);
+ List<EntrustProjectReportVo> entrustProjectReportVoList = this.baseMapper.projectReport(page, query);
return entrustProjectReportVoList;
}
@Override
public List<EntrustDeviceListVo> deviceList(Page<EntrustDeviceListVo> page, EntrustDeviceListQuery query) {
- String startTime = query.getStartTime().replace("年","-").replace("月","-").replace("日","-");
+ String startTime = query.getStartTime().replace("年", "-").replace("月", "-").replace("日", "-");
String endTime = query.getEndTime();
// 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
@@ -309,7 +311,7 @@
if (query.getClientId() != null) {
projectWrapper.eq(Project::getClientId, query.getClientId());
}
- switch (query.getCategory()){
+ switch (query.getCategory()) {
case 1:
// 查询在建资产项目
projectWrapper.eq(Project::getDeleted, false)
@@ -318,7 +320,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -330,7 +332,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -339,7 +341,7 @@
query.setProjectIds(projectIds);
List<EntrustDeviceListVo> deviceList = this.baseMapper.deviceList(page, query);
List<Integer> deviceIds = deviceList.stream().map(EntrustDeviceListVo::getId).collect(Collectors.toList());
- if (deviceIds.isEmpty()){
+ if (deviceIds.isEmpty()) {
deviceIds.add(-1);
}
LambdaQueryWrapper<Record> recordWrapper = new LambdaQueryWrapper<>();
@@ -350,14 +352,14 @@
List<Record> records = recordMapper.selectList(recordWrapper);
List<Integer> deviceIdsRecord = records.stream().map(Record::getDeviceId).distinct().collect(Collectors.toList());
for (EntrustDeviceListVo deviceListVo : deviceList) {
- if (deviceIdsRecord.contains(deviceListVo.getId())){
+ if (deviceIdsRecord.contains(deviceListVo.getId())) {
Record record = records.stream().filter(e -> e.getDeviceId().equals(deviceListVo.getId())).findFirst()
.orElse(null);
- if (record!=null){
+ if (record != null) {
deviceListVo.setCheckResult("已检查");
deviceListVo.setCheckTime(record.getCreateTime());
}
- }else{
+ } else {
deviceListVo.setCheckResult("未检查");
deviceListVo.setCheckTime(null);
@@ -376,11 +378,18 @@
@Override
public List<ErrorListVo> errorList(Page<ErrorListVo> page, ErrorListQuery query) throws ParseException {
+ String startTime;
+ String endTime;
// 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
- String startTime = query.getStartTime().replace("年","-").replace("月","-").replace("日","-");
- String endTime = query.getEndTime();
+ if (StringUtils.hasLength(query.getStartTime())) {
+ startTime = query.getStartTime().replace("年", "-").replace("月", "-").replace("日", "-");
+ endTime = query.getEndTime();
+ } else {
+ endTime = "";
+ startTime = "";
+ }
LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
- switch (query.getCategory()){
+ switch (query.getCategory()) {
case 1:
// 查询在建资产项目
projectWrapper.eq(Project::getDeleted, false)
@@ -389,7 +398,8 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+
+ .between(StringUtils.hasLength(startTime),Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -401,7 +411,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(StringUtils.hasLength(startTime),Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -411,7 +421,7 @@
}
List<Project> projects = projectMapper.selectList(projectWrapper);
List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
- if (projectIds.isEmpty()){
+ if (projectIds.isEmpty()) {
projectIds.add(-1);
}
// 查询检查任务
@@ -434,14 +444,50 @@
@Override
public List<ErrorListVo> deviceErrorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ String startTime;
+ String endTime;
// 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
+ if (StringUtils.hasLength(query.getStartTime())) {
+ startTime = query.getStartTime().replace("年", "-").replace("月", "-").replace("日", "-");
+ endTime = query.getEndTime();
+ } else {
+ endTime = "";
+ startTime = "";
+ }
LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+ switch (query.getCategory()) {
+ case 1:
+ // 查询在建资产项目
+ projectWrapper.eq(Project::getDeleted, false)
+ .ne(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+
+ .between(StringUtils.hasLength(startTime),Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
+ break;
+ case 2:
+ // 查询固定资产项目
+ projectWrapper.eq(Project::getDeleted, false)
+ .eq(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .between(StringUtils.hasLength(startTime),Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
+ break;
+ }
if (query.getClientId() != null) {
projectWrapper.eq(Project::getClientId, query.getClientId());
}
List<Project> projects = projectMapper.selectList(projectWrapper);
List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
- if (projectIds.isEmpty()){
+ if (projectIds.isEmpty()) {
projectIds.add(-1);
}
// 查询检查任务
@@ -458,35 +504,83 @@
List<Integer> recordIds = recordMapper.selectList(recordWrapper).stream().map(Record::getId).toList();
query.setRecordIds(recordIds);
List<ErrorListVo> errorList = this.baseMapper.deviceErrorList(page, query);
- return errorList; }
+ return errorList;
+ }
@Override
public List<ErrorListVo> safetyErrorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ String startTime;
+ String endTime;
// 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
+ if (StringUtils.hasLength(query.getStartTime())) {
+ startTime = query.getStartTime().replace("年", "-").replace("月", "-").replace("日", "-");
+ endTime = query.getEndTime();
+ } else {
+ endTime = "";
+ startTime = "";
+ }
LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+ switch (query.getCategory()) {
+ case 1:
+ // 查询在建资产项目
+ projectWrapper
+// .eq(Project::getDeleted, false)
+ .ne(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .between(StringUtils.hasLength(startTime),Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ .or(w -> w
+ .isNull(Project::getStatus) // 已完成项目
+ .between(StringUtils.hasLength(startTime),Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
+ break;
+ case 2:
+ // 查询固定资产项目
+ projectWrapper
+// .eq(Project::getDeleted, false)
+ .eq(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .between(StringUtils.hasLength(startTime),Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ .or(w -> w
+ .isNull(Project::getStatus) // 已完成项目
+// .between(StringUtils.hasLength(startTime),Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
+ break;
+ }
if (query.getClientId() != null) {
projectWrapper.eq(Project::getClientId, query.getClientId());
}
List<Project> projects = projectMapper.selectList(projectWrapper);
List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
- if (projectIds.isEmpty()){
+ if (projectIds.isEmpty()) {
projectIds.add(-1);
}
// 查询检查任务
LambdaQueryWrapper<Task> taskWrapper = new LambdaQueryWrapper<>();
taskWrapper.in(Task::getProjectId, projectIds)
- .eq(Task::getDeleted, false);
+ ;
List<Task> tasks = taskMapper.selectList(taskWrapper);
List<Integer> checkTaskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
// 查询重大隐患记录（level 表示隐患等级，0 表示重大隐患）
LambdaQueryWrapper<Record> recordWrapper = new LambdaQueryWrapper<>();
recordWrapper.eq(Record::getDeleted, false)
+ .eq(Record::getRecordType,"error")
.in(Record::getCheckTaskId, checkTaskIds);
List<Integer> recordIds = recordMapper.selectList(recordWrapper).stream().map(Record::getId).toList();
query.setRecordIds(recordIds);
List<ErrorListVo> errorList = this.baseMapper.safetyErrorList(page, query);
- return errorList; }
+ return errorList;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceDetailCheckListVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceDetailCheckListVo.java
index 7ad7afc..3f8617c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceDetailCheckListVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceDetailCheckListVo.java
@@ -42,4 +42,7 @@
@ApiModelProperty("安全报告 1有 0无")
private Integer containSystemRes;
+ @ApiModelProperty("计划id")
+ private Integer planId;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ErrorListVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ErrorListVo.java
index f8af8eb..2f01edf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ErrorListVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ErrorListVo.java
@@ -35,8 +35,9 @@
@ApiModelProperty("检查时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime checkTime;
- @ApiModelProperty("整改情况 true已整改 false未整改")
- private Boolean reformed;
+
+ @ApiModelProperty("整改情况0未复查1-未整改 2-部分整改 3-已整改")
+ private Integer state;
@ApiModelProperty("责任人")
private String responsiblePerson;
diff --git a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
index 3db10c8..369ddb4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
@@ -57,7 +57,7 @@
group by device_id
) latest on t2.id = latest.device_id
left join project t3 on t1.project_id = t3.id
- where 1=1
+ where t1.deleted = 0
<if test="query.projectId != null">
and t1.project_id = #{query.projectId}
</if>
@@ -73,12 +73,7 @@
<if test="query.content!= null and query.content!=''">
and t2.name like CONCAT('%', #{query.content}, '%')
</if>
- <if test="query.startTime != null and query.startTime != ''">
- and latest.record_time >= #{query.startTime}
- </if>
- <if test="query.endTime != null and query.endTime != ''">
- and #{query.endTime} >=latest.record_time
- </if>
+
order by latest.record_time desc
</select>
<select id="projectList" resultType="com.ruoyi.system.vo.EntrustProjectVo">
@@ -92,13 +87,8 @@
group by project_id
order by create_time desc
) result on t1.id = result.project_id
- where t1.deleted = 0 and t1.status =1
- <if test="query.category == 1">
- and t1.status = #{query.category}
- </if>
- <if test="query.category == 2">
- and t1.type = #{query.category}
- </if>
+ where t1.deleted = 0
+
<if test="query.clientId != null">
and t1.client_id = #{query.clientId}
</if>
@@ -134,11 +124,13 @@
<select id="errorList" resultType="com.ruoyi.system.vo.ErrorListVo">
select t1.*,t2.project_id,t2.plan_id,t3.`name` as projectName,t4.`name` as planName
,t5.`name` as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
+ ,IF(t6.state is null,0,t6.state) as state
from record t1
LEFT JOIN task t2 on t1.check_task_id = t2.id
LEFT JOIN project t3 on t2.project_id = t3.id
LEFT JOIN plan t4 on t2.plan_id = t4.id
LEFT JOIN problem t5 ON t1.problem_id = t5.id
+ left join error_review t6 on t1.error_review_id = t6.id
where t1.deleted = 0 and t2.deleted = 0 and t1.`level` =0
<if test="query.recordIds != null">
and t1.id in
@@ -150,8 +142,17 @@
<if test="query.projectId != null">
and t2.project_id = #{query.projectId}
</if>
- <if test="query.reformed != null">
- and t1.reformed = #{query.reformed}
+ <if test="query.state ==0 ">
+ and t6.state is null
+ </if>
+ <if test="query.state ==1 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==2 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==3 ">
+ and t6.state = #{query.state}
</if>
<if test="query.type != null and query.type == 1">
and t1.device_id is null
@@ -159,12 +160,7 @@
<if test="query.type != null and query.type == 2">
and t1.device_id is not null
</if>
- <if test="query.startTime != null and query.startTime != ''">
- and t1.create_time >= #{query.startTime}
- </if>
- <if test="query.endTime != null and query.endTime != ''">
- and #{query.endTime} >=t1.create_time
- </if>
+
<if test="query.content!= null and query.content!=''">
and (t3.name like CONCAT('%', #{query.content}, '%')
or
@@ -178,12 +174,15 @@
<select id="deviceErrorList" resultType="com.ruoyi.system.vo.ErrorListVo">
select t1.*,t2.project_id,t2.plan_id,t3.`name` as projectName,t4.`name` as planName
,t5.`name` as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
+ ,IF(t6.state is null,0,t6.state) as state
from record t1
LEFT JOIN task t2 on t1.check_task_id = t2.id
LEFT JOIN project t3 on t2.project_id = t3.id
LEFT JOIN plan t4 on t2.plan_id = t4.id
LEFT JOIN problem t5 ON t1.problem_id = t5.id
- where t1.deleted = 0 and t2.deleted = 0 and t1.device_id is not null and
+ left join error_review t6 on t1.error_review_id = t6.id
+
+ where t1.deleted = 0 and t2.deleted = 0 and t1.device_id is not null
<if test="query.recordIds != null">
and t1.id in
<foreach item="item" index="index" collection="query.recordIds" open="(" separator="," close=")">
@@ -193,16 +192,19 @@
<if test="query.projectId != null">
and t2.project_id = #{query.projectId}
</if>
- <if test="query.reformed != null">
- and t1.reformed = #{query.reformed}
+ <if test="query.state ==0 ">
+ and t6.state is null
+ </if>
+ <if test="query.state ==1 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==2 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==3 ">
+ and t6.state = #{query.state}
</if>
- <if test="query.startTime != null and query.startTime != ''">
- and t1.create_time >= #{query.startTime}
- </if>
- <if test="query.endTime != null and query.endTime != ''">
- and #{query.endTime} >=t1.create_time
- </if>
<if test="query.content!= null and query.content!=''">
and (t3.name like CONCAT('%', #{query.content}, '%')
or
@@ -216,12 +218,15 @@
<select id="safetyErrorList" resultType="com.ruoyi.system.vo.ErrorListVo">
select t1.*,t2.project_id,t2.plan_id,t3.`name` as projectName,t4.`name` as planName
,t5.`name` as problemName,IF(t1.device_id is null ,1,2) as type,t1.create_time as checkTime
+ ,IF(t6.state is null,0,t6.state) as state
from record t1
LEFT JOIN task t2 on t1.check_task_id = t2.id
LEFT JOIN project t3 on t2.project_id = t3.id
LEFT JOIN plan t4 on t2.plan_id = t4.id
LEFT JOIN problem t5 ON t1.problem_id = t5.id
- where t1.deleted = 0 and t2.deleted = 0 and t1.device_id is null
+ left join error_review t6 on t1.error_review_id = t6.id
+
+ where t1.deleted = 0 and t1.device_id is null
<if test="query.recordIds != null">
and t1.id in
<foreach item="item" index="index" collection="query.recordIds" open="(" separator="," close=")">
@@ -231,16 +236,19 @@
<if test="query.projectId != null">
and t2.project_id = #{query.projectId}
</if>
- <if test="query.reformed != null">
- and t1.reformed = #{query.reformed}
+ <if test="query.state ==0 ">
+ and t6.state is null
+ </if>
+ <if test="query.state ==1 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==2 ">
+ and t6.state = #{query.state}
+ </if>
+ <if test="query.state ==3 ">
+ and t6.state = #{query.state}
</if>
- <if test="query.startTime != null and query.startTime != ''">
- and t1.create_time >= #{query.startTime}
- </if>
- <if test="query.endTime != null and query.endTime != ''">
- and #{query.endTime} >=t1.create_time
- </if>
<if test="query.content!= null and query.content!=''">
and (t3.name like CONCAT('%', #{query.content}, '%')
or
diff --git a/ruoyi-system/src/main/resources/mapper/system/ProjectMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ProjectMapper.xml
index ba59c08..9ad0d59 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ProjectMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ProjectMapper.xml
@@ -26,7 +26,7 @@
</resultMap>
<select id="getDeviceDetailCheckList" resultType="com.ruoyi.system.vo.DeviceDetailCheckListVo">
select t1.id,t2.name planName,t2.type planType,t1.date checkTime,t1.system_fuzzy fuzzyScore,t1.system_score score,t3.risk_level riskLevel,
- t3.contain_device_res ,t3.contain_system_res
+ t3.contain_device_res ,t3.contain_system_res,t2.id planId
from task t1
left join plan t2 on t1.plan_id = t2.id
left join eval_result t3 on t1.id = t3.check_task_id
--
Gitblit v1.7.1