设备完善

zss

2025-03-12 1c1ebb911e40aba9f051b6db1360956372d6a15f

设备完善

 cnas-device/pom.xml

ÎļþÒÑɾ³ý

 cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceFaultController.java

@@ -43,8 +43,8 @@
        deviceFaultService.removeById(id);
    }

    @GetMapping("/device/{deviceId}")
    public Result<Map<String,Object>> getDeviceFaultsByDeviceId(@PathVariable Integer deviceId) {
    @GetMapping("/device")
    public Result<Map<String,Object>> getDeviceFaultsByDeviceId(Integer deviceId) {
       return  Result.success(deviceFaultService.findByDeviceId(deviceId));
    }
}
}

 cnas-require/src/main/java/com/ruoyi/requier/controller/DocumentController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package com.ruoyi.requier.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.requier.pojo.Document;
import com.ruoyi.requier.service.DocumentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@RestController
@RequestMapping("/documents")
public class DocumentController {

    @Resource
    private DocumentService documentService;

    @PostMapping("add")
    public Result createDocument(@RequestBody Document document) {
        documentService.save(document);
        return Result.success("ok");
    }

    @GetMapping("/id")
    public Document getDocumentById(Integer id) {
        return documentService.getById(id);
    }

    @PostMapping("updateDocument")
    public Result updateDocument(@RequestBody Document document) {
        return Result.success(documentService.updateById(document));
    }

    @DeleteMapping("/deleteDocumentById")
    public Result deleteDocumentById( Integer id) {
        return Result.success(documentService.removeById(id));
    }

    @GetMapping("/getListByDId")
    public Result getAllDocuments(Integer id) {
        LambdaQueryWrapper<Document> lambdaQueryWrapper=new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(Document::getDeviceId,id);
        return Result.success(documentService.list(lambdaQueryWrapper));
    }
}

 cnas-require/src/main/java/com/ruoyi/requier/controller/IncidentReportController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,73 @@
package com.ruoyi.requier.controller;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.requier.dto.IncidentReportAddDto;
import com.ruoyi.requier.excel.IncidentReportExport;
import com.ruoyi.requier.service.IncidentReportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶æ·»åŠ éªŒæ”¶å­—段表 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 03:54:49
 */
@RestController
@RequestMapping("/incidentReport")
public class IncidentReportController {
    @Autowired
    private IncidentReportService incidentReportService;

    @PostMapping("saveIncidentReportData")
    public Result saveIncidentReportData(@RequestBody IncidentReportAddDto incidentReportAddDto) {
        incidentReportService.saveIncidentReportData(incidentReportAddDto);
        return Result.success();
    }

    @GetMapping("/getShowIncidentReport")
    public Result getShowIncidentReport(@RequestParam("id") Integer id) {
        return Result.success(incidentReportService.getShowIncidentReport(id));
    }

    @DeleteMapping("/deleteIncidentReport")
    public Result deleteIncidentReport(@RequestParam("id") Integer id) {
        incidentReportService.deleteIncidentReport(id);
        return Result.success();
    }

    @GetMapping("/incidentReportPage")
    public Result incidentReportPage(@RequestParam("deviceId") Integer deviceId, Page page, String processNumber){
        return Result.success(incidentReportService.getByDeviceId(deviceId, page, processNumber));
    }

    @DeleteMapping("deleteIncidentReportAll")
    public Result deleteIncidentReport(Integer sparePartsId, Integer fileId, Integer installId, Integer acceptanceCheckId) {
        incidentReportService.deleteIncidentReportAll(sparePartsId, fileId, installId, acceptanceCheckId);
        return Result.success();
    }

    @GetMapping("/incidentReportExport")
    public Result incidentReportPage(@RequestParam("deviceId") Integer deviceId, HttpServletResponse response) throws IOException {
        List<IncidentReportExport> list = incidentReportService.incidentReportExport(deviceId);
        response.setHeader("requestType", "excel");
        response.setHeader("Access-Control-Expose-Headers", "requestType");
        // è®¾ç½®å•å…ƒæ ¼æ ·å¼
        // ä¿å­˜åˆ°ç¬¬ä¸€ä¸ªsheet中
        EasyExcel.write(response.getOutputStream())
                .head(IncidentReportExport.class)
                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // è‡ªé€‚应列宽
                .sheet()
                .doWrite(list);
        return Result.success();
    }
}

 cnas-require/src/main/java/com/ruoyi/requier/dto/IncidentReportAddDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.ruoyi.requier.dto;

import com.ruoyi.requier.pojo.*;
import lombok.Data;

import java.util.List;

