From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java | 91 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 72 insertions(+), 19 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
index 680990c..1668d00 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
@@ -1,5 +1,6 @@
package com.matrix.system.hive.statistics;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.core.constance.MatrixConstance;
@@ -9,8 +10,10 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelVersion;
+import com.matrix.system.common.bean.CustomerDataDictionary;
import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.common.constance.AppConstance;
+import com.matrix.system.common.dao.CustomerDataDictionaryDao;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.AchieveNew;
@@ -18,8 +21,6 @@
import com.matrix.system.hive.dto.AchieveNewStatisticsDto;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.service.AchieveNewService;
-import com.matrix.system.hive.service.SysOrderItemService;
-import com.matrix.system.hive.service.SysOrderService;
import com.matrix.system.hive.vo.AchieveNewStatisticsVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -50,12 +51,6 @@
private AchieveNewService achieveNewService;
@Autowired
- private SysOrderService sysOrderService;
-
- @Autowired
- private SysOrderItemService sysOrderItemService;
-
- @Autowired
private AchieveNewDao achieveNewDao;
@@ -82,9 +77,9 @@
*/
@RequestMapping(value = "/findSumDailyInfoNew")
public @ResponseBody
- AjaxResult findSumDailyInfoNew(AchieveNew achieveNew, PaginationVO pageVo) {
+ AjaxResult findSumDailyInfoNew(@RequestBody AchieveNew achieveNew) {
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ if (!DataAuthUtil.hasAllShopAuth()) {
achieveNew.setShopId(sysUsers.getShopId());
}
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, achieveNewService.findSumDailyInfoNew(achieveNew, null),
@@ -101,7 +96,7 @@
AjaxResult findDailyInfoNew(@RequestBody AchieveNew achieveNew) {
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
achieveNew.setCompanyId(sysUsers.getCompanyId());
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ if (!DataAuthUtil.hasAllShopAuth()) {
achieveNew.setShopId(sysUsers.getShopId());
}
PaginationVO pageVo = new PaginationVO();
@@ -127,11 +122,19 @@
, "服务提成", "人头", "项目个数", "服务时间", "订单类型"};
orderSheet.setHeaders(header);
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ if (!DataAuthUtil.hasAllShopAuth()) {
queryDto.setShopId(sysUsers.getShopId());
}
queryDto.setCompanyId(sysUsers.getCompanyId());
Page<AchieveNewStatisticsVo> page = new Page(1, Long.MAX_VALUE);
+
+ if (StrUtil.isNotBlank(queryDto.getBeginTimeStr())) {
+ queryDto.setBeginTime(DateUtil.stringToDate(queryDto.getBeginTimeStr(), DateUtil.DATE_FORMAT_MM));
+ }
+
+ if (StrUtil.isNotBlank(queryDto.getEndTimeStr())) {
+ queryDto.setEndTime(DateUtil.stringToDate(queryDto.getEndTimeStr(), DateUtil.DATE_FORMAT_MM));
+ }
IPage<AchieveNewStatisticsVo> rows = achieveNewDao.achieveNewStatistics(page,queryDto);
List<AchieveNewStatisticsVo> dataList = rows.getRecords();
List<List<Object>> list = new ArrayList<>();
@@ -164,18 +167,47 @@
com.matrix.core.tools.excl.ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, true);
}
+ @Autowired
+ CustomerDataDictionaryDao dataDictionaryDao;
+
@RequestMapping(value = "/exportDailyInfoNew")
public void exportDailyInfoNew(ModelMap model, HttpServletRequest request, HttpServletResponse response, AchieveNew achieveNew) throws IOException {
- //这里是从数据库里查数据并组装成我们想要的数据结构的过程
+ SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+
+ List<CustomerDataDictionary> achieveTyps = dataDictionaryDao.selectByParentCode("YJLX", sysUsers.getCompanyId());
+
List<ExcelSheetPO> res = new ArrayList<>();
ExcelSheetPO orderSheet = new ExcelSheetPO();
String title = "员工业绩报表";
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"订单时间", "订单编号", "订单类型", "会员姓名", "产品", "业绩规则", "产品分类", "订单金额", "现金","划扣", "员工", "业绩类型", "员工", "本金消耗", "赠消", "提成", "人头", "项目个数", "项目时间", "顾问", "门店"};
+ List<String> headerList =new ArrayList();
+ headerList.add("订单时间");
+ headerList.add("订单编号");
+ headerList.add("订单类型");
+ headerList.add("会员姓名");
+ headerList.add("产品");
+ headerList.add("业绩规则");
+ headerList.add("产品分类");
+ headerList.add("订单金额");
+ headerList.add("现金");
+ headerList.add("划扣");
+ headerList.add("员工");
+ achieveTyps.forEach(item->{headerList.add(item.getValue());});
+ headerList.add("本金消耗");
+ headerList.add("赠消");
+ headerList.add("提成");
+ headerList.add("人头");
+ headerList.add("项目个数");
+ headerList.add("项目时间");
+ headerList.add("顾问");
+ headerList.add("门店");
+
+ String[] header = headerList.toArray(new String[headerList.size()]);
+
+
orderSheet.setHeaders(header);
- SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ if (!DataAuthUtil.hasAllShopAuth()) {
achieveNew.setShopId(sysUsers.getShopId());
}
@@ -196,8 +228,14 @@
temp.add(item.getGoodsCash());
temp.add(item.getCardCash());
temp.add(item.getMeiliao());
- //todo 动态导出列----
-
+ //动态导出列----
+ achieveTyps.forEach(item2->{
+ if(item2.getValue().equals(item.getAchieveType())){
+ temp.add(item.getGoodsCash());
+ }else{
+ temp.add("");
+ }
+ });
temp.add(item.getHisConsume());
temp.add(item.getFreeConsume());
temp.add(item.getProjPercentage());
@@ -243,5 +281,20 @@
}
}
+ @RequestMapping(value = "/findDailyBeautyList")
+ @ResponseBody
+ public AjaxResult findDailyBeautyList(@RequestBody AchieveNew achieveNew) {
+ SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ achieveNew.setCompanyId(sysUsers.getCompanyId());
+ if (!DataAuthUtil.hasAllShopAuth()) {
+ achieveNew.setShopId(sysUsers.getShopId());
+ }
+ PaginationVO pageVo = new PaginationVO();
+
+ pageVo.setOffset(achieveNew.getOffset());
+ pageVo.setLimit(achieveNew.getLimit());
+ return AjaxResult.buildSuccessInstance(achieveNewService.findDailyBeautyList(achieveNew, pageVo), achieveNewService.findDailyBeautyListTotal(achieveNew));
+ }
+
}
--
Gitblit v1.9.1