提交代码

blade-ops/blade-report/src/main/java/org/springblade/report/entity/ServiceProjectItem.java

@@ -101,11 +101,22 @@ public class ServiceProjectItem extends TenantEntity implements Serializable {
 	@TableLogic
 	private Integer isDeleted;
 
-
+	@TableField(exist = false)
+	private String strCreateTime;
+	@TableField(exist = false)
+	private String strUpdateTime;
+	@TableField(exist = false)
+	private String strReminderDay;
+	@TableField(exist = false)
+	private String strBeginTime;
+	@TableField(exist = false)
+	private String strActualDate;
+	@TableField(exist = false)
+	private String strPayTime;
 
 	private String createUserName;
 	private String updateUserName;
-	private String pName;
+	private String pname;
 
 	@TableField(exist = false)
 	private String strStatus;
@@ -172,5 +183,8 @@ public class ServiceProjectItem extends TenantEntity implements Serializable {
 	@TableField(exist = false)
 	private String strProjectType;
 
+	@TableField(exist = false)
+	private String today;
+
 
 }

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

@@ -4,6 +4,7 @@
 
     <select id="statisticalAnalysis" resultType="org.springblade.report.entity.ServiceProjectItem">
     select
+        now() as today,
     (CASE a.itemStatus
     WHEN  0 THEN '录入'
     WHEN  1 THEN '请核'
@@ -16,12 +17,12 @@
     WHEN  8 THEN '退费'
     ELSE 'null' END) as strStatus,
     (CASE a.project_type
-        WHEN  0 THEN '普通'
+        WHEN  0 THEN '正常'
         WHEN  1 THEN '追加代垫费'
         WHEN  2 THEN '退费'
         ELSE 'null' END) as strProjectType,
     b.cname as cornName ,
-    a.p_name as pName,
+    a.p_name as pname,
     ((a.service_charge+ a.mat_money )-a.cost_return) as grossIncome,
     a.service_charge as serviceCharge,
     a.mat_money as matMoney,
@@ -29,15 +30,15 @@
     a.user_name as userName,
     c.dept_name  as deptName,
     a.ACCOUNT_NAME as accountName,
-    a.pay_time as payTime,
+    DATE_FORMAT(a.pay_time,'%Y-%m-%d') as strPayTime,
     a.frequency as frequency,
-    a.reminder_day as reminderDay,
-    a.begin_time as beginTime,
-    a.actual_date as actualDate,
+    DATE_FORMAT(a.reminder_day,'%Y-%m-%d') as strReminderDay,
+    DATE_FORMAT(a.begin_time,'%Y-%m-%d') as strBeginTime,
+    DATE_FORMAT(a.actual_date,'%Y-%m-%d') as strActualDate,
     a.create_user_name as createUserName,
-    a.create_time as createTime,
+    DATE_FORMAT(a.create_time,'%Y-%m-%d') as strCreateTime,
     a.update_user_name as updateUserName,
-    a.update_time as updateTime,
+    DATE_FORMAT(a.update_time,'%Y-%m-%d') as strUpdateTime,
     a.remarks as remarks
     from
     (

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("096359",userName,projectType,deptid,pname,status,cornId,payStartTime,payEndTime);
+		List<ServiceProjectItem> serviceProjectItems = serviceProjectItemService.statisticalAnalysis(tenantId,userName,projectType,deptid,pname,status,cornId,payStartTime,payEndTime);
 		return serviceProjectItems;
 	}