|
|
@@ -715,7 +715,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
|
|
|
@Override
|
|
|
public Result selectAllUserExport(String depId, String startTime, String endTime, String aName) {
|
|
|
- if (endTime!=null)endTime=endTime+" 23:59:59";
|
|
|
+ String endTimeStr=endTime+" 23:59:59";
|
|
|
List<Department> depIds=new ArrayList<>();
|
|
|
//总裁助力不查看老员工
|
|
|
Integer seniorstaff = null;
|
|
|
@@ -735,9 +735,10 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
//原sql计算
|
|
|
// list=departmentMapper.AlldepCount(depIds,startTime, endTime);
|
|
|
//新java计算
|
|
|
- list=AllDepCount(depIds,startTime,endTime,seniorstaff);
|
|
|
+ list=AllDepCount(depIds,startTime,endTimeStr,seniorstaff);
|
|
|
NewExcelUtil excel=new NewExcelUtil(AdminCustomerBo.class);
|
|
|
- return excel.exportExcel(list,"部门统计表",uploadPath);
|
|
|
+ String sheetName=String.format("部门统计表_%s~%s",startTime,endTime);
|
|
|
+ return excel.exportExcel(list,sheetName,uploadPath);
|
|
|
}
|
|
|
|
|
|
/**
|