费用申请

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

@@ -184,7 +184,8 @@ public class StaBudgetapprovalController extends BaseController {
                                  @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
                                  @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                                  @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder,
-                                 @RequestParam(required = false, defaultValue = "", value = "xmmc")String xmmc) {
+                                 @RequestParam(required = false, defaultValue = "", value = "xmmc")String xmmc,
+                                 @RequestParam(required = false, defaultValue = "", value = "bzid")String bzid) {
         SysUserInfo userInfo = getSysUserInfo();
         List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
         String post = "";
@@ -219,6 +220,7 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("ssbmmc", ssbmmc);
         paraMap.put("dkyfzr", dkyfzr);
         paraMap.put("xmmc",xmmc);
+        paraMap.put("bzid",bzid);
 
         if (!userInfo.getAccount().equals("admin")) {
             if (!"过".equals(post)) {
@@ -908,7 +910,6 @@ public class StaBudgetapprovalController extends BaseController {
             }
         }
         PageHelper.startPage(pageNum, pageSize);
-
         Map<String, String> paraMap = new HashMap<>();
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
@@ -919,14 +920,12 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("dkyfzr", dkyfzr);
         paraMap.put("ssbmmc", ssbmmc);
         paraMap.put("nf", nf);
-
         if (!userInfo.getAccount().equals("admin")) {
             if (!"过".equals(post)) {
                 paraMap.put("userId", userInfo.getUserId().toString());
             }
         }
         List<StaBudgetapproval> list = staBudgetapprovalService.getYbzFysqList(paraMap);
-
         PageInfo<StaBudgetapproval> pageinfo = new PageInfo<>(list);
         //取出查询结果
         List<StaBudgetapproval> rows = pageinfo.getList();

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -439,8 +439,12 @@
         LEFT JOIN sys_dept_info d ON d.dept_id = b.SSBM
         LEFT JOIN prj_AnnualBudgetDetail g ON g.ID = b.FYLB
         LEFT JOIN base_Person r ON r.ID = b.XMFZR
+        LEFT JOIN sta_Reimbursement c ON c.FYSQ = b.ID
         WHERE
         b.SFBYJ = 0
+        <if test="bzid != null and bzid != ''">
+            and b.SFBZ = #{bzid}
+        </if>
         -- and b.SPZT != '审批结束'
         <if test="userId != null and userId != ''">
             and (b.SQR = #{userId} or #{userId} in (select SHR from prj_ApproveRecord where XMID = b.ID))

src/main/resources/templates/stabudgetapproval/list_apply.html

@@ -122,6 +122,17 @@
                                 <input type="text" id="dkyfzrxm" name="dkyfzrxm" placeholder="可多选" autocomplete="off" class="layui-input" readonly>
                             </div>
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px; margin-left: -10px;">报账</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <select name="bzid" id="bzid" lay-filter="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">已报账</option>
+                                    <option value="0">未报账</option>
+                                </select>
+                            </div>
+                        </div>
+
                         <div class="layui-inline">
                             <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon">&#xe615;</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>