改动4.0

zss

2023-08-22 9263a9be2c9c820c322dd734c4c18b0bcd05f91e

改动4.0

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

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


import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
import com.yuanchu.limslaboratory.pojo.vo.StatisticsDataVo;
import com.yuanchu.limslaboratory.service.HomeService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -27,7 +28,7 @@
    @Resource
    HomeService homeService;

    @ApiOperation("计算检验与未检验的单子与项目的数量接口")
    @ApiOperation("计算检验与未检验的单子与项目的数量")
    @GetMapping("/checkProjectNum")
    public Result checkProjectNum() {
        ProjectNumVo projectNumVo =homeService.checkProjectNum();
@@ -47,4 +48,11 @@
        List<Map<String, Object>> unchecktop4s =homeService.unchecktop4();
        return Result.success(unchecktop4s);
    }

    @ApiOperation("计算原材料与成品的合格率")
    @GetMapping("/qualified")
    public Result qualified() {
        StatisticsDataVo statisticsData =homeService.qualified();
        return Result.success(statisticsData);
    }
}

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

@@ -36,5 +36,14 @@

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

    //计算原材料与成品的合格率
    Long qualified(Integer b);

    //计算原材料检验单总数
    Integer getallmater();

    //计算成品检验单总数
    Integer getallfin();
}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.yuanchu.limslaboratory.pojo.vo;

import lombok.Data;

import java.math.BigDecimal;

@Data
public class StatisticsDataVo {

    private BigDecimal material;  //原材料合格率
    private BigDecimal unmaterial;  //原材料不合格率
    private BigDecimal notmaterial;  //原材料未检验率


    private BigDecimal finished;  //成品合格率
    private BigDecimal unfinished;  //成品不合格率
    private BigDecimal notfinished;  //成品未检验率
}

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

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

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

import java.util.List;
import java.util.Map;
@@ -9,19 +10,28 @@

    /**
     * è®¡ç®—检验与未检验的单子与项目的数量接口
     *
     * @return
     */
    ProjectNumVo checkProjectNum();

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

    /**
     * æœªæ£€éªŒtop4
     *
     * @return
     */
    List<Map<String, Object>> unchecktop4();

    /**
     * è®¡ç®—原材料与成品的合格率
     * @return
     */
    StatisticsDataVo qualified();
}

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

@@ -3,6 +3,7 @@
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductMapper;
import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
import com.yuanchu.limslaboratory.pojo.vo.StatisticsDataVo;
import com.yuanchu.limslaboratory.service.HomeService;
import org.springframework.stereotype.Service;

@@ -48,7 +49,7 @@
            //遍历获取数量
            Long num = (Long) map.get("num");
            //计算百分比并存入map中
            map.put("chact",getRadio(allIns,num));
            map.put("chact", getRadio(allIns, num));
        }
        return mapList;
    }
@@ -61,6 +62,31 @@
        return mapList;
    }

    //计算原材料与成品的合格率
    @Override
    public StatisticsDataVo qualified() {
        StatisticsDataVo statisticsDataVo = new StatisticsDataVo();
        //原材料检验单总数
        Integer allmater = inspectionMapper.getallmater();
        //原材料合格率
        Long mater = inspectionMapper.qualified(1);
        statisticsDataVo.setMaterial(getRadio(allmater, mater));
        //原材料不合格率
        Long unmater = inspectionMapper.qualified(0);
        statisticsDataVo.setUnmaterial(getRadio(allmater, unmater));
        //原材料未检验率
        Long notmater = inspectionMapper.qualified(null);
        statisticsDataVo.setNotmaterial(getRadio(allmater, notmater));

        //成品检验单总数
        Integer allfin = inspectionMapper.getallfin();
        //成品合格率
        //成品不合格率
        //成品未检验率

        return statisticsDataVo;
    }

    /*计算百分比*/
    private BigDecimal getRadio(Integer all, Long num) {
        if (all.intValue() == 0) {

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

@@ -55,8 +55,33 @@
        select inspection_status result,
               count(id)         num
        from lims_laboratory.inspection
        where state=1
        where state = 1
        group by result
        order by num desc
    </select>

    <!--计算原材料与成品的合格率-->
    <select id="qualified" resultType="java.lang.Long">
        select count(id)
        from lims_laboratory.inspection
        where state = 1
          and type = 0
          and inspection_status = #{b}
    </select>

    <!--计算原材料检验单总数-->
    <select id="getallmater" resultType="java.lang.Integer">
        select count(id)
        from lims_laboratory.inspection
        where state = 1
          and type = 0
    </select>

    <!--计算成品检验单总数-->
    <select id="getallfin" resultType="java.lang.Integer">
        select count(id)
        from lims_laboratory.inspection
        where state = 1
          and type in (1,2)
    </select>
</mapper>

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

@@ -41,16 +41,18 @@
    <!--获取检验项目,设备,检验开始时间,执行人,检验结束时间-->
    <select id="getResultNum" resultType="java.util.Map">
        select ip.name,
               equipment_name instrumentname,
               start_time     startTime,
               user.name      checkname,
               end_time       endTime
               equipment_name                      instrumentname,
               DATE_FORMAT(start_time, '%Y-%m-%d') startTime,
               user.name                           checkname,
               DATE_FORMAT(end_time, '%Y-%m-%d')   endTime
        from lims_laboratory.inspection_product ip
                 left join lims_laboratory.inspection_material on ip.inspection_material_id = inspection_material.id
                 left join lims_laboratory.inspection i on inspection_material.inspection_id = i.id
                 left join lims_laboratory.instrument on ip.instrument_id = instrument.id
                 left join lims_laboratory.user on ip.user_id = user.id
        where ip.state=1
        and test_state is null
        where ip.state = 1
          and test_state is null
        order by start_time
        limit 4
    </select>
</mapper>

 laboratory-server/src/main/resources/mapper/InstrumentMapper.xml

@@ -23,21 +23,23 @@

    <!--选择设备-->
    <resultMap id="chooseinstumMap" type="map">
        <id property="father_name" column="father_name"/>
        <collection property="father" resultMap="chooseinstumTowMap" javaType="List"/>
        <id property="name" column="father_name"/>
        <collection property="children" resultMap="chooseinstumTowMap" javaType="List"/>
    </resultMap>
    <resultMap id="chooseinstumTowMap" type="map">
        <id property="son_name" column="son_name"/>
        <collection property="chldren" resultMap="chooseinstumTowsMap" javaType="List"/>
        <id property="id" column="cid"/>
        <result property="name" column="son_name"/>
        <collection property="children" resultMap="chooseinstumTowsMap" javaType="List"/>
    </resultMap>
    <resultMap id="chooseinstumTowsMap" type="map">
        <id property="id" column="id"/>
        <result property="name" column="name"/>
    </resultMap>
    <select id="chooseinstum" resultMap="chooseinstumMap">
        select instrument.id,
               father_name,
               son_name,
        select c.id cid,
            instrument.id,
               father_name ,
               son_name ,
               equipment_name name
        from lims_laboratory.instrument
                 left join lims_laboratory.classify c on c.id = instrument.classify_id