统计列表提交

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -380,9 +380,16 @@ public class ProjectController {
 	 * 2.0-统计列表
 	 * */
 	@GetMapping("/statisticalAnalysis")
-	public R statisticalAnalysis()
+	public R statisticalAnalysis(@RequestParam(name = "userName", required = false) String userName,
+								 @RequestParam(name = "projectType", required = false)String projectType,
+								 @RequestParam(name = "deptid", required = false)String deptid,
+								 @RequestParam(name = "pname", required = false)String pname,
+								 @RequestParam(name = "status", required = false)String status,
+								 @RequestParam(name = "cornId", required = false)String cornId,
+								 @RequestParam(name = "payStartTime", required = false) String payStartTime,
+								 @RequestParam(name = "payEndTime", required = false)String payEndTime)
 	{
-		List<ServiceProjectItem> serviceProjectItems = serviceProjectItemService.statisticalAnalysis(AuthUtil.getTenantId());
+		List<ServiceProjectItem> serviceProjectItems = serviceProjectItemService.statisticalAnalysis(AuthUtil.getTenantId(),userName,projectType,deptid,pname,status,cornId,payStartTime,payEndTime);
 		return R.data(serviceProjectItems);
 	}
 

blade-service/blade-project/src/main/java/org/springblade/project/mapper/ServiceProjectItemMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Mapper
 public interface ServiceProjectItemMapper extends BaseMapper<ServiceProjectItem> {
 
-	List<ServiceProjectItem>  statisticalAnalysis(@Param("tenantId") String tenantId);
+	List<ServiceProjectItem>  statisticalAnalysis(@Param("tenantId") String tenantId,@Param("userName") String userName,@Param("projectType") String projectType,@Param("deptid") String deptid,@Param("pname") String pname,@Param("status") String status,@Param("cornId") String cornId,@Param("payStartTime") String payStartTime,@Param("payEndTime") String payEndTime);
 
 	ServiceProject calculateServiceCharge(@Param("tenantId") String tenantId,@Param("year") String year,@Param("corpId") Long corpId,@Param("createUser") Long createUser,@Param("userName")String userName);
 }

blade-service/blade-project/src/main/java/org/springblade/project/mapper/ServiceProjectItemMapper.xml

@@ -49,7 +49,29 @@
 		  a.id=b.p_id
 	AND b.tenant_id = #{tenantId}
 	and b.is_deleted = 0
-	AND b.STATUS IN ( '0', '1', '2', '3', '4', '5', '6')
+        <if test='userName != null and userName!= ""'>
+            AND b.user_name = #{userName}
+        </if>
+        <if test='projectType != null and projectType!= ""'>
+            AND b.project_type = #{projectType}
+        </if>
+        <if test='deptid != null and deptid!= ""'>
+            AND b.deptid = #{deptid}
+        </if>
+        <if test='pname != null and pname!= ""'>
+            AND b.p_name = #{pname}
+        </if>
+        <if test='status != null and status!= ""'>
+            AND b.status = #{status}
+        </if>
+        <if test='cornId != null and cornId!= ""'>
+            AND a.corn_id = #{cornId}
+        </if>
+
+        <if test='payStartTime != null and payEndTime!= null'>
+            and b.pay_time between #{payStartTime} and #{payEndTime}
+        </if>
+
 	) a
 	LEFT JOIN basic_corps_desc b on a.corp_id=b.id
 	left JOIN blade_dept c on a.deptid =c.id

blade-service/blade-project/src/main/java/org/springblade/project/service/ServiceProjectItemService.java

@@ -20,5 +20,5 @@ import java.util.Map;
 public interface ServiceProjectItemService extends BaseService<ServiceProjectItem>
 {
 
-	List<ServiceProjectItem>  statisticalAnalysis( String tenantId);
+	List<ServiceProjectItem>  statisticalAnalysis( String tenantId, String userName, String projectType,String deptid, String pname, String status, String cornId,String payStartTime, String payEndTime);
 }

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/ServiceProjectItemServiceImpl.java

@@ -1,6 +1,7 @@
 package org.springblade.project.service.impl;
 
 import lombok.AllArgsConstructor;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.project.entity.ServiceProjectItem;
 import org.springblade.project.mapper.ServiceProjectItemMapper;
@@ -23,7 +24,7 @@ public class ServiceProjectItemServiceImpl extends BaseServiceImpl<ServiceProjec
 	private final ServiceProjectItemMapper serviceProjectItemMapper;
 
 	@Override
-	public List<ServiceProjectItem> statisticalAnalysis(String tenantId) {
-		return serviceProjectItemMapper.statisticalAnalysis(tenantId);
+	public List<ServiceProjectItem> statisticalAnalysis(String tenantId, String userName, String projectType,String deptid, String pname, String status, String cornId,String payStartTime, String payEndTime) {
+		return serviceProjectItemMapper.statisticalAnalysis(tenantId,userName,projectType,deptid,pname,status,cornId,payStartTime,payEndTime);
 	}
 }