提交代码

blade-ops/blade-report/src/main/java/org/springblade/report/mapper/ServiceProjectItemMapper.xml

@@ -71,10 +71,10 @@
             AND b.status = #{status}
         </if>
         <if test='cornId != null and cornId!= ""'>
-            AND a.corn_id = #{cornId}
+            AND a.corp_id = #{cornId}
         </if>
 
-        <if test='payStartTime != null and payEndTime!= null'>
+        <if test='payStartTime != null and  payStartTime!= ""  and  payEndTime!= ""   and payEndTime!= null'>
             and b.pay_time between #{payStartTime} and #{payEndTime}
         </if>
 

blade-ops/blade-report/src/main/java/org/springblade/report/ureport/ProjectBean.java

@@ -31,7 +31,7 @@ public class ProjectBean
 		String payEndTime =(String) parameters.get("payEndTime");
 		String tenantId =(String) parameters.get("tenantId");
 
-		List<ServiceProjectItem> serviceProjectItems = serviceProjectItemService.statisticalAnalysis(tenantId,userName,projectType,deptid,pname,status,cornId,payStartTime,payEndTime);
+		List<ServiceProjectItem> serviceProjectItems = serviceProjectItemService.statisticalAnalysis(tenantId.trim(),userName.trim(),projectType.trim(),deptid.trim(),pname.trim(),status.trim(),cornId.trim(),payStartTime.trim(),payEndTime.trim());
 		return serviceProjectItems;
 	}