备用金

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

@@ -776,7 +776,8 @@ public class StaBudgetapprovalController extends BaseController {
                                     @RequestParam(required = false, defaultValue = "", value = "bh") String bh,
                                     @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 = "sortOrder") String sortOrder,
+                                    @RequestParam(required = false, defaultValue = "", value = "xmmc")String xmmc) {
         SysUserInfo userInfo = getSysUserInfo();
         PageHelper.startPage(pageNum, pageSize);
 
@@ -802,6 +803,7 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("erpbh", erpbh);
         paraMap.put("sqmc", sqmc);
         paraMap.put("bh", bh);
+        paraMap.put("xmmc",xmmc);
 
 
         List<StaBudgetapproval> list = staBudgetapprovalService.getByjsqList(paraMap);
@@ -1669,11 +1671,23 @@ public class StaBudgetapprovalController extends BaseController {
 
         try {
             PageHelper.startPage(pageNum,pageSize);
+            Map<String, String> map = new HashMap<>();
             ObjectMapper objectMapper = new ObjectMapper();
             FormData formData = objectMapper.readValue(fromdata, FormData.class);
-            Map<String, String> map = new HashMap<>();
+
+            if (!formData.getNf().equals("0")){
+                String[] dk = formData.getNf().split(",");
+                if (dk.length>1){
+                    map.put("nf",dk[1]);
+                }else {
+                    map.put("nf", formData.getNf());
+                }
+
+            }else {
+                map.put("nf","");
+            }
             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);

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

@@ -150,7 +150,8 @@ public class StaReimbursementController extends BaseController {
                            @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                            @RequestParam(required = false, defaultValue = "", value = "bzr") String bzr,
                            @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder,
-                           @RequestParam(required = false, defaultValue = "", value = "nf") String nf) {
+                           @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
+                           @RequestParam(required = false, defaultValue = "", value = "xmmc")String xmmc) {
         PageHelper.startPage(pageNum, pageSize);
         Map<String, String> paraMap = new HashMap<>();
 
@@ -174,6 +175,7 @@ public class StaReimbursementController extends BaseController {
         paraMap.put("spzt", spzt);
         paraMap.put("mc", mc);
         paraMap.put("bzr", bzr);
+        paraMap.put("xmmc",xmmc);
 
         List<StaReimbursement> list = staReimbursementService.getReimburseList(paraMap);