改动2.0

zss

2023-08-22 59ae18f04a602bdfdc91299bbe2ff74a2ae1d215

改动2.0

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java

@@ -1,19 +1,18 @@
package com.yuanchu.limslaboratory.controller;


import com.yuanchu.limslaboratory.pojo.ProjectNum;
import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
import com.yuanchu.limslaboratory.service.HomeService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;

/**
 * é¦–页
@@ -31,7 +30,14 @@
    @ApiOperation("计算检验与未检验的单子与项目的数量接口")
    @GetMapping("/checkProjectNum")
    public Result checkProjectNum() {
        ProjectNum projectNum=homeService.checkProjectNum();
        return Result.success(projectNum);
        ProjectNumVo projectNumVo =homeService.checkProjectNum();
        return Result.success(projectNumVo);
    }

    @ApiOperation("已检验top3")
    @GetMapping("/checktop3")
    public Result checktop3() {
        List<Map<String, Object>> checktop3s =homeService.checktop3();
        return Result.success(checktop3s);
    }
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Inspection;

import java.util.List;
import java.util.Map;

/**
@@ -28,5 +30,11 @@

    //计算未检验的数量
    Integer seleCountUnIns();

    //获取检验单总数
    Integer getcount();

    //获取检验结论,检验数量
    List<Map<String, Object>> getResultNum();
}


 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ProjectNumVo.java

ÎļþÃû´Ó inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProjectNum.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package com.yuanchu.limslaboratory.pojo;
package com.yuanchu.limslaboratory.pojo.vo;

import lombok.Data;

@Data
public class ProjectNum {
public class ProjectNumVo {

    private int insNum;         //已检验的检验单数量
    private int insUnNum;       //未检验的检验单数量

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java

@@ -1,6 +1,9 @@
package com.yuanchu.limslaboratory.service;

import com.yuanchu.limslaboratory.pojo.ProjectNum;
import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;

import java.util.List;
import java.util.Map;

public interface HomeService {

@@ -8,6 +11,12 @@
     * è®¡ç®—检验与未检验的单子与项目的数量接口
     * @return
     */
    ProjectNum checkProjectNum();
    ProjectNumVo checkProjectNum();

    /**
     * å·²æ£€éªŒtop3
     * @return
     */
    List<Map<String, Object>> checktop3();

}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java

@@ -1,14 +1,15 @@
package com.yuanchu.limslaboratory.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.pojo.ProjectNum;
import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
import com.yuanchu.limslaboratory.service.HomeService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;


@Service
@@ -23,16 +24,43 @@

    //计算检验与未检验的单子与项目的数量接口
    @Override
    public ProjectNum checkProjectNum() {
        ProjectNum projectNum = new ProjectNum();
    public ProjectNumVo checkProjectNum() {
        ProjectNumVo projectNumVo = new ProjectNumVo();
        //已检验的检验单数量
        projectNum.setInsNum(inspectionMapper.seleCountIns());
        projectNumVo.setInsNum(inspectionMapper.seleCountIns());
        //未检验的检验单数量
        projectNum.setInsUnNum(inspectionMapper.seleCountUnIns());
        projectNumVo.setInsUnNum(inspectionMapper.seleCountUnIns());
        //已检验的检验项目数量
        projectNum.setInsproNum(inspectionProductMapper.seleCountInspro());
        projectNumVo.setInsproNum(inspectionProductMapper.seleCountInspro());
        //未检验的检验项目数量
        projectNum.setInsproUnNum(inspectionProductMapper.seleCountUnInspro());
        return projectNum;
        projectNumVo.setInsproUnNum(inspectionProductMapper.seleCountUnInspro());
        return projectNumVo;
    }

    //已检验top3
    @Override
    public List<Map<String, Object>> checktop3() {
        //获取检验单总数
        Integer allIns = inspectionMapper.getcount();
        //检验结论,检验数量
        List<Map<String, Object>> mapList = inspectionMapper.getResultNum();
        for (Map<String, Object> map : mapList) {
            //遍历获取数量
            Long num = (Long) map.get("num");
            //计算百分比并存入map中
            map.put("chact",getRadio(allIns,num));
        }
        return mapList;
    }

    /*计算百分比*/
    private BigDecimal getRadio(Integer all, Long num) {
        if (all.intValue() == 0) {
            return new BigDecimal(0);
        }
        BigDecimal numBigDecimal = new BigDecimal(num);
        BigDecimal allBigDecimal = new BigDecimal(all);
        BigDecimal divide = numBigDecimal.divide(allBigDecimal, 4, BigDecimal.ROUND_HALF_UP);
        return divide.multiply(new BigDecimal(100));
    }
}

 inspection-server/src/main/resources/mapper/InspectionMapper.xml

