add 会员统计(待开发)
This commit is contained in:
+3
@@ -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);
|
||||
}
|
||||
|
||||
+7
-1
@@ -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());
|
||||
|
||||
+55
@@ -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();
|
||||
|
||||
}
|
||||
}
|
||||
+20
@@ -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;
|
||||
|
||||
}
|
||||
+20
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user