@@ -59,8 +59,8 @@ public class WmScorePackageExportController {
}
if(endDate == null) {
- // 当月的最后一天
- endDate = LocalDate.of(startDate.getYear(), startDate.getMonth(), startDate.lengthOfMonth());
+ // 下月的第一天
+ endDate = LocalDate.of(today.getYear() + 1, today.getMonth(), 1);
return R.ok(scorePackageExportService.asyncExport(user, roles, startDate, endDate));
@@ -59,8 +59,8 @@ public class WmTaskExportController {
return R.ok(taskDetailExportService.asyncExport(user, roles, startDate, endDate));
@@ -2262,7 +2262,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
if (i == 1) {
- datas[1][0] = "服务ID";
+ datas[1][0] = "服务编号";
datas[1][1] = "服务类型";
datas[1][2] = "服务项目积分(单价)";
datas[1][3] = "服务供应商公司名称";