@Data
public class IncidentReportAddDto extends IncidentReport {
    private List<IncidentSpareParts> sparePartsConfirmationList; // å¤‡ä»¶ç¡®è®¤List
    private List<IncidentFile> fileClassConfirmationList; // æ–‡ä»¶ç¡®è®¤List
    private List<IncidentInstall> installationAcceptanceRecordList; // å®‰è£…验收记录
    private List<IncidentAcceptanceCheck> acceptanceCheckRecordList; // éªŒæ”¶æ ¸æŸ¥è®°å½•

    private String deviceName;

    private String managementNumber;

    private String submitUser;

    private String saveState;

    private String manufacturer;

    private String specificationModel;
}

 cnas-require/src/main/java/com/ruoyi/requier/excel/IncidentReportExport.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.ruoyi.requier.excel;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

@Data
public class IncidentReportExport {
    @ExcelProperty(value = "流程编号")
    private String processNumber;

    @ExcelProperty(value = "设备名称")
    private String deviceName;

    @ExcelProperty(value = "管理编号")
    private String managementNumber;

    @ExcelProperty(value = "序列号")
    private String serialNumber;

    @ExcelProperty(value = "提交者")
    private String submitUser;

    @ExcelProperty(value = "提交日期")
    private String createTime;

    @ExcelProperty(value = "当前状态")
    private String saveState;

    @ExcelProperty("当前负责人")
    private String currentResponsible;
}

 cnas-require/src/main/java/com/ruoyi/requier/mapper/DocumentDao.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.ruoyi.requier.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.requier.pojo.Document;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface DocumentDao extends BaseMapper<Document> {
}

 cnas-require/src/main/java/com/ruoyi/requier/mapper/IncidentAcceptanceCheckMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.ruoyi.requier.mapper;


import com.ruoyi.framework.mybatis_config.MyBaseMapper;
import com.ruoyi.requier.pojo.IncidentAcceptanceCheck;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶-验收核查 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 04:41:19
 */
public interface IncidentAcceptanceCheckMapper extends MyBaseMapper<IncidentAcceptanceCheck> {

}

 cnas-require/src/main/java/com/ruoyi/requier/mapper/IncidentFileMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.ruoyi.requier.mapper;


import com.ruoyi.framework.mybatis_config.MyBaseMapper;
import com.ruoyi.requier.pojo.IncidentFile;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶-文件类确认 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 04:41:36
 */
public interface IncidentFileMapper extends MyBaseMapper<IncidentFile> {

}

 cnas-require/src/main/java/com/ruoyi/requier/mapper/IncidentInstallMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.ruoyi.requier.mapper;


import com.ruoyi.framework.mybatis_config.MyBaseMapper;
import com.ruoyi.requier.pojo.IncidentInstall;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶-安装验收检查 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 04:41:50
 */
public interface IncidentInstallMapper extends MyBaseMapper<IncidentInstall> {

}

 cnas-require/src/main/java/com/ruoyi/requier/mapper/IncidentReportMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ruoyi.requier.mapper;

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.requier.dto.IncidentReportAddDto;
import com.ruoyi.requier.excel.IncidentReportExport;
import com.ruoyi.requier.pojo.IncidentReport;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶æ·»åŠ éªŒæ”¶å­—段表 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 03:54:49
 */
public interface IncidentReportMapper extends BaseMapper<IncidentReport> {

    IPage<IncidentReportAddDto> getByDeviceId(Page page, @Param("deviceId") Integer deviceId, @Param("processNumber") String processNumber);

    IncidentReportAddDto getShowIncidentReport(Integer id);

    List<IncidentReportExport> incidentReportExport(Integer deviceId);
}

 cnas-require/src/main/java/com/ruoyi/requier/mapper/IncidentSparePartsMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.ruoyi.requier.mapper;


import com.ruoyi.framework.mybatis_config.MyBaseMapper;
import com.ruoyi.requier.pojo.IncidentSpareParts;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶-备件确认 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 04:42:06
 */
public interface IncidentSparePartsMapper extends MyBaseMapper<IncidentSpareParts> {

}

 cnas-require/src/main/java/com/ruoyi/requier/pojo/Document.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,89 @@
package com.ruoyi.requier.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;


@Data
@TableName(value = "device_documents")
public class Document implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ä¸»é”®ID
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * æ–‡æ¡£ç±»åž‹ï¼ˆæžšä¸¾ï¼‰
     */
    private String documentType;

    /**
     * åç§°
     */
    private String name;

    /**
     * ç‰ˆæœ¬å·
     */
    private String version;

    /**
     * æ•°é‡
     */
    private Integer quantity;

    /**
     * é¡µæ•°
     */
    private Integer pageCount;

    /**
     * æä¾›å•†
     */
    private String provider;

    /**
     * æä¾›æ—¥æœŸ
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime provideDate;

    /**
     * å¤‡æ³¨
     */
    private String comments;

    /**
     * åˆ›å»ºæ—¶é—´
     */

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime createdAt;

    /**
     * æ›´æ–°æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updatedAt;

    private int deviceId;

    @ApiModelProperty("资产编号")
    private String number;

    @ApiModelProperty("原始文件名称")
    private String systemFileName;

    @ApiModelProperty("系统生成文件名称")
    private String fileName;
}

 cnas-require/src/main/java/com/ruoyi/requier/pojo/IncidentAcceptanceCheck.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
package com.ruoyi.requier.pojo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶-验收核查
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 04:41:19
 */
