已报账费用申请报账数据同步，报账列表页面调整

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

@@ -174,7 +174,9 @@ public class StaReimbursementController extends BaseController {
                              @RequestParam(required = false, defaultValue = "", value = "mc") String mc,
                              @RequestParam(required = false, defaultValue = "", value = "bzr") String bzr,
                              @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();
         List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
         String post = "";
@@ -194,7 +196,7 @@ public class StaReimbursementController extends BaseController {
         paraMap.put("spzt", spzt);
         paraMap.put("mc", mc);
         paraMap.put("bzr", bzr);
-
+        paraMap.put("xmmc",xmmc);
 
         if (!userInfo.getAccount().equals("admin")) {
             if (!"过".equals(post)) {
@@ -320,8 +322,12 @@ public class StaReimbursementController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/doUpdate", method = RequestMethod.POST)
     public BaseResult doUpdate(StaReimbursement reimbursement) {
+        StaBudgetapproval staBudgetapproval =  staBudgetapprovalService.getBayID(reimbursement.getFysq());
+        staBudgetapproval.setBzje(reimbursement.getBzje());
+        int nm = staBudgetapprovalService.update(staBudgetapproval);
+        // 这个只修改了 保障表 未同步修改费用申请表
         int num = staReimbursementService.update(reimbursement);
-        if (num > 0) {
+        if (num > 0 || nm > 0 ) {
             return BaseResult.success("保存成功!");
         } else {
             return BaseResult.failure("保存失败!");

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

@@ -210,5 +210,7 @@ public interface StaBudgetapprovalDao {
     StaBudgetapproval getByjInfo(Integer nys);
 
     String getBhById(String id);
+
+    StaBudgetapproval getBayID(Integer ID);
 }
 

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

@@ -197,4 +197,5 @@ public interface StaBudgetapprovalService {
     StaBudgetapproval getByjInfo(Integer nys);
 
     String getBhById(String id);
+    StaBudgetapproval getBayID(Integer ID);
 }

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

@@ -216,4 +216,10 @@ public class StaBudgetapprovalServiceImpl implements StaBudgetapprovalService {
     public String getBhById(String id) {
         return this.staBudgetapprovalDao.getBhById(id);
     }
+
+
+    @Override
+    public StaBudgetapproval getBayID(Integer id) {
+        return this.staBudgetapprovalDao.getBayID(id);
+    }
 }

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -335,6 +335,9 @@
             BZ   = #{bz},
             SQMC = #{sqmc},
             SQSM = #{sqsm}
+            <if test="bzje != null and bzje != ''">
+            ,BZJE = #{bzje}
+            </if>
         where ID = #{id}
     </update>
     <!--    修改方法-->
@@ -764,7 +767,7 @@
                  left join sys_dept_info d on d.dept_id = b.SSBM
                  left join prj_AnnualBudgetDetail g on g.ID = b.FYLB
                  left join base_Person r on r.ID = b.XMFZR
-        where p.ID = #{id}
+        where b.ID = #{id}
     </select>
 
     <!--获取费用管理列表-->
@@ -908,4 +911,8 @@
         SELECT BH FROM sta_BudgetApproval where ID = #{id}
     </select>
 
+    <select id="getBayID" resultMap="StaBudgetapprovalMap">
+        SELECT * FROM sta_BudgetApproval where ID = #{id}
+    </select>
+
 </mapper>

src/main/resources/mapper/StaReimbursementDao.xml

@@ -198,8 +198,8 @@
         <if test="bzr != null and bzr != ''">
             and u.name like '%'+#{bzr}+'%'
         </if>
-        <if test="xmmc !=null and mc != ''">
-            and r.XMMC like '%'+#{xmmc}+'%'
+        <if test="xmmc !=null and xmmc != ''">
+            and a.XMMC like '%'+#{xmmc}+'%'
         </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">

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

@@ -16,24 +16,28 @@
             <div id="search-div" style="margin: 5px 10px -10px 0px">
                 <form class="layui-form" action="" lay-filter="search-form">
                     <div class="layui-form-item">
+                        <label class="layui-form-label" style="width: 60px">项目名称</label>
+                        <div class="layui-input-inline"  style="width: 200px">
+                            <input type="text" name="xmmc" autocomplete="off" class="layui-input">
+                        </div>
                         <label class="layui-form-label" style="width: 60px">审批状态</label>
-                        <div class="layui-input-inline" style="width: 150px">
+                        <div class="layui-input-inline" style="width: 100px">
                             <select name="spzt" lay-filter="status">
                                 <option value="">全部</option>
                                 <option th:each="item:${approveList}" th:text="${item.name}"
                                         th:value="${item.name}"></option>
                             </select>
                         </div>
-                        <label class="layui-form-label" style="width: 90px">费用申请编号</label>
-                        <div class="layui-input-inline"  style="width: 200px">
+                        <label class="layui-form-label" style="width: 60px">申请编号</label>
+                        <div class="layui-input-inline"  style="width: 150px">
                             <input type="text" name="fysqbh" autocomplete="off" class="layui-input">
                         </div>
-                        <label class="layui-form-label" style="width: 90px">报账人</label>
-                        <div class="layui-input-inline"  style="width: 200px">
+                        <label class="layui-form-label" style="width: 50px">报账人</label>
+                        <div class="layui-input-inline"  style="width: 100px">
                             <input type="text" name="bzr" autocomplete="off" class="layui-input">
                         </div>
                         <label class="layui-form-label" style="width: 60px">报账名称</label>
-                        <div class="layui-input-inline"  style="width: 300px">
+                        <div class="layui-input-inline"  style="width: 200px">
                             <input type="text" name="mc" autocomplete="off" class="layui-input">
                         </div>
                         <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>
@@ -108,8 +112,8 @@
                 [
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', fixed: 'left',title: '序号'},
-                    {field: 'mc', width: '20%', title: '报账名称', fixed: 'left'},
-                    {field: 'xmmc'},
+                    {field: 'mc', width: '15%', title: '报账名称', fixed: 'left'},
+                    {field: 'xmmc',width: '15%',title: '项目名称',fixed: 'left'},
                     {field: 'spzt', width: '10%',title: '审批状态'},
                     {field: 'fysqbh', width: '10%',title: '费用申请编号'},
                     {field: 'bzje', width: '8%', title: '报账金额(元)'},