refactor(quality): 调整质量检验服务的数据传输对象

liyong

2026-04-15 2a661e4920d992a9af7aa38f38e2c26dc4e578d6

refactor(quality): 调整质量检验服务的数据传输对象

- 将质量检验列表分页方法的返回类型从QualityInspect改为QualityInspectDto
- 从QualityInspect实体类中移除workOrderNo和purchaseContractNo字段
- 在QualityInspectDto中新增salesContractNo、workOrderNo和purchaseContractNo字段
- 更新MyBatis映射文件中的查询结果类型为QualityInspectDto
- 修改SQL查询以包含销售合同编号并调整表关联逻辑
- 更新控制器和服务层的方法参数类型为QualityInspectDto

 src/main/java/com/ruoyi/quality/controller/QualityInspectController.java

@@ -107,7 +107,7 @@
     * @return
     */
    @GetMapping("/listPage")
    public AjaxResult qualityInspectListPage(Page page, QualityInspect qualityInspect) {
    public AjaxResult qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
        return AjaxResult.success(qualityInspectService.qualityInspectListPage(page, qualityInspect));
    }


 src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java

@@ -23,4 +23,10 @@
    //检验项目
    private List<QualityInspectParam> qualityInspectParams;

    private String salesContractNo;


    private String workOrderNo;
    private String purchaseContractNo;

}

 src/main/java/com/ruoyi/quality/mapper/QualityInspectMapper.java

@@ -14,7 +14,7 @@
public interface QualityInspectMapper extends BaseMapper<QualityInspect> {


    IPage<QualityInspect> qualityInspectListPage(Page page, @Param("qualityInspect") QualityInspect qualityInspect);
    IPage<QualityInspectDto> qualityInspectListPage(Page page, @Param("qualityInspect") QualityInspect qualityInspect);

    List<QualityInspect> qualityInspectExport(@Param("qualityInspect") QualityInspect qualityInspect);


 src/main/java/com/ruoyi/quality/pojo/QualityInspect.java

@@ -153,11 +153,6 @@
    private Long testStandardId;


    @TableField(exist = false)
    private String workOrderNo;
    @TableField(exist = false)
    private String purchaseContractNo;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}

 src/main/java/com/ruoyi/quality/service/IQualityInspectService.java

@@ -15,7 +15,7 @@

    int updateQualityInspect(QualityInspectDto qualityInspectDto);

    IPage<QualityInspect> qualityInspectListPage(Page page, QualityInspect qualityInspect);
    IPage<QualityInspectDto> qualityInspectListPage(Page page, QualityInspectDto qualityInspect);

    void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect);


 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java

@@ -171,7 +171,7 @@
    }

    @Override
    public IPage<QualityInspect> qualityInspectListPage(Page page, QualityInspect qualityInspect) {
    public IPage<QualityInspectDto> qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
        return qualityInspectMapper.qualityInspectListPage(page, qualityInspect);
    }


 src/main/resources/mapper/quality/QualityInspectMapper.xml

@@ -1,7 +1,7 @@
<?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.quality.mapper.QualityInspectMapper">
    <select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
    <select id="qualityInspectListPage" resultType="com.ruoyi.quality.dto.QualityInspectDto">
        SELECT
        qi.*,
        <choose>
@@ -9,7 +9,8 @@
                pl.purchase_contract_number as purchase_contract_no
            </when>
            <otherwise>
                pwo.work_order_no
                pwo.work_order_no,
                sl.sales_contract_no
            </otherwise>
        </choose>
        FROM
@@ -21,6 +22,8 @@
            <otherwise>
                LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
                LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
                left join product_order po ON po.id = pwo.product_order_id
                left join sales_ledger sl ON sl.id = po.sales_ledger_id
            </otherwise>
        </choose>
        WHERE