@Getter
@Setter
@TableName("device_incident_acceptance_check")
@ApiModel(value = "IncidentAcceptanceCheck对象", description = "设备验收-验收核查")
public class IncidentAcceptanceCheck implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键id")
    @TableId(type = IdType.AUTO)
    private Integer acceptanceCheckId;

    @ApiModelProperty("仪器模块")
    private String instrumentModule;

    @ApiModelProperty("核查参数")
    private String verificationParameter;

    @ApiModelProperty("可接收限")
    private String acceptableLimit;

    @ApiModelProperty("核查结果")
    private String verificationResult;

    @ApiModelProperty("核查结论")
    private String verificationConclusion;

    @ApiModelProperty("设备验收ID")
    private Integer incidentId;
}

 cnas-require/src/main/java/com/ruoyi/requier/pojo/IncidentFile.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
package com.ruoyi.requier.pojo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶-文件类确认
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 04:41:36
 */
@Getter
@Setter
@TableName("device_incident_file")
@ApiModel(value = "IncidentFile对象", description = "设备验收-文件类确认")
public class IncidentFile implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(type = IdType.AUTO)
    private Integer fileId;

    @ApiModelProperty("应有册数")
    private Integer expectedCopies;

    @ApiModelProperty("实际收到册数")
    private Integer actualCopies;

    @ApiModelProperty("设备验收id")
    private Integer incidentId;
}

 cnas-require/src/main/java/com/ruoyi/requier/pojo/IncidentInstall.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
package com.ruoyi.requier.pojo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶-安装验收检查
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 04:41:50
 */
@Getter
@Setter
@TableName("device_incident_install")
@ApiModel(value = "IncidentInstall对象", description = "设备验收-安装验收检查")
public class IncidentInstall implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键id")
    @TableId(type = IdType.AUTO)
    private Integer installId;

    @ApiModelProperty("项目")
    private String installationProject;

    @ApiModelProperty("安装情况")
    private String installationSituation;

    @ApiModelProperty("安装完成")
    private String installationCompleted;

    @ApiModelProperty("设备验收")
    private Integer incidentId;
}

 cnas-require/src/main/java/com/ruoyi/requier/pojo/IncidentReport.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,142 @@
package com.ruoyi.requier.pojo;

import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶æ·»åŠ éªŒæ”¶å­—段表
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 03:54:49
 */
