质量监督监控添加查询状态

zhuo

2025-03-24 99530da67d18c6876757e3fe9dec185f9a4e7761

质量监督监控添加查询状态

 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));
    }


 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;

}

 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;
}

 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);
}


 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);


    /**

 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();
        }

 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}

 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">

 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:
        # ä»Žæ•°æ®æºå¼€å…³/默认关闭