Преглед на файлове

主营项目, 统计分析

ioioio преди 4 години
родител
ревизия
878619ac3f

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

@@ -362,6 +362,16 @@ public class ProjectController {
 		return R.success("操作成功");
 	}
 
+	/**
+	 * 2.0-统计分析
+	 * */
+	@GetMapping("statisticalAnalysis")
+	public R statisticalAnalysis()
+	{
+		List<ServiceProjectItem> serviceProjectItems = serviceProjectItemService.statisticalAnalysis(AuthUtil.getTenantId());
+		return R.data(serviceProjectItems);
+	}
+
 
 
 }

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

@@ -3,8 +3,11 @@ package org.springblade.project.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.project.entity.ServiceProjectItem;
 
+import java.util.List;
+
 /**
  * 服务明细
  *
@@ -15,4 +18,5 @@ import org.springblade.project.entity.ServiceProjectItem;
 @Mapper
 public interface ServiceProjectItemMapper extends BaseMapper<ServiceProjectItem> {
 
+	List<ServiceProjectItem>  statisticalAnalysis(@Param("tenantId") String tenantId);
 }

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

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.project.mapper.ServiceProjectItemMapper">
+
+    <select id="statisticalAnalysis" resultType="org.springblade.project.entity.ServiceProjectItem">
+    select
+    (CASE a.itemStatus
+    WHEN  0 THEN '录入'
+    WHEN  1 THEN '请核'
+    WHEN  2 THEN '审核中'
+    WHEN  3 THEN '审核通过'
+    WHEN  4 THEN '正在结算'
+    WHEN  5 THEN '结算完成'
+    WHEN  6 THEN ''
+    WHEN  7 THEN '追加'
+    WHEN  8 THEN '退费'
+    ELSE 'null' END) as strStatus ,
+    (CASE a.project_type
+    WHEN  0 THEN '普通'
+    WHEN  1 THEN '追加'
+    WHEN  2 THEN '退费'
+    ELSE 'null' END) as projectType ,
+    b.cname as cornName ,
+    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,
+    a.amount as amount,
+    a.user_name as userName,
+    c.dept_name  as deptName,
+    a.ACCOUNT_NAME as accountName,
+    a.pay_time as payTime,
+    a.frequency as frequency,
+    a.reminder_day as reminderDay,
+    a.begin_time as beginTime,
+    a.actual_date as actualDate,
+    a.create_user_name as createUserName,
+    a.create_time as createTime,
+    a.update_user_name as updateUserName,
+    a.update_time as updateTime,
+    a.remarks as remarks
+    from
+    (
+	SELECT
+	a.corp_id,
+	b.`status` as itemStatus,
+	b.project_type as projectType,
+	b.*
+    FROM
+	service_project a,
+	service_project_item b
+    WHERE
+		  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')
+	) a
+	LEFT JOIN basic_corps_desc b on a.corp_id=b.id
+	left JOIN blade_dept c on a.deptid =c.id
+	order by  a.update_time desc
+    </select>
+
+
+</mapper>

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

@@ -3,6 +3,7 @@ package org.springblade.project.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.project.entity.ServiceProjectItem;
 
@@ -19,5 +20,5 @@ import java.util.Map;
 public interface ServiceProjectItemService extends BaseService<ServiceProjectItem>
 {
 
-
+	List<ServiceProjectItem>  statisticalAnalysis( String tenantId);
 }

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

@@ -1,5 +1,6 @@
 package org.springblade.project.service.impl;
 
+import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.project.entity.ServiceProjectItem;
 import org.springblade.project.mapper.ServiceProjectItemMapper;
@@ -16,7 +17,13 @@ import java.util.Map;
 
 
 @Service
+@AllArgsConstructor
 public class ServiceProjectItemServiceImpl extends BaseServiceImpl<ServiceProjectItemMapper, ServiceProjectItem> implements ServiceProjectItemService {
 
+	private final ServiceProjectItemMapper serviceProjectItemMapper;
 
+	@Override
+	public List<ServiceProjectItem> statisticalAnalysis(String tenantId) {
+		return serviceProjectItemMapper.statisticalAnalysis(tenantId);
+	}
 }