|
|
@@ -33,6 +33,7 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
+import org.apache.tomcat.jni.Local;
|
|
|
import org.assertj.core.util.Lists;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
@@ -50,6 +51,7 @@ import java.sql.Timestamp;
|
|
|
import java.text.DecimalFormat;
|
|
|
import java.text.NumberFormat;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
+import java.time.Duration;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.LocalTime;
|
|
|
@@ -4017,7 +4019,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
//无全部项目权限，只能导出自己相关的（创建或参与）
|
|
|
userId = user.getId();
|
|
|
}
|
|
|
- List<HashMap<String, Object>> list = projectMapper.getExportData(user.getCompanyId(), userId);
|
|
|
HttpRespMsg projectPage = getProjectPage(null, null, null, null, null, null, null, null,null, null, null,null,null, request);
|
|
|
List<ProjectKeyNodesSetting> projectKeyNodesSettingList = projectKeyNodesSettingMapper.selectList(new QueryWrapper<ProjectKeyNodesSetting>().eq("company_id", user.getCompanyId()));
|
|
|
Map<String,Object> resultMap= (Map<String, Object>) projectPage.data;
|
|
|
@@ -4073,6 +4074,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
List<List<String>> allList = new ArrayList<List<String>>();
|
|
|
allList.add(headList);
|
|
|
String[] levelArray = new String[]{"正常","紧急","重要","重要且紧急","低风险","中风险","高风险"};
|
|
|
+ LocalDateTime c=LocalDateTime.now();
|
|
|
//获取项目级别数据
|
|
|
List<ProjectLevel> projectLevelList = projectLevelMapper.selectList(new QueryWrapper<ProjectLevel>().eq("company_id", user.getCompanyId()));
|
|
|
DateTimeFormatter sdf =DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
@@ -4083,6 +4085,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
collect.add(-1);
|
|
|
List<ProjectSeparate> projectSeparateList= projectSeparateMapper.selectList(new QueryWrapper<ProjectSeparate>().in("id", collect));
|
|
|
List<ProjectKeyNodes> nodesList = projectKeyNodesMapper.selectList(new QueryWrapper<ProjectKeyNodes>().in("project_id", collect));
|
|
|
+ LocalDateTime d=LocalDateTime.now();
|
|
|
+ Duration between1 = Duration.between(c, d);
|
|
|
+ System.out.println("此处耗时----------------"+between1.toMillis());
|
|
|
for (ProjectVO projectVO : projectVOList) {
|
|
|
List<String> rowData = new ArrayList<>();
|
|
|
rowData.add(projectVO.getProjectCode());
|
|
|
@@ -5286,7 +5291,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
}else {
|
|
|
userList = userMapper.selectList(queryWrapper);
|
|
|
}
|
|
|
- Map<Object, List<Map<String, Object>>> listMap = reportList.stream().collect(Collectors.groupingBy(rp -> rp.get("userName")));
|
|
|
+ Map<Object, List<Map<String, Object>>> listMap = reportList.stream().filter(item->!StringUtils.isEmpty(item.get("userName"))).collect(Collectors.groupingBy(rp -> rp.get("userName")));
|
|
|
//获取请假数据
|
|
|
List<LeaveSheet> leaveSheetList = leaveSheetMapper.selectList(new QueryWrapper<LeaveSheet>().eq("company_id", targetUser.getCompanyId()));
|
|
|
List<TimelinessRateVO> resultList=new ArrayList<>();
|
yurk