|
@@ -12,6 +12,7 @@ import cn.com.ctop.performanceappraisal.service.IPerformanceService;
|
|
|
import cn.com.ctop.performanceappraisal.vo.DesignerCostDetailVO;
|
|
|
import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.common.util.DateUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -98,9 +99,9 @@ public class PerformanceServiceImpl extends ServiceImpl<PerformanceMapper, Perfo
|
|
|
@Override
|
|
|
public Map<String, Object> getUserOptimizerProjectList(Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
- // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- LoginUser sysUser = new LoginUser();
|
|
|
- sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+// LoginUser sysUser = new LoginUser();
|
|
|
+// sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
|
|
|
Integer startIndex = (pageNo - 1) * pageSize;
|
|
|
Date date = new Date();
|
|
|
Date getDate = DateUtils.addDay(date, -1);
|
|
@@ -117,9 +118,9 @@ public class PerformanceServiceImpl extends ServiceImpl<PerformanceMapper, Perfo
|
|
|
@Override
|
|
|
public Map<String, Object> getUserOptimizerAccountList(Long projectId, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
- // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- LoginUser sysUser = new LoginUser();
|
|
|
- sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+// LoginUser sysUser = new LoginUser();
|
|
|
+// sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
|
|
|
Integer startIndex = (pageNo - 1) * pageSize;
|
|
|
Date date = new Date();
|
|
|
Date getDate = DateUtils.addDay(date, -1);
|
|
@@ -137,10 +138,10 @@ public class PerformanceServiceImpl extends ServiceImpl<PerformanceMapper, Perfo
|
|
|
public Map<String, Object> getMemberPerformanceByUserId(OptimizerConfig config, OptimizerCostDetailVO totalCostVo) {
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
//查询此机构下其他运营专员跑量数据
|
|
|
- // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- LoginUser sysUser = new LoginUser();
|
|
|
- sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
|
|
|
- sysUser.setOrgCode("A01A07A01");
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+// LoginUser sysUser = new LoginUser();
|
|
|
+// sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
|
|
|
+// sysUser.setOrgCode("A01A07A01");
|
|
|
Date date = new Date();
|
|
|
Date getDate = DateUtils.addDay(date, -1);
|
|
|
String startDate = DateUtils.getQuarterStartDate(getDate);
|