|
|
|
@ -6,6 +6,7 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
|
|
|
|
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
|
|
|
|
|
import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
|
|
|
|
|
import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.QuerySaleOrderListResDTO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.taskreport.vo.*;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskreport.TaskReportDO;
|
|
|
|
@ -203,9 +204,20 @@ public class TaskReportController {
|
|
|
|
|
}
|
|
|
|
|
List<LocalDateTime> fullDates = getFullDate(Integer.parseInt(pageReqVO.getYearMonth().substring(0,4)),Integer.parseInt(pageReqVO.getYearMonth().substring(4)));
|
|
|
|
|
|
|
|
|
|
result.stream().collect(Collectors.groupingBy(TaskReportDO::getOwnerName)).forEach((owner,list)->{
|
|
|
|
|
fullDates.forEach(vo->{
|
|
|
|
|
if(list.stream().filter(mo-> mo.getReportTime().toLocalDate().toString().equals(vo.toString())).count()==0 && list.stream().count()>0){
|
|
|
|
|
TaskReportDO insertData = new TaskReportDO();
|
|
|
|
|
insertData.setOwnerName(list.get(0).getOwnerName());
|
|
|
|
|
insertData.setReportTime(vo);
|
|
|
|
|
finalResult.add(insertData);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
// 导出 Excel
|
|
|
|
|
ExcelUtils.write(response, "员工工资明细.xls", "数据", TaskReportRespExportVO.class,
|
|
|
|
|
BeanUtils.toBean(result, TaskReportRespExportVO.class));
|
|
|
|
|
BeanUtils.toBean(result.stream().sorted(Comparator.comparing(TaskReportDO::getOwnerName).thenComparing(TaskReportDO::getReportTime)).collect(Collectors.toList()),
|
|
|
|
|
TaskReportRespExportVO.class));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|