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 - - AND site = #{query.site} + + AND a.site = #{query.site} - + AND a.ObjectID like '%' + #{query.objectID} +'%' AND b.ObjectDesc like '%' + #{query.objectDesc} +'%' - + AND b.FamilyID like '%' + #{query.familyID}+'%' - + AND b.GroupID = #{query.groupID} - + + AND a.functionType = #{query.functionType} + + AND a.PlanDate >= #{query.startDate} - + AND #{query.endDate} >= a.PlanDate