|
@@ -276,11 +276,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
//需要看可见部门(部门主要负责人和其他负责人以及查看本部门工时权限)所有人员的日报
|
|
//需要看可见部门(部门主要负责人和其他负责人以及查看本部门工时权限)所有人员的日报
|
|
nameList = reportMapper.getReportNameByDateAndDept(date,
|
|
nameList = reportMapper.getReportNameByDateAndDept(date,
|
|
allVisibleDeptIdList.size() > 0?allVisibleDeptIdList:null, targetUid, companyId, (deptId == null?viewUserId:null), pageStart, pageSize);
|
|
allVisibleDeptIdList.size() > 0?allVisibleDeptIdList:null, targetUid, companyId, (deptId == null?viewUserId:null), pageStart, pageSize);
|
|
- long middle = System.currentTimeMillis();
|
|
|
|
- System.out.println("中间获取getReportNameByDateAndDept 耗时:" + (middle - start) + "ms");
|
|
|
|
-// totalMembCount = reportMapper.getReportNameByDateAndDeptCount(date, allVisibleDeptIdList.size() > 0?allVisibleDeptIdList:null, targetUid, companyId, (deptId == null?viewUserId:null));
|
|
|
|
- long end = System.currentTimeMillis();
|
|
|
|
- System.out.println("获取totalMembCount 耗时:" + (end - middle) + "ms");
|
|
|
|
} else {
|
|
} else {
|
|
//查看全公司的数据
|
|
//查看全公司的数据
|
|
List<Integer> ids = null;
|
|
List<Integer> ids = null;
|
|
@@ -306,10 +301,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
nameList = reportMapper.getReportNameByDateAndDept(date,
|
|
nameList = reportMapper.getReportNameByDateAndDept(date,
|
|
ids, targetUid, companyId, null, pageStart, pageSize);
|
|
ids, targetUid, companyId, null, pageStart, pageSize);
|
|
long middle = System.currentTimeMillis();
|
|
long middle = System.currentTimeMillis();
|
|
- System.out.println("中间获取getReportNameByDateAndDept 耗时:" + (middle - start) + "ms");
|
|
|
|
-// totalMembCount = reportMapper.getReportNameByDateAndDeptCount(date, ids, targetUid, companyId, null);
|
|
|
|
-// long end = System.currentTimeMillis();
|
|
|
|
-// System.out.println("获取totalMembCount 耗时:" + (end - middle) + "ms");
|
|
|
|
}
|
|
}
|
|
if (nameList.size() > 0) {
|
|
if (nameList.size() > 0) {
|
|
List<String> userIds = new ArrayList<>();
|
|
List<String> userIds = new ArrayList<>();
|