From 99530da67d18c6876757e3fe9dec185f9a4e7761 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 24 三月 2025 16:01:36 +0800
Subject: [PATCH] 质量监督监控添加查询状态
---
cnas-process/src/main/java/com/ruoyi/process/dto/QualitySuperviseDetailsDto.java | 9 ++++
cnas-process/src/main/java/com/ruoyi/process/dto/QualityMonitorDetailsDto.java | 23 +++++++++++
cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java | 3 +
cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java | 3 +
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java | 3 +
ruoyi-admin/src/main/resources/application-druid.yml | 4 +-
cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml | 26 +++++++++++--
cnas-process/src/main/resources/mapper/QualitySuperviseDetailsMapper.xml | 35 ++++++++++++-----
cnas-process/src/main/java/com/ruoyi/process/mapper/QualityMonitorDetailsMapper.java | 3 +
9 files changed, 89 insertions(+), 20 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java
index f415a46..a76e400 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.process.dto.QualityMonitorDetailsDto;
import com.ruoyi.process.dto.QualityMonitorDto;
import com.ruoyi.process.mapper.QualityMonitorDetailsEvaluateFileMapper;
import com.ruoyi.process.pojo.*;
@@ -101,7 +102,7 @@
*/
@ApiOperation(value = "鐩戞帶璁″垝璇︽儏鍒楄〃")
@GetMapping("/pageQualityMonitorDetail")
- public Result<IPage<QualityMonitorDetails>> pageQualityMonitorDetail(QualityMonitorDetails qualityMonitorDetails,Page page) throws Exception {
+ public Result<IPage<QualityMonitorDetailsDto>> pageQualityMonitorDetail(QualityMonitorDetails qualityMonitorDetails, Page page) throws Exception {
return Result.success(qualityMonitorService.pageQualityMonitorDetail(page, qualityMonitorDetails));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/dto/QualityMonitorDetailsDto.java b/cnas-process/src/main/java/com/ruoyi/process/dto/QualityMonitorDetailsDto.java
new file mode 100644
index 0000000..d9f2538
--- /dev/null
+++ b/cnas-process/src/main/java/com/ruoyi/process/dto/QualityMonitorDetailsDto.java
@@ -0,0 +1,23 @@
+package com.ruoyi.process.dto;
+
+import com.ruoyi.process.pojo.QualityMonitorDetails;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author zhuo
+ * @Date 2025/3/24
+ */
+@Data
+public class QualityMonitorDetailsDto extends QualityMonitorDetails {
+
+ @ApiModelProperty("瀹炴柦鐘舵��, 0: 鏈紑濮�, 1:寰呮壒鍑�, 2:宸叉壒鍑�")
+ private Integer detailsRatifyStatus;
+
+ @ApiModelProperty("鎶ュ憡鐘舵��, 0: 鏈紑濮�, 1:寰呮彁浜�, 2:琛ユ壒鍑�, 3:宸叉壒鍑�")
+ private Integer reportStatus;
+
+ @ApiModelProperty("璇勪环鐘舵��, 0: 鏈紑濮�, 1:寰呰瘎浠�, 2:寰呮壒鍑�, 3:宸叉壒鍑�")
+ private Integer evaluateStatus;
+
+}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/dto/QualitySuperviseDetailsDto.java b/cnas-process/src/main/java/com/ruoyi/process/dto/QualitySuperviseDetailsDto.java
index 6e3854d..055aa81 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/dto/QualitySuperviseDetailsDto.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/dto/QualitySuperviseDetailsDto.java
@@ -22,4 +22,13 @@
@ApiModelProperty("鐩戠潱鍘熷洜绫诲瀷, 1:瀹氭湡鐩戠潱, 2:鍔ㄦ�佺洃鐫�")
private Integer causeType;
+
+ @ApiModelProperty("璁板綍鐘舵��, 0: 鏈紑濮�, 1:寰呮壒鍑�, 2:宸叉壒鍑�")
+ private Integer recordStatus;
+
+ @ApiModelProperty("鎺у埗鐘舵��, 0: 鏈紑濮�, 1:寰呮壒鍑�, 2:宸叉壒鍑�")
+ private Integer accordingStatus;
+
+ @ApiModelProperty("绾犳鐘舵��, 0: 鏈紑濮�, 1:寰呮壒鍑�, 2:宸叉壒鍑�")
+ private Integer correctStatus;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/QualityMonitorDetailsMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/QualityMonitorDetailsMapper.java
index 8648038..22bb9a7 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/QualityMonitorDetailsMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/QualityMonitorDetailsMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.process.dto.QualityMonitorDetailsDto;
import com.ruoyi.process.pojo.QualityMonitorDetails;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -23,6 +24,6 @@
* @param qualityMonitorDetailsQueryWrapper
* @return
*/
- IPage<QualityMonitorDetails> pageQualityMonitorDetail(Page page, @Param("ew") QueryWrapper<QualityMonitorDetails> qualityMonitorDetailsQueryWrapper);
+ IPage<QualityMonitorDetailsDto> pageQualityMonitorDetail(Page page, @Param("ew") QueryWrapper<QualityMonitorDetails> qualityMonitorDetailsQueryWrapper);
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java b/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java
index 8bd261e..b3f4a42 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.process.dto.QualityMonitorDetailsDto;
import com.ruoyi.process.dto.QualityMonitorDto;
import com.ruoyi.process.pojo.*;
import org.springframework.web.multipart.MultipartFile;
@@ -54,7 +55,7 @@
* @param qualityMonitorDetails
* @return
*/
- IPage<QualityMonitorDetails> pageQualityMonitorDetail(Page page, QualityMonitorDetails qualityMonitorDetails);
+ IPage<QualityMonitorDetailsDto> pageQualityMonitorDetail(Page page, QualityMonitorDetails qualityMonitorDetails);
/**
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
index 2c86286..16d1e15 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
@@ -25,6 +25,7 @@
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.inspect.util.UserUtils;
import com.ruoyi.inspect.util.XWPFDocumentUtils;
+import com.ruoyi.process.dto.QualityMonitorDetailsDto;
import com.ruoyi.process.dto.QualityMonitorDetailsEvaluateDto;
import com.ruoyi.process.dto.QualityMonitorDto;
import com.ruoyi.process.excel.QualityMonitorDetailsUpload;
@@ -273,7 +274,7 @@
* @return
*/
@Override
- public IPage<QualityMonitorDetails> pageQualityMonitorDetail(Page page, QualityMonitorDetails qualityMonitorDetails) {
+ public IPage<QualityMonitorDetailsDto> pageQualityMonitorDetail(Page page, QualityMonitorDetails qualityMonitorDetails) {
if (qualityMonitorDetails.getQualityMonitorId() == null) {
return new Page();
}
diff --git a/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml b/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
index 0617ad7..e47b813 100644
--- a/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
+++ b/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
@@ -1,11 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.process.mapper.QualityMonitorDetailsMapper">
- <select id="pageQualityMonitorDetail" resultType="com.ruoyi.process.pojo.QualityMonitorDetails">
+ <select id="pageQualityMonitorDetail" resultType="com.ruoyi.process.dto.QualityMonitorDetailsDto">
select * from (
- select *
- from cnas_quality_monitor_details
- order by quality_monitor_details_id
+ SELECT cqmd.*,
+ CASE
+ WHEN cqmder.is_finish = 1 THEN 2
+ WHEN cqmder.quality_monitor_details_id IS NOT NULL THEN 1
+ ELSE 0 END details_ratify_status,
+ CASE
+ WHEN cqmd.ratify_status = 1 THEN 3
+ WHEN cqmd.ratify_status = 0 THEN 2
+ WHEN cqmd.finish_report_url IS NOT NULL THEN 1
+ ELSE 0 END report_status,
+ CASE
+ WHEN cqmde.is_finish = 1 THEN 3
+ WHEN cqmde.ratify_user_id IS NOT NULL THEN 2
+ WHEN cqmde.implement_user_id IS NOT NULL and cqmde.details_evaluate_id is not null THEN 1
+ ELSE 0 END evaluate_status
+ FROM cnas_quality_monitor_details cqmd
+ LEFT JOIN cnas_quality_monitor_details_evaluate cqmde
+ ON cqmd.quality_monitor_details_id = cqmde.quality_monitor_details_id
+ LEFT JOIN cnas_quality_monitor_details_ratify cqmder
+ ON cqmder.quality_monitor_details_id = cqmd.quality_monitor_details_id
+ order by cqmd.quality_monitor_details_id
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
diff --git a/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsMapper.xml b/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsMapper.xml
index be608d7..9877619 100644
--- a/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsMapper.xml
+++ b/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsMapper.xml
@@ -6,16 +6,31 @@
<select id="pageQualitySuperviseDetail" resultType="com.ruoyi.process.dto.QualitySuperviseDetailsDto">
select *
from (select cd.*,
- cr.is_according,
- ca.is_correct,
- cc.supervise_details_correct_id
- from cnas_quality_supervise_details cd
- left join cnas_quality_supervise_details_record cr
- on cr.supervise_details_id = cd.supervise_details_id
- left join cnas_quality_supervise_details_according ca
- on ca.supervise_details_id = cd.supervise_details_id
- left join cnas_quality_supervise_details_correct cc
- on cc.supervise_details_id = cd.supervise_details_id
+ cr.is_according,
+ ca.is_correct,
+ cc.supervise_details_correct_id,
+ case
+ when cr.is_finish = 1 then 2
+ when cr.supervise_details_record_id is not null then 1
+ else 0
+ end record_status,
+ case
+ when ca.is_finish = 1 then 2
+ when ca.supervise_details_according_id is not null then 1
+ else 0
+ end according_status,
+ case
+ when cc.is_finish = 1 then 2
+ when cc.supervise_details_correct_id is not null then 1
+ else 0
+ end correct_status
+ from cnas_quality_supervise_details cd
+ left join cnas_quality_supervise_details_record cr
+ on cr.supervise_details_id = cd.supervise_details_id
+ left join cnas_quality_supervise_details_according ca
+ on ca.supervise_details_id = cd.supervise_details_id
+ left join cnas_quality_supervise_details_correct cc
+ on cc.supervise_details_id = cd.supervise_details_id
where 1=1
<choose>
<when test="causeType != null and causeType == 1">
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 9bd45f1..5c423a9 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,9 +8,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://10.16.173.59:3306/lims-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/center-lims?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: zttZTT123!
+ password: 123456
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
--
Gitblit v1.9.3