首次提交

src/main/java/com/xujie/sys/modules/pms/controller/EamReportController.java

@@ -36,4 +36,6 @@ public class EamReportController {
         return R.ok().put("page", page);
     }
 
+
+    
 }

src/main/resources/mapper/pms/EamReportMapper.xml

@@ -11,7 +11,7 @@
         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}
+                AND a.site =  #{query.site}
             </if>
             <if test="query.objectID != null and query.objectID != ''">
                 AND a.ObjectID like '%' + #{query.objectID} +'%'
@@ -24,6 +24,9 @@
             </if>
             <if test="query.groupID != null and query.groupID != ''">
                 AND b.GroupID = #{query.groupID}
+            </if>
+              <if test="query.functionType != null and query.functionType != ''">
+                AND a.functionType = #{query.functionType}
             </if>
             <if test="query.startDate != null ">
                 AND a.PlanDate >= #{query.startDate}