From 4705f9b4084d9ccddb601569b223f0fb41778a94 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 12 Aug 2021 15:28:46 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java | 134 +++++++++++++++++++++++++++++++++-----------
1 files changed, 99 insertions(+), 35 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
index 97bbb20..71d838c 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
@@ -68,6 +68,7 @@
int start = (businessesDto.getPageNum() - 1) * businessesDto.getPageSize();
int size = businessesDto.getPageSize();
Calendar calendar = Calendar.getInstance();
+ calendar.add(calenderUnit, 1);
calendar.add(calenderUnit, -start);
String endTime = DateUtil.dateToString(calendar.getTime(), DateUtil.DATE_FORMAT_DD);
calendar.add(calenderUnit, -size);
@@ -120,15 +121,39 @@
case "3" :
return tjVipSumDao.selectCardUse(timeSpaceParam, shopId, null);
case "4" :
- return tjVipSumDao.selectHisConsume(timeSpaceParam, shopId, null);
- case "5" :
- return tjVipSumDao.selectFreeConsume(timeSpaceParam, shopId, null);
- case "6" :
- return tjVipSumDao.selectCashRefund(timeSpaceParam, shopId, null);
- case "7" :
- return tjVipSumDao.selectCardRefund(timeSpaceParam, shopId, null);
- case "8" :
return tjVipSumDao.selectArrears(timeSpaceParam, shopId, null);
+ case "5" :
+ return tjVipSumDao.selectCashRefund(timeSpaceParam, shopId, null);
+ case "6" :
+ return tjVipSumDao.selectCardRefund(timeSpaceParam, shopId, null);
+ case "7":
+ return tjVipSumDao.selectProductAchieve(timeSpaceParam, shopId, null);
+ case "8":
+ return tjVipSumDao.selectCardAchieve(timeSpaceParam, shopId, null);
+ case "9":
+ return tjVipSumDao.selectRepayment(timeSpaceParam, shopId, null);
+ case "10":
+ return tjVipSumDao.selectPerCustomCnt(timeSpaceParam, shopId, null);
+ case "11":
+ return tjVipSumDao.selectCustomGoodsCnt(timeSpaceParam, shopId, null);
+ case "12":
+ return tjVipSumDao.selectPerCustomPrice(timeSpaceParam, shopId, null);
+ case "13":
+ return tjVipSumDao.selectCost(timeSpaceParam, shopId, null);
+ case "14":
+ return tjVipSumDao.selectGrossProfit(timeSpaceParam, shopId, null);
+ case "15":
+ return tjVipSumDao.selectGrossProfitRate(timeSpaceParam, shopId, null);
+ case "16" :
+ return tjVipSumDao.selectHisConsume(timeSpaceParam, shopId, null);
+ case "17" :
+ return tjVipSumDao.selectFreeConsume(timeSpaceParam, shopId, null);
+ case "18" :
+ return tjVipSumDao.selectPeopleCnt(timeSpaceParam, shopId, null);
+ case "19" :
+ return tjVipSumDao.selectProjConsumeCnt(timeSpaceParam, shopId, null);
+ case "20" :
+ return tjVipSumDao.selectTimeLength(timeSpaceParam, shopId, null);
default :
return tjVipSumDao.selectBusinessInCome(timeSpaceParam, shopId, null);
}
@@ -147,15 +172,39 @@
case "3" :
return tjVipSumDao.selectCardUse(timeSpaceParam, null, companyId);
case "4" :
- return tjVipSumDao.selectHisConsume(timeSpaceParam, null, companyId);
- case "5" :
- return tjVipSumDao.selectFreeConsume(timeSpaceParam, null, companyId);
- case "6" :
- return tjVipSumDao.selectCashRefund(timeSpaceParam, null, companyId);
- case "7" :
- return tjVipSumDao.selectCardRefund(timeSpaceParam, null, companyId);
- case "8" :
return tjVipSumDao.selectArrears(timeSpaceParam, null, companyId);
+ case "5" :
+ return tjVipSumDao.selectCashRefund(timeSpaceParam, null, companyId);
+ case "6" :
+ return tjVipSumDao.selectCardRefund(timeSpaceParam, null, companyId);
+ case "7":
+ return tjVipSumDao.selectProductAchieve(timeSpaceParam, null, companyId);
+ case "8":
+ return tjVipSumDao.selectCardAchieve(timeSpaceParam, null, companyId);
+ case "9":
+ return tjVipSumDao.selectRepayment(timeSpaceParam, null, companyId);
+ case "10":
+ return tjVipSumDao.selectPerCustomCnt(timeSpaceParam, null, companyId);
+ case "11":
+ return tjVipSumDao.selectCustomGoodsCnt(timeSpaceParam, null, companyId);
+ case "12":
+ return tjVipSumDao.selectPerCustomPrice(timeSpaceParam, null, companyId);
+ case "13":
+ return tjVipSumDao.selectCost(timeSpaceParam, null, companyId);
+ case "14":
+ return tjVipSumDao.selectCost(timeSpaceParam, null, companyId);
+ case "15":
+ return tjVipSumDao.selectCost(timeSpaceParam, null, companyId);
+ case "16" :
+ return tjVipSumDao.selectHisConsume(timeSpaceParam, null, companyId);
+ case "17" :
+ return tjVipSumDao.selectFreeConsume(timeSpaceParam, null, companyId);
+ case "18" :
+ return tjVipSumDao.selectPeopleCnt(timeSpaceParam, null, companyId);
+ case "19" :
+ return tjVipSumDao.selectProjConsumeCnt(timeSpaceParam, null, companyId);
+ case "20" :
+ return tjVipSumDao.selectTimeLength(timeSpaceParam, null, companyId);
default :
return tjVipSumDao.selectBusinessInCome(timeSpaceParam, null, companyId);
}
@@ -189,24 +238,41 @@
})
@PostMapping(value = "/findVipAchieve")
public AjaxResult findVipAchieve(@RequestBody BusinessesDto businessesDto) {
- AchieveNew achieveNew = new AchieveNew();
+ String unit = "";
+ int calenderUnit;
if (BusinessesDto.DAY.equals(businessesDto.getType())) {
- achieveNew.setT1("%Y-%m-%d");
+ unit = "日";
+ calenderUnit = Calendar.DATE;
} else {
- achieveNew.setT1("%Y-%m");
+ unit = "月";
+ calenderUnit = Calendar.MONTH;
}
- SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- if (businessesDto.getStaffId() == null) {
+ int start = (businessesDto.getPageNum() - 1) * businessesDto.getPageSize();
+ int size = businessesDto.getPageSize();
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(calenderUnit, 1);
+ calendar.add(calenderUnit, -start);
+ String endTime = DateUtil.dateToString(calendar.getTime(), DateUtil.DATE_FORMAT_DD);
+ calendar.add(calenderUnit, -size);
+ String startTime = DateUtil.dateToString(calendar.getTime(), DateUtil.DATE_FORMAT_DD);
+ List<Date> xAxis = StatisticsTimeUtil.getTimeSpace(startTime, endTime, unit);
+ List<StatisticsTimeDaoParam> timeSpaceParam = StatisticsTimeUtil.buidParam(xAxis);
+ List<StatisticsTimeDaoParam> statisticsTimeDaoParams = timeSpaceParam.subList(0, timeSpaceParam.size() - 2);
+ List<VipAchieveDataShowVo> list = tjVipSumDao.selectVipAchieveInPage(statisticsTimeDaoParams, businessesDto.getStaffId());
- businessesDto.setStaffId(sysUsers.getSuId());
+ List<VipAchieveDataShowVo> result = new ArrayList<>();
+ for (int i = list.size() - 1; i >= 0; i--) {
+ VipAchieveDataShowVo item = list.get(i);
+ String dataTime = item.getTime();
+ if (BusinessesDto.DAY.equals(businessesDto.getType())) {
+ item.setTime(DateUtil.dateToString(DateUtil.stringToDate(dataTime, DateUtil.DATE_FORMAT_DD), DateUtil.DATE_FORMAT_DD));
+ } else {
+ item.setTime(DateUtil.dateToString(DateUtil.stringToDate(dataTime, DateUtil.MONTH), DateUtil.MONTH));
+ }
+ result.add(item);
}
- achieveNew.setVipId(businessesDto.getStaffId());
-
- PaginationVO pageVo = new PaginationVO();
- pageVo.setLimit(businessesDto.getPageSize());
- pageVo.setOffset((businessesDto.getPageNum() - 1) * businessesDto.getPageSize());
- return AjaxResult.buildSuccessInstance(tjVipSumDao.selectVipAchieveInPage(achieveNew, pageVo));
+ return AjaxResult.buildSuccessInstance(result);
}
@ApiOperation(value = "员工专项", notes = "员工专项")
@@ -225,18 +291,16 @@
case "4" :
return tjVipSumDao.selectStaffGoodsAchieve(timeSpaceParam, staffId);
case "5" :
- return tjVipSumDao.selectStaffCardUseAchieve(timeSpaceParam, staffId);
- case "6" :
return tjVipSumDao.selectStaffHisConsumeAchieve(timeSpaceParam, staffId);
- case "7" :
+ case "6" :
return tjVipSumDao.selectStaffFreeConsumeAchieve(timeSpaceParam, staffId);
- case "8" :
+ case "7" :
return tjVipSumDao.selectStaffCommissionAchieve(timeSpaceParam, staffId);
- case "9" :
+ case "8" :
return tjVipSumDao.selectStaffPeopleNum(timeSpaceParam, staffId);
- case "10" :
+ case "9" :
return tjVipSumDao.selectStaffProjNum(timeSpaceParam, staffId);
- case "11" :
+ case "10" :
return tjVipSumDao.selectStaffProjTime(timeSpaceParam, staffId);
default:
return tjVipSumDao.selectStaffOrderAchieve(timeSpaceParam, staffId);
--
Gitblit v1.9.1