修改备用金关联

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

@@ -289,6 +289,19 @@ public class StaBudgetapprovalController extends BaseController {
     @RequestMapping(value = "/ImprestConnect", method = RequestMethod.POST)
     public BaseResult ImprestConnect(StaBudgetapproval budgetapproval)
     {
+        if (budgetapproval.getNys() == null){
+        return BaseResult.failure("备用金项目关联失败，年预算为空");
+        }
+        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getFysqBudgetList(budgetapproval.getNys());
+        for (int i=0;i<list.size();i++){
+            System.out.println(list.get(i).getFymc());
+
+           if(list.get(i).getFymc().equals(budgetapproval.getFylbmc())) {
+               budgetapproval.setFylb(list.get(i).getId());
+               break;
+           }
+        }
+        System.out.println(budgetapproval);
         int num = staBudgetapprovalService.ImprestConnect(budgetapproval);
         if (num > 0) {
             return BaseResult.success("备用金项目关联成功!");
@@ -530,11 +543,12 @@ public class StaBudgetapprovalController extends BaseController {
                                    @RequestParam("limit") Integer pageSize,
                                    @RequestParam(required = false, defaultValue = "", value = "spzt") String spzt,
                                    @RequestParam(required = false, defaultValue = "", value = "erpbh") String erpbh,
-                                   @RequestParam(required = false, defaultValue = "", value = "xmmc") String xmmc,
+                                   @RequestParam(required = false, defaultValue = "", value = "sqmc") String sqmc,
                                    @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);
 
@@ -543,9 +557,10 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("sortOrder", sortOrder);
         paraMap.put("spzt", spzt);
         paraMap.put("erpbh", erpbh);
-        paraMap.put("xmmc", xmmc);
+        paraMap.put("sqmc", sqmc);
         paraMap.put("bh", bh);
         paraMap.put("nf", nf);
+        paraMap.put("xmmc",xmmc);
 
         List<StaBudgetapproval> list = staBudgetapprovalService.getByjsqList(paraMap);
 
@@ -568,6 +583,10 @@ public class StaBudgetapprovalController extends BaseController {
     @RequestMapping(value = "/forImprestAdd", method = RequestMethod.GET)
     public String forImprestAdd(Model model)
     {
+        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getFysqBudgetList(321);
+        model.addAttribute("list", list);
+
+
         SysUserInfo userInfo = getSysUserInfo();
         model.addAttribute("userInfo", userInfo);
 
@@ -1295,6 +1314,10 @@ public class StaBudgetapprovalController extends BaseController {
         StaBudgetapproval budgetapproval = staBudgetapprovalService.getFysqById(id);
         model.addAttribute("budgetapproval", budgetapproval);
 
+        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getFysqBudgetList(321);
+
+        model.addAttribute("list", list);
+
         return "stabudgetapproval/connect_project";
     }
     @ResponseBody
@@ -1368,5 +1391,7 @@ public class StaBudgetapprovalController extends BaseController {
         result.put(RESULT_TOTAL, total);
         return BaseResult.success(result);
     }
+
+
 }
 

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -454,6 +454,10 @@
         <if test="nf != null and nf != ''">
             and b.NF = #{nf}
         </if>
+        <if test="sqmc != null and sqmc != ''">
+            and b.sqmc = #{sqmc}
+        </if>
+
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
                 order by ${sortName} ${sortOrder}
@@ -699,7 +703,7 @@
     </update>
 
     <!--获取费用申请信息-->
-    <select id="getFysqById" resultMap="StaBudgetapprovalMap">
+                 <select id="getFysqById" resultMap="StaBudgetapprovalMap">
         select b.*, t.XMLXMC, d.dept_name as SSBMMC, g.FYMC as FYLBMC, r.XM as XMFZRXM,
                (select MC from base_ProjectBudget g1 where g1.BM = g.FJ) as FJMC,
                case when b.SFBYJ = 1 then '是' else '否' end as SFBYJMC, case when b.SFBZ = 1 then '是' else '否' end as SFBZMC,

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

@@ -14,6 +14,8 @@
     </style>
 </head>
 <body>
+
+
 <form class="layui-form" action="" lay-filter="formDemo">
     <div class="layui-form layuimini-form">
         <div class="layui-form-item">
@@ -29,20 +31,14 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label" style="width: 75px">申请名称</label>
+            <label class="layui-form-label required" style="width: 75px">申请名称</label>
             <div class="layui-input-inline" style="width: 650px">
                 <input type="text" id="sqmc" name="sqmc" lay-verify="required" lay-reqtext="申请名称不能为空" autocomplete="off" class="layui-input">
             </div>
 
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label" style="width: 75px">费用类型</label>
-            <div class="layui-input-inline" style="width: 650px">
-                <input type="text" id="fylx" name="fylx"  autocomplete="off" class="layui-input">
-            </div>
-
             <div class="layui-form-item">
-            <label class="layui-form-label" style="width: 85px; margin-left: -10px">申请金额(元)</label>
+            <label class="layui-form-label required" style="width: 85px; margin-left: -10px">申请金额(元)</label>
             <div class="layui-input-inline" style="width: 650px">
                 <input type="number" id="sqje" name="sqje" class="layui-input" lay-verify="required" lay-reqtext="申请金额不能为空" autocomplete="off">
             </div>
@@ -56,7 +52,7 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label" style="width: 75px">申请时间</label>
+            <label class="layui-form-label required" style="width: 75px">申请时间</label>
             <div class="layui-input-inline" style="width: 650px">
                 <input type="text" id="sqsj" name="sqsj" class="layui-input" lay-verify="required|date" lay-reqtext="申请时间不能为空" readonly>
                 <tip>日期格式：yyyy-MM-dd</tip>
@@ -92,6 +88,7 @@
     var travelExpense = [];//差旅费
     var updateflag = 0;//更新标志
 
+
     layui.use(['form', 'laydate'], function () {
         var form = layui.form,
             layer = layui.layer,
@@ -105,8 +102,7 @@
             value: new Date()
 
         });
-
-
+   // 调用加载费用类型的函数
         // 监听确认按钮
         form.on('submit(saveBtn)', function (data)
         {
@@ -135,12 +131,17 @@
             return false;
         });
 
+
         // 监听取消按钮
         $("button[lay-filter='cancleBtn']").click(function(){
             var iframeIndex = parent.layer.getFrameIndex(window.name);
             parent.layer.close(iframeIndex);
         });
+
+
     });
+
+
 </script>
 </body>
 </html>