@Getter
@Setter
@TableName("device_incident_report")
@ApiModel(value = "IncidentReport对象", description = "设备验收添加验收字段表")
public class IncidentReport implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ExcelProperty(value = "流程编号")
    @ApiModelProperty("流程编号")
    private String processNumber;

    @ApiModelProperty("设备id")
    private Integer deviceId;

    @ApiModelProperty("序列号")
    private String serialNumber;

    @ApiModelProperty("设备类别")
    private String deviceClass;

    @ApiModelProperty("开箱前检查外包装有无破损")
    private String checkOuterPackaging;

    @ApiModelProperty("原文件名称")
    private String fileName;

    @ApiModelProperty("系统生成文件名称")
    private String systemFileName;

    @ApiModelProperty("设备开箱验收结论")
    private String unpackingAcceptanceConclusion;

    @ApiModelProperty("1提交 ä¸‹çŽ¯èŠ‚负责人名称")
    private String submitNextPesponsible;

    @ApiModelProperty("1提交 æäº¤å¤‡æ³¨")
    private String submitRemarks;

    @ApiModelProperty("1提交 æäº¤æ“ä½œäºº")
    private String submitOperatingPersonnel;

    @ApiModelProperty("1提交 æäº¤æ—¥æœŸ")
    private LocalDateTime submitDate;

    @ApiModelProperty("2开箱验收复核 å¤æ ¸æ„è§")
    private String unpackingReviewOpinion;

    @ApiModelProperty("2开箱验收复核 ä¸‹çŽ¯èŠ‚负责人")
    private String unpackingNextPesponsible;

    @ApiModelProperty("2开箱验收复核 æ“ä½œäºº")
    private String unpackingOperatingPersonnel;

    @ApiModelProperty("2开箱验收复核 æ—¥æœŸ")
    private LocalDateTime unpackingDate;

    @ApiModelProperty("3安装位置")
    private String installLocation;

    @ApiModelProperty("3安装备注")
    private String installRemarks;

    @ApiModelProperty("3安装下环节负责人")
    private String installNextPesponsible;

    @ApiModelProperty("3安装操作人")
    private String installOperatingPersonnel;

    @ApiModelProperty("3安装日期")
    private LocalDateTime installDate;

    @ApiModelProperty("4安装验收复核意见")
    private String installationAcceptanceCompoundOpinion;

    @ApiModelProperty("4安装验收下环节负责人")
    private String installationAcceptanceNextPesponsible;

    @ApiModelProperty("4安装验收操作人")
    private String installationAcceptanceOperatingPersonnel;

    @ApiModelProperty("4安装验收日期")
    private LocalDateTime installationAcceptanceDate;

    @ApiModelProperty("5验收核查 è®¾å¤‡å¼€ç®±éªŒæ”¶ç»“论")
    private String acceptanceCheckUnpackingConclusion;

    @ApiModelProperty("5验收核查 ä¸‹çŽ¯èŠ‚负责人")
    private String acceptanceCheckNextPesponsible;

    @ApiModelProperty("5验收核查 æ“ä½œäºº")
    private String acceptanceCheckOperatingPersonnel;

    @ApiModelProperty("5验收核查 æ—¥æœŸ")
    private LocalDateTime acceptanceCheckDate;

    @ApiModelProperty("6验收核查审核 å®¡æ ¸æ„è§")
    private String acceptanceAuditAuditOpinion;

    @ApiModelProperty("6验收核查审核 æ“ä½œäºº")
    private String acceptanceAuditOperatingPersonnel;

    @ApiModelProperty("6验收核查审核 æ—¥æœŸ")
    private LocalDateTime acceptanceAuditDate;

    @ApiModelProperty(value = "创建人id")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty("当前状态")
    private String currentState;

    @ApiModelProperty(value = "创建日期 / æäº¤æ—¥æœŸ")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("当前负责人")
    private String currentResponsible;
}

 cnas-require/src/main/java/com/ruoyi/requier/pojo/IncidentSpareParts.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
package com.ruoyi.requier.pojo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶-备件确认
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 04:42:06
 */
@Getter
@Setter
@TableName("device_incident_spare_parts")
@ApiModel(value = "IncidentSpareParts对象", description = "设备验收-备件确认")
public class IncidentSpareParts implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty("主键id")
    @TableId(type = IdType.AUTO)
    private Integer sparePartsId;

    @ApiModelProperty("名称")
    private String name;

    @ApiModelProperty("数量")
    private Integer number;

    @ApiModelProperty("备注")
    private String note;

    @ApiModelProperty("设备验收ID")
    private Integer incidentId;
}

 cnas-require/src/main/java/com/ruoyi/requier/service/DocumentService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.ruoyi.requier.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.requier.pojo.Document;

public interface DocumentService extends IService<Document> {
}

 cnas-require/src/main/java/com/ruoyi/requier/service/IncidentAcceptanceCheckService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.ruoyi.requier.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.requier.pojo.IncidentAcceptanceCheck;

public interface IncidentAcceptanceCheckService extends IService<IncidentAcceptanceCheck> {
}

 cnas-require/src/main/java/com/ruoyi/requier/service/IncidentFileService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.ruoyi.requier.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.requier.pojo.IncidentFile;

public interface IncidentFileService extends IService<IncidentFile> {
}

 cnas-require/src/main/java/com/ruoyi/requier/service/IncidentInstallService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.ruoyi.requier.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.requier.pojo.IncidentInstall;

public interface IncidentInstallService extends IService<IncidentInstall> {
}

 cnas-require/src/main/java/com/ruoyi/requier/service/IncidentReportService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.ruoyi.requier.service;

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.requier.dto.IncidentReportAddDto;
import com.ruoyi.requier.excel.IncidentReportExport;
import com.ruoyi.requier.pojo.IncidentReport;

import java.util.List;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶æ·»åŠ éªŒæ”¶å­—段表 æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 03:54:49
 */
public interface IncidentReportService extends IService<IncidentReport> {

    void saveIncidentReportData(IncidentReportAddDto incidentReportAddDto);

    IPage<IncidentReportAddDto> getByDeviceId(Integer deviceId, Page page, String processNumber);

    void deleteIncidentReport(Integer id);

    IncidentReportAddDto getShowIncidentReport(Integer id);

    void deleteIncidentReportAll(Integer sparePartsId, Integer fileId, Integer installId, Integer acceptanceCheckId);

    List<IncidentReportExport> incidentReportExport(Integer deviceId);
}

 cnas-require/src/main/java/com/ruoyi/requier/service/IncidentSparePartsService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.ruoyi.requier.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.requier.pojo.IncidentSpareParts;

