From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 3469bb4..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;
@@ -11,8 +12,8 @@
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;
@@ -78,7 +79,7 @@
public @ResponseBody
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),
@@ -95,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();
@@ -121,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<>();
@@ -198,7 +207,7 @@
orderSheet.setHeaders(header);
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
+ if (!DataAuthUtil.hasAllShopAuth()) {
achieveNew.setShopId(sysUsers.getShopId());
}
@@ -272,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