zss
2023-09-01 a92b6f6175b1401071e5fb3bd9fab8a2a3b72011
version
已修改3个文件
28 ■■■■■ 文件已修改
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -77,12 +77,13 @@
    @ApiOperation("添加同一个型号的其他版本")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "specificationsId", value = "型号id", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "version", value = "当前版本", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/addVersion")
    @AuthHandler
    public Result<?> addVersion(Integer specificationsId ) {
        Integer version = productService.addVersion(specificationsId);
        return Result.success("添加版本"+version+"成功");
    public Result<?> addVersion(Integer specificationsId,Integer version ) {
        Integer version1 = productService.addVersion(specificationsId,version);
        return Result.success("添加版本"+version1+"成功");
    }
}
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
@@ -49,7 +49,7 @@
     * @param specificationsId
     * @return
     */
    Integer addVersion(Integer specificationsId);
    Integer addVersion(Integer specificationsId,Integer version);
    /**
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -9,6 +9,7 @@
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@@ -48,8 +49,8 @@
    //展示该型号下的检验项目要求
    @Override
    @Transactional(rollbackFor = Exception.class)
    public List<Map<String, Object>> pageProductInformation(Integer specificationsId,Integer version) {
        return productMapper.pageProductInformation(specificationsId,version);
    public List<Map<String, Object>> pageProductInformation(Integer specificationsId, Integer version) {
        return productMapper.pageProductInformation(specificationsId, version);
    }
    //填写标准值与内控值,鼠标移开保存
@@ -70,20 +71,22 @@
    //添加同一个型号的其他版本
    @Override
    public Integer addVersion(Integer specificationsId) {
        List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specificationsId));
    public Integer addVersion(Integer specificationsId, Integer version) {
        List<Product> productList = productMapper.selectList(Wrappers.<Product>query()
                .eq("specifications_id", specificationsId)
                .eq("version", version));
        for (Product product : productList) {
            product.setId(null);
            product.setVersion(product.getVersion()+1);
            product.setVersion(productMapper.chooseVersion(specificationsId).get(0) + 1);
            product.setSpecifications_id(specificationsId);
        }
         saveBatch(productList);
        saveBatch(productList);
        return productList.get(0).getVersion();
    }
    //查询该型号下的所有试验项目(父类)
    @Override
    public List<Map<String,Object>> chooseProject(Integer modelId) {
    public List<Map<String, Object>> chooseProject(Integer modelId) {
        return productMapper.chooseProject(modelId);
    }