|
|
@@ -1,7 +1,9 @@
|
|
|
package com.goafanti.order.service.impl;
|
|
|
|
|
|
+import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.dao.UserMidMapper;
|
|
|
+import com.goafanti.common.model.Department;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
@@ -12,14 +14,14 @@ import groovy.util.logging.Log4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Service
|
|
|
@Log4j
|
|
|
public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> implements UserStaticticsService {
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private DepartmentService departmentService;
|
|
|
|
|
|
@Override
|
|
|
public Pagination<OutSignSummary> signSummary(InputSignSummary in) {
|
|
|
@@ -69,7 +71,14 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
|
|
|
|
|
|
|
|
|
private void addsignStatisticsParam(InputSignStatistics in, Map<String, Object> map) {
|
|
|
- if (in.getDepId()!=null)map.put("depId",in.getDepId());
|
|
|
+ if (in.getDepId()!=null){
|
|
|
+ String[] ss=in.getDepId().split(",");
|
|
|
+ List<Department> ls=new ArrayList<>();
|
|
|
+ Arrays.stream(ss).forEach(e ->{
|
|
|
+ ls.addAll(departmentService.selectSubDeps(e));
|
|
|
+ });
|
|
|
+ map.put("deps",ls);
|
|
|
+ }
|
|
|
if (StringUtils.isNotBlank(in.getAid())) map.put("aid", in.getAid());
|
|
|
if (in.getAmountType()!=null)map.put("amountType",in.getAmountType());
|
|
|
if (in.getSignTimeStart()!=null)map.put("signTimeStart",in.getSignTimeStart());
|