ソースを参照

Merge branch 'refs/heads/hotfix-20250827-endtime' into pre

lixuesong 1 日 前
コミット
318f754797

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/pkg/WmScorePackageExportController.java

@@ -60,7 +60,7 @@ public class WmScorePackageExportController {
 
 		if(endDate == null) {
 			// 下月的第一天
-			endDate = LocalDate.of(startDate.getYear() + 1,  startDate.getMonth(), 1);
+			endDate = LocalDate.of(startDate.getYear(),  startDate.getMonthValue() + 1, 1);
 		}
 
 		return R.ok(scorePackageExportService.asyncExport(user, roles, startDate, endDate));

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskExportController.java

@@ -60,7 +60,7 @@ public class WmTaskExportController {
 
 		if(endDate == null) {
 			// 下月的第一天
-			endDate = LocalDate.of(startDate.getYear() + 1,  startDate.getMonth(), 1);
+			endDate = LocalDate.of(startDate.getYear(),  startDate.getMonthValue() + 1, 1);
 		}
 
 		return R.ok(taskDetailExportService.asyncExport(user, roles, startDate, endDate));