public interface IncidentSparePartsService extends IService<IncidentSpareParts> {
}

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceFaultServiceImpl.java

@@ -12,10 +12,13 @@
import com.ruoyi.requier.mapper.DeviceMapper;
import com.ruoyi.requier.pojo.*;
import com.ruoyi.requier.service.DeviceFaultService;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.mapper.SysDictTypeMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

@@ -27,6 +30,9 @@

    @Autowired
    private QrShowServiceImpl qrShowService;

    @Resource
    private SysDictDataMapper sysDictDataMapper;

    @Autowired
    private DeviceMaintenanceMapper deviceMaintenanceMapper;
@@ -60,7 +66,8 @@
                    .eq(DeviceFaultOne::getDeviceId, device.getId())
                    .orderByDesc(DeviceFaultOne::getId))).orElse(new ArrayList<>());
            //查询设备状态字典
            List<SysDictData> sysDictDataList = DictUtils.getDictCache("设备状态");
            List<SysDictData> sysDictDataList = sysDictDataMapper.selectDictDataByType("device_status");
//            List<SysDictData> sysDictDataList = DictUtils.getDictCache("设备状态");
            SysDictData findEnum = sysDictDataList.stream().filter(e-> Integer.parseInt(e.getDictValue()) ==device.getDeviceStatus()).findFirst().orElse(new SysDictData());
            map.put("progress",qrShowService.calcDeviceNextCheckRatio(calibrate.getCalibrationDate(),calibrate.getNextCalibrationDate()));//距离下次校准日期的天数百分比
            map.put("deviceName",device.getDeviceName());//设备名称
@@ -97,4 +104,4 @@
        }
        return map;
    }
}
}

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/DocumentServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.ruoyi.requier.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.requier.mapper.DocumentDao;
import com.ruoyi.requier.pojo.Document;
import com.ruoyi.requier.service.DocumentService;
import org.springframework.stereotype.Service;

@Service
public class DocumentServiceImpl extends ServiceImpl<DocumentDao, Document> implements DocumentService {
}

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/IncidentAcceptanceCheckServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.ruoyi.requier.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.requier.mapper.IncidentAcceptanceCheckMapper;
import com.ruoyi.requier.pojo.IncidentAcceptanceCheck;
import com.ruoyi.requier.service.IncidentAcceptanceCheckService;
import org.springframework.stereotype.Service;

@Service
public class IncidentAcceptanceCheckServiceImpl extends ServiceImpl<IncidentAcceptanceCheckMapper, IncidentAcceptanceCheck> implements IncidentAcceptanceCheckService {
}

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/IncidentFileServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.ruoyi.requier.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.requier.mapper.IncidentFileMapper;
import com.ruoyi.requier.pojo.IncidentFile;
import com.ruoyi.requier.service.IncidentFileService;
import org.springframework.stereotype.Service;

@Service
public class IncidentFileServiceImpl extends ServiceImpl<IncidentFileMapper, IncidentFile> implements IncidentFileService {
}

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/IncidentInstallServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.ruoyi.requier.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.requier.mapper.IncidentInstallMapper;
import com.ruoyi.requier.pojo.IncidentInstall;
import com.ruoyi.requier.service.IncidentInstallService;
import org.springframework.stereotype.Service;

@Service
public class IncidentInstallServiceImpl extends ServiceImpl<IncidentInstallMapper, IncidentInstall> implements IncidentInstallService {
}

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/IncidentReportServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,116 @@
package com.ruoyi.requier.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.requier.dto.IncidentReportAddDto;
import com.ruoyi.requier.excel.IncidentReportExport;
import com.ruoyi.requier.mapper.IncidentReportMapper;
import com.ruoyi.requier.pojo.*;
import com.ruoyi.requier.service.*;
import com.ruoyi.system.mapper.UserMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Locale;

/**
 * <p>
 * è®¾å¤‡éªŒæ”¶æ·»åŠ éªŒæ”¶å­—段表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-09-19 03:54:49
 */
@Service
@AllArgsConstructor
@Transactional(rollbackFor = Exception.class)
public class IncidentReportServiceImpl extends ServiceImpl<IncidentReportMapper, IncidentReport> implements IncidentReportService {
    @Autowired
    private UserMapper userMapper;
    private IncidentSparePartsService incidentSparePartsService;
    private IncidentFileService incidentFileService;
    private IncidentInstallService incidentInstallService;
    private IncidentAcceptanceCheckService incidentAcceptanceCheckService;

    private final NumberGenerator<IncidentReport> numberGenerator;