@@ -42,4 +42,21 @@
        where state = 1
          and inspection_status is null
    </select>

    <!--获取检验单总数-->
    <select id="getcount" resultType="java.lang.Integer">
        select count(id)
        from lims_laboratory.inspection
        where state = 1
    </select>

    <!--检验结论,检验数量-->
    <select id="getResultNum" resultType="java.util.Map">
        select inspection_status result,
               count(id)         num
        from lims_laboratory.inspection
        where state=1
        group by result
        order by num desc
    </select>
</mapper>

 standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java

@@ -33,11 +33,7 @@
    @Autowired
    private ProductModelService productModelService;

    @ApiOperation(value = "选择样品名称")
    @GetMapping("/selectmater")
    public Result selectmater() {
        return Result.success(productModelService.selectmater());
    }


    @ApiOperation(value = "添加标准-->选择项目分组")
    @GetMapping("/selectfather")

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java

@@ -17,11 +17,7 @@
 */
public interface ProductModelService extends IService<ProductModel> {

    /**
     * é€‰æ‹©æ ·å“åç§°
     * @return
     */
    List<String>  selectmater();


    /**
     * æ·»åŠ æ ‡å‡†-->选择项目分组

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java

@@ -1,10 +1,9 @@
package com.yuanchu.limslaboratory.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.mapper.MaterialMapper;
@@ -17,14 +16,11 @@
import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.service.SpecificationsService;
import com.yuanchu.limslaboratory.service.StandardService;
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -106,8 +102,12 @@
                    List<Product> productList = productModel.stream().map(stringObjectMap -> {
                        Product product = new Product();
                        product.setName(stringObjectMap.get("name").toString());
                        product.setFather(stringObjectMap.get("father").toString());
                        product.setUnit(stringObjectMap.get("unit").toString());
                        if (ObjectUtils.isNotEmpty(stringObjectMap.get("father"))) {
                            product.setFather(stringObjectMap.get("father").toString());
                        }
                        if (ObjectUtils.isNotEmpty(stringObjectMap.get("unit"))) {
                            product.setUnit(stringObjectMap.get("unit").toString());
                        }
                        product.setSpecifications_id(specifications.getId());
                        return product;
                    }).collect(Collectors.toList());

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java

@@ -28,11 +28,6 @@
    @Resource
    ProductModelMapper productModelMapper;

    //选择样品
    @Override
    public List<String> selectmater() {
        return productModelMapper.selectmater();
    }

    //添加标准-->选择项目分组
    @Override

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.Specifications;
@@ -14,7 +15,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
@@ -87,8 +87,12 @@
        List<Product> productList = productModel.stream().map(stringObjectMap -> {
            Product product = new Product();
            product.setName(stringObjectMap.get("name").toString());
            product.setFather(stringObjectMap.get("father").toString());
            product.setUnit(stringObjectMap.get("unit").toString());
            if (ObjectUtils.isNotEmpty(stringObjectMap.get("father"))) {
                product.setFather(stringObjectMap.get("father").toString());
            }
            if (ObjectUtils.isNotEmpty(stringObjectMap.get("unit"))) {
                product.setUnit(stringObjectMap.get("unit").toString());
            }
            product.setSpecifications_id(specifications.getId());
            return product;
        }).collect(Collectors.toList());

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java

@@ -107,8 +107,12 @@
                List<Product> productList = productModel.stream().map(stringObjectMap -> {
                    Product product = new Product();
                    product.setName(stringObjectMap.get("name").toString());
                    product.setFather(stringObjectMap.get("father").toString());
                    product.setUnit(stringObjectMap.get("unit").toString());
                    if (ObjectUtils.isNotEmpty(stringObjectMap.get("father"))) {
                        product.setFather(stringObjectMap.get("father").toString());
                    }
                    if (ObjectUtils.isNotEmpty(stringObjectMap.get("unit"))) {
                        product.setUnit(stringObjectMap.get("unit").toString());
                    }
                    product.setSpecifications_id(specifications.getId());
                    return product;
                }).collect(Collectors.toList());