From c5138faa1c4771bfbc19de5b257e7c129c081cb8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 13:30:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java | 4 ++++
chart-server/src/main/resources/mapper/WorkMapper.xml | 12 ++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/chart-server/src/main/resources/mapper/WorkMapper.xml b/chart-server/src/main/resources/mapper/WorkMapper.xml
index 385f61c..5d3c2ab 100644
--- a/chart-server/src/main/resources/mapper/WorkMapper.xml
+++ b/chart-server/src/main/resources/mapper/WorkMapper.xml
@@ -7,7 +7,7 @@
from (select distinct user.name, count(inspection_product.id) unfinish
from lims_laboratory.inspection_product
left join lims_laboratory.user on inspection_product.user_pro_id = user.id
- where state = 1
+ where inspection_product.state = 1
and test_state is null
and inspection_product.inspection_material_id in
(select id
@@ -23,7 +23,7 @@
(select distinct user.name, count(inspection_product.id) finsh
from lims_laboratory.inspection_product
left join lims_laboratory.user on inspection_product.user_pro_id = user.id
- where state = 1
+ where inspection_product.state = 1
and test_state is not null
and inspection_product.inspection_material_id in
(select id
@@ -45,7 +45,7 @@
from (select distinct user.name, count(inspection_product.id) unfinsh
from lims_laboratory.inspection_product
left join lims_laboratory.user on inspection_product.user_id = user.id
- where state = 1
+ where inspection_product.state = 1
and test_state is null
and inspection_product.inspection_material_id in
(select id
@@ -61,7 +61,7 @@
(select distinct user.name, count(inspection_product.id) finsh
from lims_laboratory.inspection_product
left join lims_laboratory.user on inspection_product.user_id = user.id
- where state = 1
+ where inspection_product.state = 1
and test_state is not null
and inspection_product.inspection_material_id in
(select id
@@ -83,7 +83,7 @@
from (select distinct user.name, count(inspection_product.id) total
from lims_laboratory.inspection_product
left join lims_laboratory.user on inspection_product.user_pro_id = user.id
- where state = 1
+ where inspection_product.state = 1
and inspection_product.inspection_material_id in
(select id
from lims_laboratory.inspection_material
@@ -126,7 +126,7 @@
from (select distinct user.name, count(inspection_product.id) total
from lims_laboratory.inspection_product
left join lims_laboratory.user on inspection_product.user_id = user.id
- where state = 1
+ where inspection_product.state = 1
and inspection_product.inspection_material_id in
(select id
from lims_laboratory.inspection_material
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
index d49897a..b5abe93 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
@@ -37,6 +37,10 @@
@JsonSerialize
private String conclusion;
+ @ApiModelProperty(value = "妫�楠岀被鍨�")
+ @JsonSerialize
+ private int type;
+
@ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬凡閫氳繃 3:涓嶉�氳繃")
@JsonSerialize
private Integer status;
--
Gitblit v1.9.3