From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/resources/mappers/RouteProcedureExtMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/src/main/resources/mappers/RouteProcedureExtMapper.xml b/server/src/main/resources/mappers/RouteProcedureExtMapper.xml
index 550a884..caba8ea 100644
--- a/server/src/main/resources/mappers/RouteProcedureExtMapper.xml
+++ b/server/src/main/resources/mappers/RouteProcedureExtMapper.xml
@@ -457,7 +457,7 @@
SELECT a.*,p.`NAME` AS procedureName
,(select sum(b.num) from workorder_record b left join workorder d on b.workorder_id=d.id left join plans c on b.plan_id=c.id where d.status=4 and b.type=1 and b.deleted=0 and c.deleted=0 and b.procedure_id=p.id and c.work_plans_id=#{workPlanId}) as doneNum
,(select sum(b.qualified_num) from workorder_record b left join workorder d on b.workorder_id=d.id left join plans c on b.plan_id=c.id where d.status=4 and b.type=1 and b.deleted=0 and c.deleted=0 and b.procedure_id=p.id and c.work_plans_id=#{workPlanId}) as qualifiedNum
- ,(select sum(b.num) from plans b where b.deleted=0 and b.work_plans_id=#{workPlanId} and b.procedure_id=p.id) as plansNum
+ ,(select sum(b.num) from plans b where b.deleted=0 and b.work_plans_id=#{workPlanId} and b.procedure_id=p.id) as planNum
FROM `route_procedure` `a`
LEFT JOIN `procedures` `p` ON a.PROCEDURE_ID=p.ID
where a.ROUTE_ID = #{routeId}
--
Gitblit v1.9.3