From 11a52426cdb988e4e505cf1e79de3754db70abda Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 20 Aug 2024 13:15:20 +0800
Subject: [PATCH] =?UTF-8?q?app=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E5=AE=A1=E6=9F=A5=E7=AE=A1=E7=90=86=E3=80=81=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86=E3=80=81=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E8=AF=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SamplesManageAppServiceImpl.java     |  2 +-
 .../resources/mappers/app/HomeAppMapper.xml   | 28 +++++++++++--------
 .../mappers/app/SamplesManageAppMapper.xml    |  2 +-
 .../resources/mappers/basis/HomeMapper.xml    |  8 +++---
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/app/service/impl/SamplesManageAppServiceImpl.java b/src/main/java/com/bonus/aqgqj/app/service/impl/SamplesManageAppServiceImpl.java
index e434e43..6b2fccc 100644
--- a/src/main/java/com/bonus/aqgqj/app/service/impl/SamplesManageAppServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/app/service/impl/SamplesManageAppServiceImpl.java
@@ -230,7 +230,7 @@ public class SamplesManageAppServiceImpl implements SamplesManageAppService {
 			//查询是否为最后一条数据
 			int count = samplesManageAppDao.getCountById(data.getId());
 			if (count<=1){
-				return ServerResponse.createBySuccessMsg("不可删除，请至少保留一条数据");
+				return ServerResponse.createErroe("不可删除，请至少保留一条数据");
 			}
 			int res = samplesManageAppDao.delSamplesDetailsList(data);
 			if (res > 0) {
diff --git a/src/main/resources/mappers/app/HomeAppMapper.xml b/src/main/resources/mappers/app/HomeAppMapper.xml
index 34f0ed8..849f104 100644
--- a/src/main/resources/mappers/app/HomeAppMapper.xml
+++ b/src/main/resources/mappers/app/HomeAppMapper.xml
@@ -5,10 +5,10 @@
 		select
 			sum(case when team_id is null then 1 else 0 end ) as dispatchWorkNum
 			,sum(case when team_id is not null and process_status is null then 1 else 0 end ) as testNum
-			,sum(case when process_status='1' and is_er=1  then 1 else 0 end ) as reloadReviewNUm
-			,sum(case when process_status='1' and is_er is null  and  audti_status!='2'    then 1 else 0 end ) as reviewNUm
-			,sum(case when process_status='2' and  audti_status!='2'  then 1 else 0 end ) as examineNum
-			,sum(case when process_status='3' and  audti_status!='2' then 1 else 0 end ) as approvalNum
+			,sum(case when process_status='1' AND ts.audti_status = 0 and is_er=1  then 1 else 0 end ) as reloadReviewNUm
+			,sum(case when process_status='1' and is_er is null  and  audti_status=0    then 1 else 0 end ) as reviewNUm
+			,sum(case when process_status='2' and  audti_status=0  then 1 else 0 end ) as examineNum
+			,sum(case when process_status='3' and  audti_status=0 then 1 else 0 end ) as approvalNum
 			,DATE_FORMAT(NOW(), '%Y-%m-%d')  as updateDate
 		from (
 				 select * from tb_sample where del_flag='0'
@@ -29,14 +29,18 @@
 		where del_flag = '0'
 	</select>
 	<select id="getATeamCostForEcharts" parameterType="com.bonus.aqgqj.app.entity.HomeAppVo" resultType="com.bonus.aqgqj.app.entity.HomeAppVo">
-		select teamName,
-			   sum(amount) as testCost
-		from (select tt.team_name as teamName, ts.id, te.amount
-			  from tb_exper te
-					   left join tb_sample ts on te.sample_id = ts.id
-					   left join tb_team tt on ts.team_id = tt.id
-			  where ts.del_flag = '0') aa
-		group by teamName
+		SELECT teamName,
+			   ROUND(SUM(amount), 2) AS testCost
+		FROM (SELECT tt.team_name AS teamName,
+					 ts.id,
+					 te.amount
+			  FROM tb_exper te
+					   LEFT JOIN
+				   tb_sample ts ON te.sample_id = ts.id
+					   LEFT JOIN
+				   tb_team tt ON ts.team_id = tt.id
+			  WHERE ts.del_flag = '0') aa
+		GROUP BY teamName
 	</select>
 	<select id="getCostRank" parameterType="com.bonus.aqgqj.app.entity.HomeAppVo" resultType="com.bonus.aqgqj.app.entity.HomeAppVo">
 		SELECT
diff --git a/src/main/resources/mappers/app/SamplesManageAppMapper.xml b/src/main/resources/mappers/app/SamplesManageAppMapper.xml
index d436477..b6f4305 100644
--- a/src/main/resources/mappers/app/SamplesManageAppMapper.xml
+++ b/src/main/resources/mappers/app/SamplesManageAppMapper.xml
@@ -234,6 +234,6 @@
 	<select id="getCountById" resultType="java.lang.Integer">
 		SELECT COUNT(*)
 		FROM tb_sample_device
-		WHERE sample_id IN (SELECT tsd.sample_id FROM tb_sample_device tsd WHERE tsd.id = #{id})
+		WHERE sample_id IN (SELECT tsd.sample_id FROM tb_sample_device tsd WHERE tsd.id = #{id}) and del_falg=0
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mappers/basis/HomeMapper.xml b/src/main/resources/mappers/basis/HomeMapper.xml
index 897b01f..cf45fcb 100644
--- a/src/main/resources/mappers/basis/HomeMapper.xml
+++ b/src/main/resources/mappers/basis/HomeMapper.xml
@@ -5,10 +5,10 @@
 		select
 			sum(case when team_id is null then 1 else 0 end ) as dispatchWorkNum
 			,sum(case when team_id is not null and process_status is null then 1 else 0 end ) as testNum
-			,sum(case when process_status='1' and is_er=1  then 1 else 0 end ) as reloadReviewNUm
-			,sum(case when process_status='1' and is_er is null  and  audti_status!='2'    then 1 else 0 end ) as reviewNUm
-			,sum(case when process_status='2' and  audti_status!='2'  then 1 else 0 end ) as examineNum
-			,sum(case when process_status='3' and  audti_status!='2' then 1 else 0 end ) as approvalNum
+			,sum(case when process_status='1' AND ts.audti_status = 0 and is_er=1  then 1 else 0 end ) as reloadReviewNUm
+			,sum(case when process_status='1' and is_er is null  and  audti_status=0    then 1 else 0 end ) as reviewNUm
+			,sum(case when process_status='2' and  audti_status=0  then 1 else 0 end ) as examineNum
+			,sum(case when process_status='3' and  audti_status=0 then 1 else 0 end ) as approvalNum
 			,DATE_FORMAT(NOW(), '%Y-%m-%d')  as updateDate
 		from (
 				 select * from tb_sample where del_flag='0'