    @Override
    public void saveIncidentReportData(IncidentReportAddDto incidentReportAddDto) {
        if (ObjectUtils.isEmpty(incidentReportAddDto.getProcessNumber())) {
            String year = new SimpleDateFormat("yy", Locale.CHINESE).format(new Date());
            String month = new SimpleDateFormat("MM", Locale.CHINESE).format(new Date());
            String processNumber = numberGenerator.generateNumberWithPrefix(3, "DG-TC-07FM " + month + "-" + year + month, IncidentReport::getProcessNumber);
            incidentReportAddDto.setProcessNumber(processNumber);
        }
        this.saveOrUpdate(incidentReportAddDto);
        // å¤‡ä»¶ç¡®è®¤List
        if (ObjectUtils.isNotEmpty(incidentReportAddDto.getSparePartsConfirmationList())) {
            incidentReportAddDto.getSparePartsConfirmationList().forEach(i -> i.setIncidentId(incidentReportAddDto.getId()));
            incidentSparePartsService.saveOrUpdateBatch(incidentReportAddDto.getSparePartsConfirmationList());
        }
        // æ–‡ä»¶ç¡®è®¤List
        if (ObjectUtils.isNotEmpty(incidentReportAddDto.getFileClassConfirmationList())) {
            incidentReportAddDto.getFileClassConfirmationList().forEach(i -> i.setIncidentId(incidentReportAddDto.getId()));
            incidentFileService.saveOrUpdateBatch(incidentReportAddDto.getFileClassConfirmationList());
        }
        // å®‰è£…验收记录
        if (ObjectUtils.isNotEmpty(incidentReportAddDto.getInstallationAcceptanceRecordList())) {
            incidentReportAddDto.getInstallationAcceptanceRecordList().forEach(i -> i.setIncidentId(incidentReportAddDto.getId()));
            incidentInstallService.saveOrUpdateBatch(incidentReportAddDto.getInstallationAcceptanceRecordList());
        }
        // éªŒæ”¶æ ¸æŸ¥è®°å½•
        if (ObjectUtils.isNotEmpty(incidentReportAddDto.getAcceptanceCheckRecordList())) {
            incidentReportAddDto.getAcceptanceCheckRecordList().forEach(i -> i.setIncidentId(incidentReportAddDto.getId()));
            incidentAcceptanceCheckService.saveOrUpdateBatch(incidentReportAddDto.getAcceptanceCheckRecordList());
        }
    }

    @Override
    public IPage<IncidentReportAddDto> getByDeviceId(Integer deviceId, Page page, String processNumber) {
        return baseMapper.getByDeviceId(page, deviceId, processNumber);
    }

    @Override
    public void deleteIncidentReport(Integer id) {
        baseMapper.deleteById(id);
        incidentSparePartsService.remove(Wrappers.<IncidentSpareParts>lambdaQuery().eq(IncidentSpareParts::getIncidentId, id));
        incidentFileService.remove(Wrappers.<IncidentFile>lambdaQuery().eq(IncidentFile::getIncidentId, id));
        incidentInstallService.remove(Wrappers.<IncidentInstall>lambdaQuery().eq(IncidentInstall::getIncidentId, id));
        incidentAcceptanceCheckService.remove(Wrappers.<IncidentAcceptanceCheck>lambdaQuery().eq(IncidentAcceptanceCheck::getIncidentId, id));
    }

    @Override
    public IncidentReportAddDto getShowIncidentReport(Integer id) {
        return baseMapper.getShowIncidentReport(id);
    }

    @Override
    public void deleteIncidentReportAll(Integer sparePartsId, Integer fileId, Integer installId, Integer acceptanceCheckId) {
        if (ObjectUtils.isNotEmpty(sparePartsId)) {
            incidentSparePartsService.removeById(sparePartsId);
        }
        if (ObjectUtils.isNotEmpty(fileId)) {
            incidentFileService.removeById(fileId);
        }
        if (ObjectUtils.isNotEmpty(installId)) {
            incidentInstallService.removeById(installId);
        }
        if (ObjectUtils.isNotEmpty(acceptanceCheckId)) {
            incidentAcceptanceCheckService.removeById(acceptanceCheckId);
        }
    }

    @Override
    public List<IncidentReportExport> incidentReportExport(Integer deviceId) {
        return baseMapper.incidentReportExport(deviceId);
    }
}

 cnas-require/src/main/java/com/ruoyi/requier/service/impl/IncidentSparePartsServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.ruoyi.requier.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.requier.mapper.IncidentSparePartsMapper;
import com.ruoyi.requier.pojo.IncidentSpareParts;
import com.ruoyi.requier.service.IncidentSparePartsService;
import org.springframework.stereotype.Service;

@Service
public class IncidentSparePartsServiceImpl extends ServiceImpl<IncidentSparePartsMapper, IncidentSpareParts> implements IncidentSparePartsService {
}

 cnas-require/src/main/resources/mapper/DeviceMaintenanceMapper.xml

