|
@@ -19,6 +19,7 @@ import org.jeecg.ctop.material.mapper.MaterialStareMapper;
|
|
|
import org.jeecg.ctop.material.service.MaterialStareService;
|
|
|
import org.jeecg.ctop.material.utils.FeidNotNullUtils;
|
|
|
import org.jeecg.ctop.material.utils.LinkUtil;
|
|
|
+import org.jeecg.ctop.material.utils.ListPageUtil;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
@@ -1262,6 +1263,9 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
public Result getOperationGroupData(String userId,String startTime,String endTime,Integer pageNum,Integer pageSize) {
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("0.00%");
|
|
|
try {
|
|
|
+
|
|
|
+ log.info("开始------------------{}",DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
|
|
|
+
|
|
|
long nowDate = Long.valueOf(DateUtils.getDateInteger(DateUtils.getDate("yyyy-MM-dd")));
|
|
|
|
|
|
long startDate = Long.valueOf(DateUtils.getDateInteger(startTime));
|
|
@@ -1275,6 +1279,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
//查询用户角色
|
|
|
String roleCode = materialStareMapper.getRoleCodeByUserId(userId);
|
|
|
|
|
|
+
|
|
|
//所有运营经理
|
|
|
List<KuaiShouOperateGroupVo> allOperationManagerList = materialStareMapper.getOperationManagerUser("kuaishouOperationManager");
|
|
|
List<String> allManagerList = allOperationManagerList.stream().map(KuaiShouOperateGroupVo:: getUserId).collect(Collectors.toList());
|
|
@@ -1298,6 +1303,8 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
}else {
|
|
|
Result.successMsg("运营组列表数据查询成功。",null);
|
|
|
}
|
|
|
+ log.info("获取人员------------------{}",DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
|
|
|
+ operationManagerList = ListPageUtil.page(operationManagerList, pageSize, pageNum);
|
|
|
|
|
|
for (KuaiShouOperateGroupVo groupVo : operationManagerList) {
|
|
|
//下级员工
|
|
@@ -1315,11 +1322,13 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
|
|
|
//查询账户数据
|
|
|
List<KuaiShouOperateVo> listOperate= new ArrayList<>();
|
|
|
- PageHelper.startPage(pageNum,pageSize);
|
|
|
+
|
|
|
if (daysBetween <= 1){
|
|
|
+
|
|
|
//时报
|
|
|
listOperate= materialStareMapper.getKuaiShouOperateInfoHourly(startDate,entDate,operatorUserIds);
|
|
|
}else {
|
|
|
+
|
|
|
listOperate = materialStareMapper.getKuaiShouOperateInfo(startDate,entDate,operatorUserIds);
|
|
|
}
|
|
|
|
|
@@ -1368,8 +1377,16 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
//基建数量
|
|
|
groupVo.setUnitNum(Check.isNull(newEffect) ? 0 : newEffect.getInteger("newUnitNum")+newUnitNumNow);//组
|
|
|
}
|
|
|
+ log.info("结束------------------{}",DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
|
PageInfo<KuaiShouOperateGroupVo> pageInfo = new PageInfo<>(operationManagerList);
|
|
|
+ pageInfo.setTotal(operationManagerList.size());
|
|
|
+ pageInfo.setPageSize(pageSize);
|
|
|
+ pageInfo.setPageNum(pageNum);
|
|
|
+ pageInfo.setIsLastPage(false);
|
|
|
+ pageInfo.setHasNextPage(true);
|
|
|
+ log.info("返回------------------{}",DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
|
|
|
+
|
|
|
return Result.successMsg("运营组列表数据查询成功。",pageInfo);
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|