|
@@ -2,19 +2,18 @@ package cn.com.ctop.performanceappraisal.service.impl;
|
|
|
|
|
|
import cn.com.ctop.common.module.utils.ResultMapUtils;
|
|
|
import cn.com.ctop.common.module.utils.StatusCode;
|
|
|
+import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
|
|
|
import cn.com.ctop.performanceappraisal.entity.OptimizerRoleInfo;
|
|
|
import cn.com.ctop.performanceappraisal.mapper.OptimizerRoleInfoMapper;
|
|
|
-import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
|
|
|
+import cn.com.ctop.performanceappraisal.service.IOptimizerConfigService;
|
|
|
import cn.com.ctop.performanceappraisal.service.IOptimizerRoleInfoService;
|
|
|
import cn.com.ctop.performanceappraisal.service.IPerformanceService;
|
|
|
import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
-import org.jeecg.common.util.DateUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -31,7 +30,7 @@ public class OptimizerRoleInfoServiceImpl extends ServiceImpl<OptimizerRoleInfoM
|
|
|
@Autowired
|
|
|
private IPerformanceService performanceService;
|
|
|
@Autowired
|
|
|
- private PerformanceMapper performanceMapper;
|
|
|
+ private IOptimizerConfigService optimizerConfigService;
|
|
|
|
|
|
@Override
|
|
|
public Map<String, Object> getmanagerDetail(Integer appType) {
|
|
@@ -41,8 +40,9 @@ public class OptimizerRoleInfoServiceImpl extends ServiceImpl<OptimizerRoleInfoM
|
|
|
sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
|
|
|
//1:查询媒体任务
|
|
|
OptimizerCostDetailVO totalCostVo = performanceService.getOptimizerTotalCost();
|
|
|
+ OptimizerConfig config = optimizerConfigService.getEnabledConfigByMediaType(appType + "");
|
|
|
//查询经理所属人员任务完成信息列表
|
|
|
- List<OptimizerCostDetailVO> detailVOS = performanceService.getMemberPerformanceByUserId();
|
|
|
+ List<OptimizerCostDetailVO> detailVOS = performanceService.getMemberPerformanceByUserId(config, totalCostVo);
|
|
|
result.put("data", detailVOS);
|
|
|
ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
|
|
|
return result;
|