diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 38791a9..758ea66 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -8,6 +8,7 @@ import cn.palmte.work.service.ProjectEstimateService; import cn.palmte.work.service.ProjectFinalSevice; import cn.palmte.work.service.ProjectService; import cn.palmte.work.service.*; +import cn.palmte.work.utils.DateKit; import cn.palmte.work.utils.FreeMarkerUtil; import cn.palmte.work.utils.InterfaceUtil; import cn.palmte.work.utils.Utils; @@ -27,9 +28,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; /** @@ -346,7 +345,9 @@ public class ProjectController extends BaseController { * 审核页面 */ @RequestMapping("/approve") - public String approve(@RequestParam("id") int id, @RequestParam String listFrom, Map model) { + public String approve(@RequestParam(value = KEYWORDS, required = false) String keywords, + @RequestParam("id") int id, @RequestParam String listFrom, + Map model) { Project project = projectService.getProject(id); //项目信息 @@ -378,13 +379,18 @@ public class ProjectController extends BaseController { model.put("cashFlowBean", projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails)); //结算信息 - ProjectSettleIncome projectSettleIncome = projectSettleIncomeRepository.findNewByProjectId(id); - String time = ""; - if(null == projectSettleIncome){ - model.put("time", time); - }else { - time = projectSettleIncome.getTime(); + model.put("keywords",keywords); + ConcurrentHashMap searchInfo = getSearchInfo(keywords,model); + String time; + if (!searchInfo.containsKey("time")) { + Calendar instance = Calendar.getInstance(); + instance.setTime(new Date()); + instance.set(Calendar.MONTH, instance.get(Calendar.MONTH)); + Date current = instance.getTime(); + time = DateKit.toStr(current, DateKit.DATE_FORMAT_YEAR_MONTH2); model.put("time", time); + } else { + time = searchInfo.get("time"); } model.put("formerBean", projectSettleService.getFormerSettle(project, time)); model.put("monthBean", projectSettleService.getMonthSettle(project, time)); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index ab8caa5..d676c9c 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -95,6 +95,7 @@
+
    @@ -643,7 +644,7 @@
    - +
    @@ -1889,6 +1890,7 @@ + \ No newline at end of file