报账列表-按年份搜索

src/main/java/com/liang/controller/StaReimbursementController.java

@@ -109,7 +109,7 @@ public class StaReimbursementController extends BaseController {
         //当前用户ID
         model.addAttribute("userId", getSysUserId());
         //年份
-        List<String> yearList = prjAnnualbudgetService.getYearList();
+        List<String> yearList = staReimbursementDao.getYearList();
         model.addAttribute("yearList", yearList);
 
         return "reimburse/list";
@@ -128,9 +128,11 @@ public class StaReimbursementController extends BaseController {
         List<Map<String, String>> approveList = sysDictInfoService.queryByCode("xm_status");
         model.addAttribute("approveList", approveList);
         model.addAttribute("userId", getUserId());
+        //年份
+        List<String> yearList = staReimbursementDao.getYearList();
+        model.addAttribute("yearList", yearList);
         return "reimburse/mylist";
     }
-
     @ResponseBody
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public BaseResult list(@RequestParam("page") Integer pageNum,
@@ -172,6 +174,7 @@ public class StaReimbursementController extends BaseController {
                              @RequestParam(required = false, defaultValue = "", value = "fysqbh") String fysqbh,
                              @RequestParam(required = false, defaultValue = "", value = "spzt") String spzt,
                              @RequestParam(required = false, defaultValue = "", value = "mc") String mc,
+                             @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
                              @RequestParam(required = false, defaultValue = "", value = "bzr") String bzr,
                              @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                              @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
@@ -193,6 +196,7 @@ public class StaReimbursementController extends BaseController {
         paraMap.put("fysqbh", fysqbh);
         paraMap.put("spzt", spzt);
         paraMap.put("mc", mc);
+        paraMap.put("nf", nf);
         paraMap.put("bzr", bzr);
 
 

src/main/java/com/liang/dao/StaReimbursementDao.java

@@ -130,5 +130,8 @@ public interface StaReimbursementDao {
     int updateBZJE(StaReimbursement staReimbursement);
 
     Integer getRwsIdByBzId(Integer bzID);
+
+    List<String> getYearList();
+
 }
 

src/main/resources/mapper/StaReimbursementDao.xml

@@ -228,6 +228,13 @@
                  left join sta_BudgetApproval sb on sb.id = sr.fysq
         where sr.id = #{bzID}
     </select>
+    <select id="getYearList" resultType="java.lang.String">
+        SELECT NF
+        from
+            sta_BudgetApproval
+        group by NF
+        order by nf DESC
+    </select>
 
     <!--批量删除报账-->
     <delete id="batchDelete" parameterType="java.util.ArrayList">

src/main/resources/templates/reimburse/list.html

@@ -28,7 +28,7 @@
                         <div class="layui-input-inline" style="width: 150px">
                             <select name="nf" id="nf" lay-filter="status">
                                 <option value="">全部</option>
-                                <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
+                                <option th:each="item:${yearList}" th:text="${item}" th:value="${item}"></option>
                             </select>
                         </div>
                         <label class="layui-form-label" style="width: 60px">审批状态</label>

src/main/resources/templates/reimburse/mylist.html

@@ -36,6 +36,16 @@
                         <div class="layui-input-inline"  style="width: 300px">
                             <input type="text" name="mc" autocomplete="off" class="layui-input">
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 30px">年份</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <select name="nf" id="nf" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${yearList}" th:text="${item}"
+                                            th:value="${item}"></option>
+                                </select>
+                            </div>
+                        </div>
                         <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>
                         <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置 </button>
                     </div>