|
|
@@ -6126,8 +6126,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
|
|
|
if (companyId == 4281) {
|
|
|
//苏州博海，需要导出未填写的记录
|
|
|
- //计算从endDate到startDate的工作日数组
|
|
|
- List<LocalDate> workDays = WorkDayCalculateUtils.getWorkDaysListInRange(startDate, endDate, 0);
|
|
|
//allReportByDate针对每一个员工，列表中没有的工作日要补上
|
|
|
HttpRespMsg noReportMsg = getNoReportUserList(request, startDate, endDate, null);
|
|
|
List<UserDailyWorkItem> noReportUserList = (List<UserDailyWorkItem>)noReportMsg.data;
|
|
|
@@ -6144,7 +6142,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
}
|
|
|
}
|
|
|
for (Map<String, Object> map : allReportByDate) {
|
|
|
- long p1 = System.currentTimeMillis();
|
|
|
List<String> item=new ArrayList<>();
|
|
|
item.add(String.valueOf(rowNum));
|
|
|
item.add((String) map.get("jobNumber"));
|
|
|
@@ -6250,8 +6247,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
createDate = (String) map.get("createDate");
|
|
|
}
|
|
|
item.add(createDate);
|
|
|
-// item.add(new SimpleDateFormat("yyyy-MM-dd")
|
|
|
-// .format((java.sql.Date) map.get("createDate")));
|
|
|
item.add(map.get("duration").toString());
|
|
|
if (timeType.getMultiWorktime() == 1) {
|
|
|
if ((Integer)map.get("multiWorktime") == 1) {
|
|
|
@@ -6487,7 +6482,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
item.add("导入待审核");
|
|
|
} else {
|
|
|
//部门审核
|
|
|
- if (String.valueOf(map.get("isDeptAudit")).equals("1")) {
|
|
|
+ if (String.valueOf(map.get("isDeptAudit")).equals("1") && timeType.getReportAuditType() != 7) {
|
|
|
String deptAuditorId = map.get("deptAuditorName") + "";
|
|
|
String departmentName = map.get("departmentName") + "";
|
|
|
for (User userItem : userList) {
|
