费用申请-增加费用类别和申请人搜索

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

@@ -127,6 +127,8 @@ public class StaBudgetapprovalController extends BaseController {
     public BaseResult list_apply(@RequestParam("page") Integer pageNum,
                            @RequestParam("limit") Integer pageSize,
                            @RequestParam(required = false, defaultValue = "", value = "sqmc") String sqmc,
+                           @RequestParam(required = false, defaultValue = "", value = "fylb") String fylb,
+                           @RequestParam(required = false, defaultValue = "", value = "sqr") String sqr,
                            @RequestParam(required = false, defaultValue = "", value = "erpbh") String erpbh,
                            @RequestParam(required = false, defaultValue = "", value = "spzt") String spzt,
                            @RequestParam(required = false, defaultValue = "", value = "bh") String bh,
@@ -152,6 +154,8 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
         paraMap.put("sqmc", sqmc);
+        paraMap.put("sqr", sqr);
+        paraMap.put("fylb", fylb);
         paraMap.put("erpbh", erpbh);
         paraMap.put("spzt", spzt);
         paraMap.put("bh", bh);

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -405,6 +405,9 @@
         <if test="fylb != null and fylb != ''">
             and g.FYMC like '%'+#{fylb}+'%'
         </if>
+        <if test="sqr != null and sqr != ''">
+            and b.SQRXM like '%'+#{sqr}+'%'
+        </if>
         <if test="spzt != null and spzt != ''">
             and b.SPZT = #{spzt}
         </if>

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

@@ -25,11 +25,18 @@
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">费用类别</label>
-                            <div class="layui-input-inline" style="width: 405px">
+                            <div class="layui-input-inline" style="width: 200px">
                                 <input type="text" id="fylb" name="fylb" autocomplete="off" class="layui-input">
 
                             </div>
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">申请人</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <input type="text" id="sqr" name="sqr" autocomplete="off" class="layui-input">
+
+                            </div>
+                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>
                             <div class="layui-input-inline" style="width: 180px">
@@ -272,6 +279,8 @@
         form.on('submit(data-reset-btn)', function (data) {
             form.val("search-form", {
                 "sqmc": '',
+                "fylb": '',
+                "sqr": '',
                 "erpbh": '',
                 "spzt": '',
                 "sfbz": '',