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/resources/mapper/InspectionProductMapper.xml | 14 ++--
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 16 +++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/StatisticsDataVo.java | 18 ++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java | 28 +++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java | 10 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java | 10 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java | 9 +++
inspection-server/src/main/resources/mapper/InspectionMapper.xml | 27 ++++++++
8 files changed, 116 insertions(+), 16 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
index 503f39f..4fd39a0 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
+++ b/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);
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
index 0613f0d..f143ace 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
+++ b/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();
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/StatisticsDataVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/StatisticsDataVo.java
new file mode 100644
index 0000000..3a04a2d
--- /dev/null
+++ b/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; //鎴愬搧鏈楠岀巼
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
index 3fa57c7..0a93716 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
+++ b/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();
/**
* 宸叉楠宼op3
+ *
* @return
*/
List<Map<String, Object>> checktop3();
/**
* 鏈楠宼op4
+ *
* @return
*/
List<Map<String, Object>> unchecktop4();
+
+ /**
+ * 璁＄畻鍘熸潗鏂欎笌鎴愬搧鐨勫悎鏍肩巼
+ * @return
+ */
+ StatisticsDataVo qualified();
}
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 3d0f258..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
@@ -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) {
diff --git a/inspection-server/src/main/resources/mapper/InspectionMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
index d324cf1..e2feafa 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
index 4fd8ea4..c8e4d6a 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 98a6181..2bd4204 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/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
--
Gitblit v1.9.3