From 9263a9be2c9c820c322dd734c4c18b0bcd05f91e Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 22 八月 2023 14:51:52 +0800 Subject: [PATCH] 改动4.0 --- inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java | 82 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 72 insertions(+), 10 deletions(-) diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java index e08a03e..e1ab7da 100644 --- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java +++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java @@ -1,14 +1,16 @@ 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.pojo.vo.StatisticsDataVo; 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 +25,76 @@ //璁$畻妫�楠屼笌鏈楠岀殑鍗曞瓙涓庨」鐩殑鏁伴噺鎺ュ彛 @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; + } + + //宸叉楠宼op3 + @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; + } + + //鏈楠宼po4 + @Override + public List<Map<String, Object>> unchecktop4() { + //妫�楠岄」鐩�,璁惧,妫�楠屽紑濮嬫椂闂�,鎵ц浜�,妫�楠岀粨鏉熸椂闂� + List<Map<String, Object>> mapList = inspectionProductMapper.getResultNum(); + 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) { + 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)); } } -- Gitblit v1.9.3