From a89fe32c353040bbb95d7519cf7bafc4b5934f10 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 06 九月 2023 09:54:14 +0800
Subject: [PATCH] 小程序
---
server/src/main/resources/mappers/WorkorderExtMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkorderExtMapper.xml b/server/src/main/resources/mappers/WorkorderExtMapper.xml
index e583b32..a2cc437 100644
--- a/server/src/main/resources/mappers/WorkorderExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderExtMapper.xml
@@ -243,7 +243,7 @@
</select>
<!-- 绠＄悊椤甸潰鏌ヨ -->
<select id="sumOrderNum" parameterType="doumeemes.dao.ext.dto.QueryWorkorderExtDTO" resultType="java.lang.Integer">
- SELECT sum(`a`.num)
+ SELECT sum(`a`.id)
FROM `workorder` `a`
<where>
<if test="id != null">
@@ -469,7 +469,8 @@
`pgmodel`.`GROUP_ID` AS PGMODEL_GROUP_ID,
`pgmodel`.`SERIAL_NUM` AS PGMODEL_SERIAL_NUM,
p.name as procedureName,
- u.realname as proUserName,
+ u.realname as proUserName,
+ uc.realname as createUserName,
(select sum(ifnull(num,0)) from workorder_record r where r.deleted=0 and r.type=1 and r.workorder_id=a.id) as proNum
<if test="checkTouliao!=null and checkTouliao==1">
,(select r.id from workorder_record r where r.deleted=0 and r.type=0 and r.workorder_id=a.id limit 1) as touliaoId
@@ -487,6 +488,7 @@
LEFT JOIN `device` `pgmodel` ON a.PRO_GROUP_ID=pgmodel.ID
LEFT JOIN `procedures` `p` ON a.`PROCEDURE_ID`=p.ID
LEFT JOIN `system_user` `u` ON `a`.`PRO_USER_ID`=u.ID
+ LEFT JOIN `system_user` `uc` ON `a`.`CREATE_USER`=uc.ID
<where>
<if test="id != null">
AND `a`.`ID` = #{id}
@@ -942,8 +944,8 @@
<choose>
<when test="departIds != null and departIds.size()>0">
AND ( `a`.`CREATE_USER` = #{createUser} or
- exists (select d.id from workorder_user d where d.WORKORDER_ID=a.id and d.DELETED=0 and d.PRO_USER_ID=#{createUser} )
- or exists (select d.id from company_user d where d.user_id= a.CREATE_USER and d.department_id
+ exists ( select d.id from workorder_user d where d.WORKORDER_ID=a.id and d.DELETED=0 and d.PRO_USER_ID=#{createUser} )
+ or exists ( select d.id from company_user d where d.user_id= a.CREATE_USER and d.department_id
in <foreach collection="departIds" item="item" separator="," open="(" close=")">#{item}</foreach>)
or exists (select d.id from workorder_user wu left join company_user d on wu.PRO_USER_ID=d.USER_ID and d.DELETED=0 where wu.WORKORDER_ID= a.id and d.department_id
in <foreach collection="departIds" item="item" separator="," open="(" close=")">#{item}</foreach>)
@@ -955,10 +957,10 @@
</if>
</otherwise>
</choose>
- <if test="startDate != null">
+ <if test="startDate != null and startDate!=''">
AND `a`.`PLAN_DATE` >= #{startDate}
</if>
- <if test="endDate != null">
+ <if test="endDate != null and endDate!=''">
AND #{endDate} >= `a`.`PLAN_DATE`
</if>
<if test="mixParam != null and mixParam!=''">
--
Gitblit v1.9.3