质检的指标维护复制功能重新编写

zss

5 小时以前 526f6c1fed7033682c3fc9e2c7561e1c015278a2

质检的指标维护复制功能重新编写

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

@@ -1,16 +1,13 @@
package com.ruoyi.quality.controller;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.dto.QualityTestStandardDto;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.service.IQualityTestStandardService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
@@ -53,16 +50,6 @@
    }

    /**
     * æ£€æµ‹æ ‡å‡†ä¸»è¡¨è¯¦æƒ…
     * @param id
     * @return
     */
    @GetMapping("/{id}")
    public AjaxResult QualityTestStandardDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityTestStandardService.getById(id));
    }

    /**
     * æ£€æµ‹æ ‡å‡†ä¸»è¡¨ä¿®æ”¹
     * @param qualityTestStandard
     * @return
@@ -85,12 +72,12 @@

    /**
     * æ£€æµ‹æ ‡å‡†å¤åˆ¶å‚æ•°
     * @param qualityTestStandardDto
     * @param qualityTestStandard
     * @return
     */
    @PostMapping("/copyParam")
    public AjaxResult copyParam(@RequestBody QualityTestStandardDto qualityTestStandardDto) {
        return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandardDto));
    public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
    }

}

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

ÎļþÒÑɾ³ý

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

@@ -30,7 +30,7 @@
    private static final long serialVersionUID = 1L;

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

    @ApiModelProperty("标准编号")
    private String standardNo;
@@ -62,7 +62,6 @@
    private Long tenantId;

    @ApiModelProperty("状态")
    @TableLogic
    private String state;

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

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

@@ -29,7 +29,7 @@
    private static final long serialVersionUID = 1L;

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

    @ApiModelProperty("参数项")
    private String parameterItem;

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

@@ -3,10 +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.quality.dto.QualityTestStandardDto;
import com.ruoyi.quality.pojo.QualityTestStandard;

import javax.servlet.http.HttpServletResponse;

/**
 * <p>
@@ -20,6 +17,6 @@
    IPage<QualityTestStandard> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard);


    int copyParam(QualityTestStandardDto qualityTestStandardDto);
    int copyParam(QualityTestStandard qualityTestStandard);

}

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

@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.quality.dto.QualityTestStandardDto;
import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
@@ -44,11 +43,15 @@
    }

    @Override
    public int copyParam(QualityTestStandardDto qualityTestStandardDto) {
    public int copyParam(QualityTestStandard qualityTestStandard) {
        //先查询被复制的检测标准的详情参数
        List<QualityTestStandardParam> oldQualityTestStandardParams = qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, qualityTestStandardDto.getOldTestStandardId()));
        List<QualityTestStandardParam> oldQualityTestStandardParams = qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, qualityTestStandard.getId()));
        QualityTestStandard testStandard = qualityTestStandardMapper.selectById(qualityTestStandard.getId());
        testStandard.setId(null);
        testStandard.setStandardNo(null);
        qualityTestStandardMapper.insert(testStandard);
        List<QualityTestStandardParam> newQualityTestStandardParams = oldQualityTestStandardParams.stream().map(oldQualityTestStandardParam -> {
            oldQualityTestStandardParam.setTestStandardId(qualityTestStandardDto.getNewTestStandardId());
            oldQualityTestStandardParam.setTestStandardId(testStandard.getId());
            return oldQualityTestStandardParam;
        }).collect(Collectors.toList());
        qualityTestStandardParamService.saveBatch(newQualityTestStandardParams);