备用金待关联无法检索

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

@@ -1,5 +1,6 @@
 package com.liang.controller;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
@@ -1376,18 +1377,32 @@ public class StaBudgetapprovalController extends BaseController {
      * @return
      */
     @ResponseBody
-    @PostMapping("/unassociated")
-    public BaseResult unassociated(){
-        List<StaBudgetapproval> list = staBudgetapprovalService.unassociated();
-        PageInfo<StaBudgetapproval> pageinfo = new PageInfo<>(list);
-        //取出查询结果
-        List<StaBudgetapproval> rows = pageinfo.getList();
-        int total = (int) pageinfo.getTotal();
-        Map<String, Object> result = new HashMap<>();
-        result.put(RESULT_ROWS, rows);
-        result.put(RESULT_TOTAL, total);
-        return BaseResult.success(result);
-    }
+    @PostMapping("/unassociated/{fromdata}")
+    public BaseResult unassociated(@PathVariable String fromdata){
+
+            try {
+                ObjectMapper objectMapper = new ObjectMapper();
+                FormData formData = objectMapper.readValue(fromdata, FormData.class);
+                Map<String, String> map = new HashMap<>();
+                map.put("bh",formData.getBh());
+                map.put("nf",formData.getNf());
+                map.put("xmmc",formData.getXmmc());
+                List<StaBudgetapproval> list = staBudgetapprovalService.unassociated(map);
+                PageInfo<StaBudgetapproval> pageinfo = new PageInfo<>(list);
+                //取出查询结果
+                List<StaBudgetapproval> rows = pageinfo.getList();
+                int total = (int) pageinfo.getTotal();
+                Map<String, Object> result = new HashMap<>();
+                result.put(RESULT_ROWS, rows);
+                result.put(RESULT_TOTAL, total);
+                return BaseResult.success(result);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return BaseResult.failure("处理转换异常");
+            }
+        }
+
+
     /**
      * 审批列表获取科研编号
      * @return

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

@@ -200,7 +200,7 @@ public interface StaBudgetapprovalDao {
      * 未关联项目备用金
      * @return
      */
-    List<StaBudgetapproval>unassociated();
+    List<StaBudgetapproval>unassociated(Map map);
 
     /**
      * 项目备用金信息

src/main/java/com/liang/service/StaBudgetapprovalService.java

@@ -186,7 +186,7 @@ public interface StaBudgetapprovalService {
      * 未关联项目备用金
      * @return
      */
-    List<StaBudgetapproval>unassociated();
+    List<StaBudgetapproval>unassociated(Map Map);
 
     /**
      * 项目备用金信息

src/main/java/com/liang/service/impl/StaBudgetapprovalServiceImpl.java

@@ -201,8 +201,8 @@ public class StaBudgetapprovalServiceImpl implements StaBudgetapprovalService {
     }
 
     @Override
-    public List<StaBudgetapproval> unassociated() {
-        return this.staBudgetapprovalDao.unassociated();
+    public List<StaBudgetapproval> unassociated(Map map) {
+        return this.staBudgetapprovalDao.unassociated(map);
     }
 
     @Override

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -877,7 +877,21 @@
 
     <!--未关联项目备用金 -->
     <select id="unassociated" resultMap="StaBudgetapprovalMap" parameterType="map">
-        SELECT * FROM sta_BudgetApproval WHERE SFBYJ = 1 AND XMMC IS NULL AND SPZT='审批结束'
+        SELECT * FROM sta_BudgetApproval
+                 WHERE
+                     SFBYJ = 1
+                   AND XMMC IS NULL
+                   AND SPZT='审批结束'
+                   <if test="xmmc != null and xmmc != ''">
+                   and XMMC like '%'+#{xmmc}+'%'
+                   </if>
+                   <if test="bh != null and bh != ''">
+                   and BH like '%'+#{bh}+'%'
+                   </if>
+                   <if test="nf != null and nf != ''">
+                   and NF = #{nf}
+                   </if>
+
     </select>
 
     <!--项目备用金信息-->

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

@@ -41,7 +41,7 @@
                         <div class="layui-input-inline"  style="width: 150px">
                             <input type="text" name="bzr" autocomplete="off" class="layui-input">
                         </div>
-                        <label class="layui-form-label" style="width: 30px">名称</label>
+                        <label class="layui-form-label" style="width: 60px">报账名称</label>
                         <div class="layui-input-inline"  style="width: 200px">
                             <input type="text" name="mc" autocomplete="off" class="layui-input">
                         </div>
@@ -120,8 +120,8 @@
             cols: [
                 [
                     {type: "radio", fixed: 'left'},
-                    {type: 'numbers', fixed: 'left'},
-                    {field: 'mc', width: '20%', title: '项目名称', fixed: 'left'},
+                    {type: 'numbers', fixed: 'left',title: '序号'},
+                    {field: 'mc', width: '20%', title: '报账名称', fixed: 'left'},
                     {field: 'spzt', width: '10%',title: '审批状态'},
                     {field: 'fysqbh', width: '10%',title: '费用申请编号'},
                     {field: 'bzje', width: '8%', title: '报账金额(元)'},

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

@@ -32,7 +32,7 @@
                         <div class="layui-input-inline"  style="width: 200px">
                             <input type="text" name="bzr" autocomplete="off" class="layui-input">
                         </div>
-                        <label class="layui-form-label" style="width: 60px">项目名称</label>
+                        <label class="layui-form-label" style="width: 60px">报账名称</label>
                         <div class="layui-input-inline"  style="width: 300px">
                             <input type="text" name="mc" autocomplete="off" class="layui-input">
                         </div>
@@ -107,8 +107,8 @@
             cols: [
                 [
                     {type: "checkbox", fixed: 'left'},
-                    {type: 'numbers', fixed: 'left'},
-                    {field: 'mc', width: '20%', title: '项目名称', fixed: 'left'},
+                    {type: 'numbers', fixed: 'left',title: '序号'},
+                    {field: 'mc', width: '20%', title: '报账名称', fixed: 'left'},
                     {field: 'xmmc'},
                     {field: 'spzt', width: '10%',title: '审批状态'},
                     {field: 'fysqbh', width: '10%',title: '费用申请编号'},

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

@@ -753,9 +753,13 @@
           });
         }
       }else if(obj.event==='associated'){
+        var formData = form.val('search-form');
+        console.log(formData);
+        var formDataString = JSON.stringify(formData);
+        console.log(formDataString);
         var currTable = table.render({
           elem: '#currentTableId',
-          url: AjaxUtil.ctx + 'staBudgetapproval/unassociated',
+          url: AjaxUtil.ctx + 'staBudgetapproval/unassociated/' + formDataString,
           method: 'post',
           toolbar: '#toolbarDemo',
           // defaultToolbar: ['filter', 'print'],