查看页面结算信息分月查询

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<String, Object> model) {
+    public String approve(@RequestParam(value = KEYWORDS, required = false) String keywords,
+                          @RequestParam("id") int id, @RequestParam String listFrom,
+                          Map<String, Object> 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<String, String> 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));

src/main/resources/templates/admin/project_approve.ftl

@@ -95,6 +95,7 @@
             </div>
 
             <form method="post" class="am-form" id="pmsForm" action="${base}/project/budgetEditSave">
+                <input type="hidden" id="keywords" name="keywords" value='${keywords!""}'/>
                 <!--选项卡（tabs）begin-->
                 <div class="am-tabs am-margin" data-am-tabs>
                     <ul class="am-tabs-nav am-nav am-nav-tabs">
@@ -643,7 +644,7 @@
                             <div class="am-u-sm-10">
                                 <div class="am-form am-form-inline">
                                     <div class="am-form-group am-form-icon">
-                                        <input type="text" id="time" name="time" autocomplete="off" data-am-datepicker readonly value="${time!}">
+                                        <input type="text" id="time" name="time" autocomplete="off" readonly value="${time!}">
                                     </div>
                                 </div>
                             </div>
@@ -1889,6 +1890,7 @@
     <script src="${base}/assets/js/project_budget_cost.js"></script>
     <script src="${base}/assets/js/project_budget_cost_project_manage.js"></script>
     <script src="${base}/assets/js/project_budget_plan.js"></script>
+    <script src="${base}/layui/layui.js"></script>
 </@defaultLayout.layout>
 
 <script>
@@ -1935,4 +1937,37 @@
             }
         });
     }
+
+    layui.use('laydate', function(){
+        var laydate = layui.laydate;
+
+        laydate.render({
+            elem: '#time',
+            type: 'month',
+            btns: ['confirm'],
+            trigger: 'click',
+            ready: function(){
+                console.log($(this.elem).val());
+            },
+            done: function() {
+                var time = $(this.elem).val();
+                console.log("time:" + time)
+                setKeywords(time);
+                $("#pmsForm").attr("action","${base}/project/approve?listFrom=list&id=${project.id}");
+                $("#pmsForm").submit();
+            }
+        });
+    });
+
+    function setKeywords(time) {
+        var keywordsObj = {};
+        keywordsObj.time = time;
+        var keywords = "";
+        if (!$.isEmptyObject(keywordsObj)) {
+            keywords = JSON.stringify(keywordsObj);
+        }
+        console.log("keywords = " + keywords);
+
+        $("#keywords").val(keywords);
+    }
 </script>