From 93a3ec1d8159211e73f75885daa3d0593bb1fdc3 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 31 Mar 2023 18:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/controller/EamReportController.java     |  2 ++
 .../resources/mapper/pms/EamReportMapper.xml    | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamReportController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamReportController.java
index 74cdeef3..691c43cb 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/EamReportController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamReportController.java
@@ -35,5 +35,7 @@ public class EamReportController {
         PageUtils page  = eamReportService.searchEamObjectSumReport(data);
         return R.ok().put("page", page);
     }
+
+
     
 }
diff --git a/src/main/resources/mapper/pms/EamReportMapper.xml b/src/main/resources/mapper/pms/EamReportMapper.xml
index 632dc962..9189bbf9 100644
--- a/src/main/resources/mapper/pms/EamReportMapper.xml
+++ b/src/main/resources/mapper/pms/EamReportMapper.xml
@@ -10,25 +10,28 @@
         select  a.Site,a.ObjectID,b.ObjectDesc,b.FamilyID,b.GroupID,1 as qtyAll,case WHEN a.Status='已完工' then 1 else 0 end  as  qtyFinished, case WHEN a.Status='未开工' then 1 else 0 end  as  qtyUnFinishied, case WHEN a.Status='已取消' then 1 else 0 end  as  qtycancelled
         from  eam_workOrder a left join  eam_object b on a.Site=b.Site and a.ObjectID =b.ObjectID
          <where>
-         <if test="query.site != null and query.site != ''">
-                AND site =  #{query.site}
+            <if test="query.site != null and query.site != ''">
+                AND a.site =  #{query.site}
             </if>
-             <if test="query.objectID != null and query.objectID != ''">
+            <if test="query.objectID != null and query.objectID != ''">
                 AND a.ObjectID like '%' + #{query.objectID} +'%'
             </if>
             <if test="query.objectDesc != null and query.objectDesc != ''">
                 AND b.ObjectDesc like '%' + #{query.objectDesc} +'%'
             </if>
-             <if test="query.familyID != null and query.familyID != ''">
+            <if test="query.familyID != null and query.familyID != ''">
                 AND b.FamilyID like '%' + #{query.familyID}+'%'
             </if>
-             <if test="query.groupID != null and query.groupID != ''">
+            <if test="query.groupID != null and query.groupID != ''">
                 AND b.GroupID = #{query.groupID}
             </if>
-              <if test="query.startDate != null ">
+              <if test="query.functionType != null and query.functionType != ''">
+                AND a.functionType = #{query.functionType}
+            </if>
+            <if test="query.startDate != null ">
                 AND a.PlanDate >= #{query.startDate}
             </if>
-             <if test="query.endDate != null ">
+            <if test="query.endDate != null ">
                 AND #{query.endDate} >= a.PlanDate
             </if>
         </where>