diff --git a/src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java b/src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java index 01b6408..8e34b7e 100644 --- a/src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java +++ b/src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java @@ -67,8 +67,8 @@ public class MonthlySettleController extends BaseController { } @RequestMapping("/infoByTime") - public String infoByTime(@RequestParam("time") String time, @RequestParam("projectName") String projectName, Map model) { - MonthlySettle monthlySettle = monthlySettleRepository.findByMonthAndProjectName(time, projectName); + public String infoByTime(@RequestParam String month, @RequestParam("projectName") String projectName, Map model) { + MonthlySettle monthlySettle = monthlySettleRepository.findByMonthAndProjectName(month, projectName); model.put("monthlySettle", monthlySettle); model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); return "/admin/monthly_settle_info"; diff --git a/src/main/resources/templates/admin/monthly_settle_info.ftl b/src/main/resources/templates/admin/monthly_settle_info.ftl index 884061d..40dcb13 100644 --- a/src/main/resources/templates/admin/monthly_settle_info.ftl +++ b/src/main/resources/templates/admin/monthly_settle_info.ftl @@ -124,7 +124,7 @@
-
+
@@ -378,7 +378,7 @@ var projectName = $("#projectName").val(); var time = $(this.elem).val(); console.log("time:" + time) - $("#pmsForm").attr("action","${base}/monthlySettle/infoByTime?listFrom=list&projectName=" + projectName + "$time=" + time); + $("#pmsForm").attr("action","${base}/monthlySettle/infoByTime?projectName=" + projectName + "&month=2022-07&listFrom=list"); $("#pmsForm").submit(); } }); diff --git a/src/main/resources/templates/admin/monthly_settle_list.ftl b/src/main/resources/templates/admin/monthly_settle_list.ftl index 54a53e0..382dc45 100644 --- a/src/main/resources/templates/admin/monthly_settle_list.ftl +++ b/src/main/resources/templates/admin/monthly_settle_list.ftl @@ -252,6 +252,7 @@ +