改动3.0

zss

2023-08-22 9af79e89d057f44b142fa8af6ae394d2ce7ccfe3

改动3.0

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

@@ -40,4 +40,11 @@
        List<Map<String, Object>> checktop3s =homeService.checktop3();
        return Result.success(checktop3s);
    }

    @ApiOperation("未检验top4")
    @GetMapping("/unchecktop4")
    public Result unchecktop4() {
        List<Map<String, Object>> unchecktop4s =homeService.unchecktop4();
        return Result.success(unchecktop4s);
    }
}

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

@@ -4,6 +4,7 @@
import com.yuanchu.limslaboratory.pojo.InspectionProduct;

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

/**
 * 申请单下物料中的项目(InspectionProduct)表数据库访问层
@@ -27,5 +28,8 @@

    //计算未检验项目数量
    Integer seleCountUnInspro();

    //检验项目,设备,检验开始时间,执行人,检验结束时间
    List<Map<String, Object>> getResultNum();
}


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

@@ -19,4 +19,9 @@
     */
    List<Map<String, Object>> checktop3();

    /**
     * 未检验top4
     * @return
     */
    List<Map<String, Object>> unchecktop4();
}

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

@@ -53,6 +53,14 @@
        return mapList;
    }

    //未检验tpo4
    @Override
    public List<Map<String, Object>> unchecktop4() {
        //检验项目,设备,检验开始时间,执行人,检验结束时间
        List<Map<String, Object>> mapList = inspectionProductMapper.getResultNum();
        return mapList;
    }

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

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

@@ -37,4 +37,20 @@
        where state = 1
          and test_state is null
    </select>

    <!--获取检验项目,设备,检验开始时间,执行人,检验结束时间-->
    <select id="getResultNum" resultType="java.util.Map">
        select ip.name,
               equipment_name instrumentname,
               start_time     startTime,
               user.name      checkname,
               end_time       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
    </select>
</mapper>

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

@@ -8,7 +8,7 @@
        <result property="inspectionStatus" column="inspectionStatus"/>
        <result property="startTime" column="startTime"/>
        <result property="endTime" column="endTime"/>
        <collection property="chldren" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
        <collection property="children" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllPlanMapTowsMap" type="map">
        <id property="pid" column="pid"/>