浏览代码

费用申请

ly 10 月之前
父节点
当前提交
361af51d72

+ 3 - 4
src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -184,7 +184,8 @@ public class StaBudgetapprovalController extends BaseController {
184 184
                                  @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
185 185
                                  @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
186 186
                                  @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder,
187
-                                 @RequestParam(required = false, defaultValue = "", value = "xmmc")String xmmc) {
187
+                                 @RequestParam(required = false, defaultValue = "", value = "xmmc")String xmmc,
188
+                                 @RequestParam(required = false, defaultValue = "", value = "bzid")String bzid) {
188 189
         SysUserInfo userInfo = getSysUserInfo();
189 190
         List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
190 191
         String post = "";
@@ -219,6 +220,7 @@ public class StaBudgetapprovalController extends BaseController {
219 220
         paraMap.put("ssbmmc", ssbmmc);
220 221
         paraMap.put("dkyfzr", dkyfzr);
221 222
         paraMap.put("xmmc",xmmc);
223
+        paraMap.put("bzid",bzid);
222 224
 
223 225
         if (!userInfo.getAccount().equals("admin")) {
224 226
             if (!"过".equals(post)) {
@@ -908,7 +910,6 @@ public class StaBudgetapprovalController extends BaseController {
908 910
             }
909 911
         }
910 912
         PageHelper.startPage(pageNum, pageSize);
911
-
912 913
         Map<String, String> paraMap = new HashMap<>();
913 914
         paraMap.put("sortName", sortName);
914 915
         paraMap.put("sortOrder", sortOrder);
@@ -919,14 +920,12 @@ public class StaBudgetapprovalController extends BaseController {
919 920
         paraMap.put("dkyfzr", dkyfzr);
920 921
         paraMap.put("ssbmmc", ssbmmc);
921 922
         paraMap.put("nf", nf);
922
-
923 923
         if (!userInfo.getAccount().equals("admin")) {
924 924
             if (!"过".equals(post)) {
925 925
                 paraMap.put("userId", userInfo.getUserId().toString());
926 926
             }
927 927
         }
928 928
         List<StaBudgetapproval> list = staBudgetapprovalService.getYbzFysqList(paraMap);
929
-
930 929
         PageInfo<StaBudgetapproval> pageinfo = new PageInfo<>(list);
931 930
         //取出查询结果
932 931
         List<StaBudgetapproval> rows = pageinfo.getList();

+ 4 - 0
src/main/resources/mapper/StaBudgetapprovalDao.xml

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

+ 11 - 0
src/main/resources/templates/stabudgetapproval/list_apply.html

@@ -122,6 +122,17 @@
122 122
                                 <input type="text" id="dkyfzrxm" name="dkyfzrxm" placeholder="可多选" autocomplete="off" class="layui-input" readonly>
123 123
                             </div>
124 124
                         </div>
125
+                        <div class="layui-inline">
126
+                            <label class="layui-form-label" style="width: 70px; margin-left: -10px;">报账</label>
127
+                            <div class="layui-input-inline" style="width: 140px;">
128
+                                <select name="bzid" id="bzid" lay-filter="status">
129
+                                    <option value="">请选择</option>
130
+                                    <option value="1">已报账</option>
131
+                                    <option value="0">未报账</option>
132
+                                </select>
133
+                            </div>
134
+                        </div>
135
+
125 136
                         <div class="layui-inline">
126 137
                             <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon">&#xe615;</i> 搜 索</button>
127 138
                             <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>