@@ -8,7 +8,7 @@
        ,date from device_maintenance
    </select>

<!--    <select id="getDeviceMaintenancePage" resultType="com.yuanchu.mom.pojo.DeviceMaintenance">-->
<!--    <select id="getDeviceMaintenancePage" resultType="com.ruoyi.requier.pojo.DeviceMaintenance">-->
<!--        select *-->
<!--        from device_maintenance dm-->
<!--        where dm.device_id = #{deviceId}-->
@@ -19,4 +19,4 @@
        from device_maintenance dm
        where dm.device_id = #{deviceId}
    </select>
</mapper>
</mapper>

 cnas-require/src/main/resources/mapper/IncidentAcceptanceCheckMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
<?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.requier.mapper.IncidentAcceptanceCheckMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.IncidentAcceptanceCheck">
        <id column="acceptance_checkId" property="acceptanceCheckId" />
        <result column="instrument_module" property="instrumentModule" />
        <result column="verification_parameter" property="verificationParameter" />
        <result column="acceptable_limit" property="acceptableLimit" />
        <result column="verification_result" property="verificationResult" />
        <result column="verification_conclusion" property="verificationConclusion" />
        <result column="incident_id" property="incidentId" />
    </resultMap>

</mapper>

 cnas-require/src/main/resources/mapper/IncidentFileMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<?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.requier.mapper.IncidentFileMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.IncidentFile">
        <id column="file_id" property="fileId" />
        <result column="expected_copies" property="expectedCopies" />
        <result column="actual_copies" property="actualCopies" />
        <result column="incident_id" property="incidentId" />
    </resultMap>

</mapper>

 cnas-require/src/main/resources/mapper/IncidentInstallMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
<?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.requier.mapper.IncidentInstallMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.IncidentInstall">
        <id column="install_id" property="installId" />
        <result column="installation_project" property="installationProject" />
        <result column="installation_situation" property="installationSituation" />
        <result column="installation_completed" property="installationCompleted" />
        <result column="incident_id" property="incidentId" />
    </resultMap>

</mapper>

 cnas-require/src/main/resources/mapper/IncidentReportMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,114 @@
