From f83c106c097c5759cd505750a6d57e738d591671 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 13 Mar 2024 18:03:28 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E5=91=98=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=88=E5=BE=85=E5=BC=80=E5=8F=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ITbMemberProjectSubitemService.java       |  3 +
 .../TbMemberProjectSubitemServiceImpl.java    |  8 ++-
 .../MemberStatisticsController.java           | 55 +++++++++++++++++++
 .../statistics/entity/MemberLineChartVO.java  | 20 +++++++
 .../statistics/entity/MemberPieChartVO.java   | 20 +++++++
 5 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartVO.java
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberPieChartVO.java

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
index 239c9a47..277c5915 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
@@ -7,6 +7,7 @@ import com.jero.member.entity.TbMemberProjectSubitem;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.member.vo.CopyMemberVO;
 import com.jero.member.vo.EditMemberBenefitsVO;
+import com.jero.statistics.entity.MemberLineChartVO;
 
 import java.util.List;
 
@@ -91,4 +92,6 @@ public interface ITbMemberProjectSubitemService extends IService<TbMemberProject
 	void copy(CopyMemberVO copyMemberVO);
 
 	void copyBatch(CopyMemberVO copyMemberVO);
+
+    MemberLineChartVO lineChart(String startYear, String endYear);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java
index 725ac834..3f401385 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java
@@ -33,6 +33,7 @@ import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.payment.service.impl.PayConfirmPaymentRecordService;
 import com.jero.project.common.PayProjectCommon;
+import com.jero.statistics.entity.MemberLineChartVO;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import org.apache.shiro.SecurityUtils;
@@ -351,7 +352,12 @@ public class TbMemberProjectSubitemServiceImpl extends ServiceImpl<TbMemberProje
 		}
 	}
 
-	private TbMemberProjectSubitem setCopyValue(TbMemberProjectSubitem memberProjectSubitem) {
+    @Override
+    public MemberLineChartVO lineChart(String startYear, String endYear) {
+        return null;
+    }
+
+    private TbMemberProjectSubitem setCopyValue(TbMemberProjectSubitem memberProjectSubitem) {
 		TbMemberProjectSubitem tbMemberProjectSubitem = new TbMemberProjectSubitem();
 		tbMemberProjectSubitem.setMemberNo(memberProjectSubitem.getMemberNo());
 		tbMemberProjectSubitem.setCompanyId(memberProjectSubitem.getCompanyId());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java
new file mode 100644
index 00000000..0d7efbbd
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java
@@ -0,0 +1,55 @@
+package com.jero.statistics.controller;
+
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.DictPoint;
+import com.jero.index.vo.LineChartVO;
+import com.jero.index.vo.PieChartVO;
+import com.jero.meeting.service.IPayMeetingService;
+import com.jero.meeting.service.IPayMeetingSituationService;
+import com.jero.member.service.ITbMemberProjectSubitemService;
+import com.jero.payment.service.impl.PayConfirmPaymentRecordService;
+import com.jero.statistics.entity.MeetingPackStatisticsSearch;
+import com.jero.statistics.entity.MemberLineChartVO;
+import com.jero.statistics.entity.MemberPieChartVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Objects;
+
+
+@Api(tags = "会员统计")
+@RestController
+@RequestMapping("/statistics/member")
+@Slf4j
+public class MemberStatisticsController {
+    @Resource
+    private ITbMemberProjectSubitemService memberProjectSubitemService;
+
+    @ApiOperation(value = "折线图")
+    @GetMapping(value = "/lineChart")
+    public Result<MemberLineChartVO> lineChart(@RequestParam(name="startYear")String startYear,
+                                               @RequestParam(name="endYear")String endYear) {
+        MemberLineChartVO lineChartVO = memberProjectSubitemService.lineChart(startYear,endYear);
+        return Result.OK(lineChartVO);
+    }
+
+    @ApiOperation(value = "饼图")
+    @GetMapping(value = "/pieChart")
+    public Result<List<MemberPieChartVO>> incomeClassificationStatistics(@RequestParam(name="type", defaultValue = "1")Integer type,
+                                                                         @RequestParam(name="departCode",required = false)String departCode,
+                                                                         @RequestParam(name="year",required = false)String year) {
+
+            return Result.OK();
+
+    }
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartVO.java
new file mode 100644
index 00000000..0b56202d
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberLineChartVO.java
@@ -0,0 +1,20 @@
+package com.jero.statistics.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author liJiaRao
+ * @date 2022-09-01 16:48
+ */
+@Data
+public class MemberLineChartVO {
+    @ApiModelProperty(value = "数量")
+    private List<String> value;
+
+    @ApiModelProperty(value = "年份")
+    private List<String> year;
+
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberPieChartVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberPieChartVO.java
new file mode 100644
index 00000000..1f1a0a8d
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MemberPieChartVO.java
@@ -0,0 +1,20 @@
+package com.jero.statistics.entity;
+
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liJiaRao
+ * @date 2022-09-02 11:30
+ */
+@Data
+public class MemberPieChartVO {
+    @Dict(dicCode = "payment_charge_use")
+    @ApiModelProperty(value = "分类")
+    private String name;
+    @ApiModelProperty(value = "值")
+    private String value;
+    @ApiModelProperty(value = "金额")
+    private String money;
+}