fix: 多余字段列去除

gongchunyi

2026-06-24 96a6f204fadc4c2516f7ca00c6f1f3874279b32b

fix: 多余字段列去除

 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java

@@ -198,7 +198,7 @@
                qualityInspect.setProductMainId(productionProductMain.getId());
                qualityInspect.setProductModelId(productModel.getId());
                qualityInspectMapper.insert(qualityInspect);
                List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType, process);
                List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType);
                if (qualityTestStandard.size() > 0) {
                    qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
                    qualityInspectMapper.updateById(qualityInspect);

 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java

@@ -276,7 +276,7 @@
        qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
        qualityInspect.setPassRate(BigDecimal.valueOf(100).setScale(2, RoundingMode.HALF_UP));
        qualityInspectMapper.insert(qualityInspect);
        List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(saleProduct.getProductId(), 0, null);
        List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(saleProduct.getProductId(), 0);
        if (qualityTestStandard.size() > 0) {
            qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
            qualityInspectMapper.updateById(qualityInspect);

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

@@ -7,6 +7,7 @@
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.ruoyi.quality.service.QualityTestStandardParamService;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

@@ -102,8 +103,9 @@
     * @return
     */
    @GetMapping("/getQualityTestStandardByProductId")
    public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
        return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
    @ApiOperation(value = "根据产品id获取标准信息")
    public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType) {
        return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType));
    }

    /**

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

@@ -22,5 +22,5 @@

    IPage<QualityTestStandard> qualityTestStandardListPage(Page page, @Param("c") QualityTestStandard qualityTestStandard);

    List<QualityTestStandard> getQualityTestStandardByProductId(@Param("productId") Long productId, @Param("inspectType") Integer inspectType, @Param("process") String process);
    List<QualityTestStandard> getQualityTestStandardByProductId(@Param("productId") Long productId, @Param("inspectType") Integer inspectType);
}

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

@@ -66,7 +66,4 @@

    @ApiModelProperty("类别(0:原材料检验;1:过程检验;2:出厂检验)")
    private Integer inspectType;

    @ApiModelProperty("工序id")
    private Integer processId;
}

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

@@ -22,7 +22,7 @@

    int copyParam(QualityTestStandard qualityTestStandard);

    List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType,String process);
    List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType);

    int delQualityTestStandard(List<Integer> ids);
}

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

@@ -73,8 +73,8 @@
    }

    @Override
    public List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType, String process) {
        return qualityTestStandardMapper.getQualityTestStandardByProductId(productId, inspectType, process);
    public List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType) {
        return qualityTestStandardMapper.getQualityTestStandardByProductId(productId, inspectType);
    }

    @Override

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -3461,7 +3461,7 @@

        QualityTestStandard selectedStandard = null;
        if (dbProduct.getProductId() != null) {
            List<QualityTestStandard> standards = qualityTestStandardMapper.getQualityTestStandardByProductId(dbProduct.getProductId(), 2, null);
            List<QualityTestStandard> standards = qualityTestStandardMapper.getQualityTestStandardByProductId(dbProduct.getProductId(), 2);
            if (CollectionUtils.isNotEmpty(standards)) {
                selectedStandard = standards.get(0);
                qualityInspect.setTestStandardId(selectedStandard.getId());
@@ -3523,7 +3523,7 @@

        QualityTestStandard selectedStandard = null;
        if (dbProduct.getProductId() != null) {
            List<QualityTestStandard> standards = qualityTestStandardMapper.getQualityTestStandardByProductId(dbProduct.getProductId(), 2, null);
            List<QualityTestStandard> standards = qualityTestStandardMapper.getQualityTestStandardByProductId(dbProduct.getProductId(), 2);
            if (CollectionUtils.isNotEmpty(standards)) {
                selectedStandard = standards.get(0);
                qualityInspect.setTestStandardId(selectedStandard.getId());

 src/main/resources/mapper/device/DeviceRepairMapper.xml

@@ -52,6 +52,7 @@
                and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
            </if>
        </where>
    order by repair_time desc
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.id,

 src/main/resources/mapper/production/ProductProcessMapper.xml

@@ -15,7 +15,7 @@
                AND  p.no LIKE CONCAT('%',#{productProcessDto.no},'%')
            </if>
        </where>
        order by p.id asc
        order by p.id desc
    </select>

    <select id="calculateProductionStatistics" resultType="com.ruoyi.home.dto.processDataProductionStatisticsDto">

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

@@ -24,12 +24,8 @@
        SELECT qts.*
        FROM quality_test_standard qts
                 left join quality_test_standard_binding qtsb on qtsb.test_standard_id = qts.id
                 left join product_process pp on qts.process_id = pp.id
        WHERE qtsb.product_id = #{productId}
          AND qts.inspect_type = #{inspectType}
        <if test="process!='' and process!=null">
            and pp.name = #{process}
        </if>
        order by qts.id desc
    </select>
</mapper>

 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml

@@ -159,7 +159,7 @@
        sl.supplier_name,
        pm.thickness
        ORDER BY
        slp.product_category
        sl.entry_date desc
    </select>

    <select id="procurementBusinessSummaryStatistics"