<?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.requier.mapper.IncidentReportMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.IncidentReport">
        <id column="id" property="id" />
        <result column="process_number" property="processNumber" />
        <result column="device_id" property="deviceId" />
        <result column="serial_number" property="serialNumber" />
        <result column="device_class" property="deviceClass" />
        <result column="check_outer_packaging" property="checkOuterPackaging" />
        <result column="file_name" property="fileName" />
        <result column="system_file_name" property="systemFileName" />
        <result column="unpacking_acceptance_conclusion" property="unpackingAcceptanceConclusion" />
        <result column="submit_next_pesponsible" property="submitNextPesponsible" />
        <result column="submit_remarks" property="submitRemarks" />
        <result column="submit_operating_personnel" property="submitOperatingPersonnel" />
        <result column="submit_date" property="submitDate" />
        <result column="unpacking_review_opinion" property="unpackingReviewOpinion" />
        <result column="unpacking_next_pesponsible" property="unpackingNextPesponsible" />
        <result column="unpacking_operating_personnel" property="unpackingOperatingPersonnel" />
        <result column="unpacking_date" property="unpackingDate" />
        <result column="install_location" property="installLocation" />
        <result column="install_remarks" property="installRemarks" />
        <result column="install_next_pesponsible" property="installNextPesponsible" />
        <result column="install_operating_personnel" property="installOperatingPersonnel" />
        <result column="install_date" property="installDate" />
        <result column="installation_acceptance_compound_opinion" property="installationAcceptanceCompoundOpinion" />
        <result column="installation_acceptance_next_pesponsible" property="installationAcceptanceNextPesponsible" />
        <result column="installation_acceptance_operating_personnel" property="installationAcceptanceOperatingPersonnel" />
        <result column="installation_acceptance_date" property="installationAcceptanceDate" />
        <result column="acceptance_check_unpacking_conclusion" property="acceptanceCheckUnpackingConclusion" />
        <result column="acceptance_check_next_pesponsible" property="acceptanceCheckNextPesponsible" />
        <result column="acceptance_check_operating_personnel" property="acceptanceCheckOperatingPersonnel" />
        <result column="acceptance_check_date" property="acceptanceCheckDate" />
        <result column="acceptance_audit_operating_personnel" property="acceptanceAuditOperatingPersonnel" />
        <result column="acceptance_audit_date" property="acceptanceAuditDate" />
        <result column="create_user" property="createUser" />
        <result column="current_state" property="currentState" />
        <result column="create_time" property="createTime" />
        <result column="current_responsible" property="currentResponsible" />
        <result column="acceptance_audit_audit_opinion" property="acceptanceAuditAuditOpinion" />
    </resultMap>

    <resultMap id="IncidentReportAddDtoMap" type="com.ruoyi.requier.dto.IncidentReportAddDto" extends="BaseResultMap">
        <result column="device_name" property="deviceName" />
        <result column="management_number" property="managementNumber" />
        <result column="manufacturer" property="manufacturer" />
        <result column="specification_model" property="specificationModel" />
        <collection property="sparePartsConfirmationList" ofType="com.ruoyi.requier.pojo.IncidentSpareParts">
            <id column="spare_parts_id" property="sparePartsId" />
            <result column="name" property="name" />
            <result column="number" property="number" />
            <result column="note" property="note" />
            <result column="incident_id" property="incidentId" />
        </collection>
        <collection property="fileClassConfirmationList" ofType="com.ruoyi.requier.pojo.IncidentFile">
            <id column="file_id" property="fileId" />
            <result column="expected_copies" property="expectedCopies" />
            <result column="actual_copies" property="actualCopies" />
            <result column="incident_id" property="incidentId" />
        </collection>
        <collection property="installationAcceptanceRecordList" ofType="com.ruoyi.requier.pojo.IncidentInstall">
            <id column="install_id" property="installId" />
            <result column="installation_project" property="installationProject" />
            <result column="installation_situation" property="installationSituation" />
            <result column="installation_completed" property="installationCompleted" />
            <result column="incident_id" property="incidentId" />
        </collection>
        <collection property="acceptanceCheckRecordList" ofType="com.ruoyi.requier.pojo.IncidentAcceptanceCheck">
            <id column="acceptance_check_id" property="acceptanceCheckId" />
            <result column="instrument_module" property="instrumentModule" />
            <result column="verification_parameter" property="verificationParameter" />
            <result column="acceptable_limit" property="acceptableLimit" />
            <result column="verification_result" property="verificationResult" />
            <result column="verification_conclusion" property="verificationConclusion" />
            <result column="incident_id" property="incidentId" />
        </collection>
    </resultMap>

    <select id="getByDeviceId" resultType="com.ruoyi.requier.dto.IncidentReportAddDto">
        select dir.*, d.device_name, d.management_number, u.name submitUser
        from device_incident_report dir
                 left join device d on d.id = dir.device_id
            left join user u on u.id = dir.create_user
        where dir.device_id = #{deviceId}
        <if test="processNumber != '' and processNumber != null">
            and dir.process_number like concat('%', #{processNumber}, '%')
        </if>
    </select>

    <select id="getShowIncidentReport" resultMap="IncidentReportAddDtoMap">
        select dir.*, d.device_name, d.management_number, d.manufacturer, d.specification_model,
               diac.acceptance_check_id, diac.instrument_module,diac.verification_parameter, diac.acceptable_limit, diac.verification_result, diac.verification_conclusion,
               disp.spare_parts_id, disp.name, disp.number, disp.note,
               dif.file_id, dif.expected_copies, dif.actual_copies,
               dii.install_id, dii.installation_completed, dii.installation_project, dii.installation_situation
        from device_incident_report dir
                 left join device d on d.id = dir.device_id
                 left join device_incident_acceptance_check diac on diac.incident_id = dir.id
                 left join device_incident_file dif on dif.incident_id = dir.id
                 left join device_incident_install dii on dii.incident_id = dir.id
                 left join device_incident_spare_parts disp on disp.incident_id = dir.id
        where dir.id = #{id}
    </select>

    <select id="incidentReportExport" resultType="com.ruoyi.requier.excel.IncidentReportExport">
        select dir.*, d.device_name, d.management_number, d.manufacturer, d.specification_model
        from device_incident_report dir
                 left join device d on d.id = dir.device_id
        where dir.device_id = #{deviceId}
    </select>
</mapper>

 cnas-require/src/main/resources/mapper/IncidentSparePartsMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
<?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.requier.mapper.IncidentSparePartsMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.IncidentSpareParts">
        <id column="spare_parts_id" property="sparePartsId" />
        <result column="name" property="name" />
        <result column="number" property="number" />
        <result column="note" property="note" />
        <result column="incident_id" property="incidentId" />
    </resultMap>

</mapper>

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/DepartmentLimsMapper.java

@@ -10,7 +10,7 @@
* @author z1292
* @description é’ˆå¯¹è¡¨ã€department_lims(部门明细)】的数据库操作Mapper
* @createDate 2024-05-22 14:08:17
* @Entity com.yuanchu.mom.pojo.DepartmentLims
* @Entity com.ruoyi.requier.pojo.DepartmentLims
*/
public interface DepartmentLimsMapper extends BaseMapper<DepartmentLims> {