From 9af79e89d057f44b142fa8af6ae394d2ce7ccfe3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 14:15:57 +0800
Subject: [PATCH] 改动3.0
---
inspection-server/src/main/resources/mapper/InspectionProductMapper.xml | 16 ++++++++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java | 8 ++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java | 7 +++++++
inspection-server/src/main/resources/mapper/PlanMapper.xml | 2 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java | 5 +++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java | 4 ++++
6 files changed, 41 insertions(+), 1 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 a274678..503f39f 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
@@ -40,4 +40,11 @@
List<Map<String, Object>> checktop3s =homeService.checktop3();
return Result.success(checktop3s);
}
+
+ @ApiOperation("鏈楠宼op4")
+ @GetMapping("/unchecktop4")
+ public Result unchecktop4() {
+ List<Map<String, Object>> unchecktop4s =homeService.unchecktop4();
+ return Result.success(unchecktop4s);
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java
index 85a64d6..0349c07 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java
+++ b/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();
}
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 e6ff068..3fa57c7 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
@@ -19,4 +19,9 @@
*/
List<Map<String, Object>> checktop3();
+ /**
+ * 鏈楠宼op4
+ * @return
+ */
+ List<Map<String, Object>> unchecktop4();
}
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 e105696..3d0f258 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
@@ -53,6 +53,14 @@
return mapList;
}
+ //鏈楠宼po4
+ @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) {
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
index a04eeab..4fd8ea4 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index bf79c9d..87f4036 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/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"/>
--
Gitblit v1.9.3