Merge branch 'dev-lgl'

# Conflicts:
#	src/main/java/com/liang/controller/PrjAnnualbudgetController.java
#	src/main/java/com/liang/dao/PrjAnnualbudgetDao.java
#	src/main/java/com/liang/service/impl/PrjAnnualbudgetServiceImpl.java
#	src/main/resources/mapper/PrjAnnualbudgetDao.xml
#	src/main/resources/mapper/StaBudgetapprovalDao.xml

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

@@ -426,7 +426,7 @@ public class PrjAnnualbudgetController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "/doAdd", method = RequestMethod.POST)
-//    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public BaseResult doAdd(PrjAnnualbudget annualbudget) {
         annualbudget.setSpzt("未提交");
         int num = prjAnnualbudgetService.insert(annualbudget);

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

@@ -138,6 +138,7 @@ public class StaBudgetapprovalController extends BaseController {
                            @RequestParam(required = false, defaultValue = "", value = "dkyfzr") String dkyfzr,
                            @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
                            @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
+                           @RequestParam(required = false, defaultValue = "", value = "fylb") String fylb,
                            @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
         SysUserInfo userInfo = getSysUserInfo();
         List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
@@ -162,6 +163,7 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("ssbmmc", ssbmmc);
         paraMap.put("dkyfzr", dkyfzr);
         paraMap.put("nf", nf);
+        paraMap.put("fylb", fylb);
 
         if(!userInfo.getAccount().equals("admin")){
             if(!"过".equals(post)){
@@ -751,6 +753,7 @@ public class StaBudgetapprovalController extends BaseController {
                                     @RequestParam(required = false, defaultValue = "", value = "xmlx") String xmlx,
                                     @RequestParam(required = false, defaultValue = "", value = "sfbyj") String sfbyj,
                                     @RequestParam(required = false, defaultValue = "", value = "xmmc") String xmmc,
+                                    @RequestParam(required = false, defaultValue = "", value = "fylb") String fylb,
                                     @RequestParam(required = false, defaultValue = "", value = "ssbmmc") String ssbmmc,
                                     @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
                                     @RequestParam(required = false, defaultValue = "", value = "spzt") String spzt,
@@ -778,6 +781,7 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("dkyfzr", dkyfzr);
         paraMap.put("sqsj1", sqsj1);
         paraMap.put("sqsj2", sqsj2);
+        paraMap.put("fylb", fylb);
 
         List<StaBudgetapproval> list = staBudgetapprovalService.getAllApplyList(paraMap);
 

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

@@ -6,6 +6,9 @@ import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
 import com.liang.common.utils.ExcelPoiUtil;
+import com.liang.common.utils.StringUtils;
+import com.liang.dao.PrjAnnualbudgetDao;
+import com.liang.dao.StaReimbursementDao;
 import com.liang.entity.*;
 import com.liang.service.*;
 //import com.liang.vo.service.*;
@@ -22,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -389,6 +393,11 @@ public class StaReimbursementController extends BaseController {
         return "reimburse/add_approve";
     }
 
+    @Resource
+    private PrjAnnualbudgetDao prjAnnualbudgetDao;
+    @Resource
+    private StaReimbursementDao staReimbursementDao;
+
     /**
      * 更新审批状态
      *
@@ -399,6 +408,11 @@ public class StaReimbursementController extends BaseController {
     public BaseResult updateSpzt(@RequestBody String strData) {
         StaReimbursement fybz = JsonTool.parseObject(strData, StaReimbursement.class);
         int num = staReimbursementService.updateSpzt(fybz);
+//        if (StringUtils.isNotBlank(fybz.getSpzt()) && "审批结束".equals(fybz.getSpzt())) {
+//            Integer rwsId = staReimbursementDao.getRwsIdByBzId(fybz.getId());
+////            BigDecimal nysSum = prjAnnualbudgetDao.getNYSSum(fybz.getId(), rwsId);
+//            prjAnnualbudgetDao.updateSJYZXByBZID(fybz.getId(),null);
+//        }
         if (num > 0) {
             return BaseResult.success("保存成功!");
         } else {

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

@@ -1,9 +1,10 @@
 package com.liang.dao;
 
 import com.liang.entity.PrjAnnualbudget;
-import com.liang.entity.PrjProject;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
+
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -133,5 +134,11 @@ public interface PrjAnnualbudgetDao {
     void updateXTJSYZX(Integer rws);
 
     void updateSJYZX(Integer rws);
+
+    void updateSJYZXByBZID(@Param("bzId") Integer bzId, @Param("nysSum") BigDecimal nysSum);
+
+    BigDecimal getNYSSum(@Param("id") Integer id, @Param("rwsId") Integer rwsId);
+
+    void updateSJYZXSum(Integer rws);
 }
 

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

@@ -125,5 +125,7 @@ public interface StaReimbursementDao {
      * @return 影响行数
      */
     int updateBZJE(StaReimbursement staReimbursement);
+
+    Integer getRwsIdByBzId(Integer bzID);
 }
 

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

@@ -144,7 +144,10 @@ public class PrjAnnualbudgetServiceImpl implements PrjAnnualbudgetService {
         if (!Collections.isEmpty(prjAnnualbudgets)) {
             //更新 系统计算已执行
             prjAnnualbudgetDao.updateXTJSYZX(rws);
+            //更新 历史年度预算的实际已执行
             prjAnnualbudgetDao.updateSJYZX(rws);
+            //更新已执行总计
+            prjAnnualbudgetDao.updateSJYZXSum(rws);
         }
     }
 }

src/main/resources/mapper/PrjAnnualbudgetDao.xml

@@ -419,35 +419,68 @@
     </update>
     <update id="updateXTJSYZX">
         update A
-        set A.XTJSYZX = B.xtjsyzx
-        from prj_AnnualBudgetDetail A
+        set A.XTJSYZX = B.xtjsyzx from prj_AnnualBudgetDetail A
         inner join (SELECT
          fymc, sum(ysje) xtjsyzx
          from  prj_AnnualBudgetDetail
          where nys in  (SELECT ID from prj_AnnualBudget where RWS = #{rws})
-         group by fymc) B
+            group by fymc) B
         on A.FYMC = B.fymc
         where
             NYS = ( SELECT top 1 ID from prj_AnnualBudget where RWS = #{rws} order by nf desc)
     </update>
     <update id="updateSJYZX">
         update A
-        set A.sjyzx = B.BZJE
-            from prj_AnnualBudgetDetail A
-        inner join (SELECT sum(BZJE) BZJE , pa.fymc
-from
-(SELECT id , fylb
-from sta_BudgetApproval
-where nys in (select id
-        from prj_AnnualBudget
-        where rws = #{rws})) sb
-left join  sta_Reimbursement  sa on sa.fysq = sb.id
-LEFT join prj_AnnualBudgetDetail pa on pa.id = sb.fylb
-group by  pa.fymc
-) B
+        set A.sjyzx = B.BZJE from prj_AnnualBudgetDetail A
+        inner join (SELECT	sum(BZJE) BZJE ,pa.fymc
+	        from(SELECT	id ,fylb
+	  	from sta_BudgetApproval
+		where	nys in (
+			select	id
+			from prj_AnnualBudget
+			where rws = #{rws})) sb
+	left join sta_Reimbursement sa on sa.fysq = sb.id
+	LEFT join prj_AnnualBudgetDetail pa on pa.id = sb.fylb
+	group by pa.fymc ) B
         on A.FYMC = B.fymc
         where
-            NYS = ( SELECT top 1 ID from prj_AnnualBudget where RWS = #{rws} order by nf desc)
+            NYS = (
+            SELECT top 1 ID from
+            prj_AnnualBudget
+            where RWS = #{rws} order by nf desc )
+    </update>
+    <update id="updateSJYZXByBZID">
+        update A
+        set A.sjyzx = (B.BZJE + isnull(A.sjyzx, 0) + isnull(#{nysSum}, 0)) from prj_AnnualBudgetDetail A
+        inner join (
+        select pa.fymc , sr.bzje, pa.id  from sta_Reimbursement sr
+        left join  sta_BudgetApproval sb  on sb.id = sr.FYSQ
+        left join prj_AnnualBudgetDetail pa on pa.id = sb.fylb
+        where sr.id = #{bzId}
+            ) B
+        on A.FYMC = B.fymc
+        where
+            a.id=b.id
+    </update>
+    <update id="updateSJYZXSum">
+        update A
+        set A.sjyzx = B.BZJE from prj_AnnualBudgetDetail A
+        inner join (SELECT	sum(BZJE) BZJE ,pa.fymc
+	        from(SELECT	id ,fylb
+	  	from sta_BudgetApproval
+		where	nys in (
+			select	id
+			from prj_AnnualBudget
+			where rws = #{rws})) sb
+            left join sta_Reimbursement sa on sa.fysq = sb.id
+            LEFT join prj_AnnualBudgetDetail pa on pa.id = sb.fylb
+            group by pa.fymc ) B
+        on A.FYMC = B.fymc
+        where
+            NYS = (
+            SELECT top 1 ID from
+            prj_AnnualBudget
+            where RWS = #{rws} order by nf desc )
     </update>
 
     <!--已申请费用的预算-->
@@ -463,5 +496,27 @@ group by  pa.fymc
         from prj_AnnualBudget
         where rws = #{rws}
     </select>
+    <select id="getNYSSum" resultType="java.math.BigDecimal">
+        SELECT sum(pan.sjyzx) sjyzx
+        FROM (
+                 select sb.nys,
+                        pab.fymc
+                 from sta_Reimbursement sr
+                          left join sta_BudgetApproval sb on sb.id = sr.FYSQ
+                          left join prj_AnnualBudgetDetail pab on pab.id = sb.fylb
+                 where sr.id = #{id}
+             ) b
+                 left join prj_AnnualBudgetDetail pan on b.fymc = pan.fymc
+
+        where pan.nys in (
+            SELECT id
+            from prj_AnnualBudget pann
+            where rws = #{rwsId}
+              AND pann.id &lt; (select sb.nys
+                                from sta_Reimbursement sr
+                                         left join sta_BudgetApproval sb on sb.id = sr.FYSQ
+                                where sr.id = #{id})
+        )
+    </select>
 </mapper>
 

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -47,7 +47,8 @@
     <select id="queryByBH" resultMap="StaBudgetapprovalMap">
         select *
         from sta_BudgetApproval
-        where BH like #{bh}+'%' order by ID desc
+        where BH like #{bh} + '%'
+        order by ID desc
     </select>
 
     <!--查询指定行数据-->
@@ -255,30 +256,42 @@
 
     <!--新增-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into sta_BudgetApproval(SQMC, XMMC, XMID, BH, NF, FYLB, SQJE, SQSM, FJ, SQRXM, SQR, SQSJ, ERPBH, KYBG, XMLX, XMFZR, SSBM, SFBYJ, SFBZ, SPZT, NYS, BZ)
-        values (#{sqmc}, #{xmmc}, #{xmid}, #{bh}, #{nf}, #{fylb}, #{sqje}, #{sqsm}, #{fj}, #{sqrxm}, #{sqr}, GETDATE(), #{erpbh}, #{kybg}, #{xmlx}, #{xmfzr}, #{ssbm}, 0, 0, '未提交', #{nys}, #{bz})
+        insert into sta_BudgetApproval(SQMC, XMMC, XMID, BH, NF, FYLB, SQJE, SQSM, FJ, SQRXM, SQR, SQSJ, ERPBH, KYBG,
+                                       XMLX, XMFZR, SSBM, SFBYJ, SFBZ, SPZT, NYS, BZ)
+        values (#{sqmc}, #{xmmc}, #{xmid}, #{bh}, #{nf}, #{fylb}, #{sqje}, #{sqsm}, #{fj}, #{sqrxm}, #{sqr}, GETDATE(),
+                #{erpbh}, #{kybg}, #{xmlx}, #{xmfzr}, #{ssbm}, 0, 0, '未提交', #{nys}, #{bz})
     </insert>
     <insert id="insertImprest" keyProperty="id" useGeneratedKeys="true">
-        insert into sta_BudgetApproval(SQMC, BH,SQSM , NF, SQJE, SQRXM, SQR, SQSJ, SFBYJ, SFBZ, SPZT)
-        values (#{sqmc}, #{bh}, #{sqsm},#{nf}, #{sqje}, #{sqrxm}, #{sqr}, #{sqsj}, 1, 0, '未提交')
+        insert into sta_BudgetApproval(SQMC, BH, SQSM, NF, SQJE, SQRXM, SQR, SQSJ, SFBYJ, SFBZ, SPZT)
+        values (#{sqmc}, #{bh}, #{sqsm}, #{nf}, #{sqje}, #{sqrxm}, #{sqr}, #{sqsj}, 1, 0, '未提交')
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into sta_BudgetApproval(XMMC, XMID, BH, SQSM, SQJE, FYLB, BBM, FJ, SHZT, NF, SQR, SQRXM, SQSJ, SQMC, SPZT, KYFYXX, BZJE, BXPZ, BZJE2, SFBYJ, KYBG, ERPBH, XMLX, XMFZR, SSBM, SFBZ, SMWJ, BHSJE, SF, NYS, BZ)
+        insert into sta_BudgetApproval(XMMC, XMID, BH, SQSM, SQJE, FYLB, BBM, FJ, SHZT, NF, SQR, SQRXM, SQSJ, SQMC,
+        SPZT, KYFYXX, BZJE, BXPZ, BZJE2, SFBYJ, KYBG, ERPBH, XMLX, XMFZR, SSBM, SFBZ, SMWJ, BHSJE, SF, NYS, BZ)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.xmmc}, #{entity.xmid}, #{entity.bh}, #{entity.sqsm}, #{entity.sqje}, #{entity.fylb}, #{entity.bbm}, #{entity.fj}, #{entity.shzt}, #{entity.nf}, #{entity.sqrxm}, #{entity.sqr}, #{entity.sqsj}, #{entity.sqmc},
-            #{entity.spzt}, #{entity.kyfyxx}, #{entity.bzje}, #{entity.bxpz}, #{entity.bzje2}, #{entity.sfbyj}, #{entity.kybg}, #{entity.erpbh}, #{entity.xmlx}, #{entity.xmfzr}, #{entity.ssbm}, #{entity.sfbz}, #{entity.smwj},
+            (#{entity.xmmc}, #{entity.xmid}, #{entity.bh}, #{entity.sqsm}, #{entity.sqje}, #{entity.fylb},
+            #{entity.bbm}, #{entity.fj}, #{entity.shzt}, #{entity.nf}, #{entity.sqrxm}, #{entity.sqr}, #{entity.sqsj},
+            #{entity.sqmc},
+            #{entity.spzt}, #{entity.kyfyxx}, #{entity.bzje}, #{entity.bxpz}, #{entity.bzje2}, #{entity.sfbyj},
+            #{entity.kybg}, #{entity.erpbh}, #{entity.xmlx}, #{entity.xmfzr}, #{entity.ssbm}, #{entity.sfbz},
+            #{entity.smwj},
             #{entity.bhsje}, #{entity.sf}, #{entity.nys}, #{entity.bz})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into sta_BudgetApproval(XMMC, XMID, BH, SQSM, SQJE, FYLB, BBM, FJ, SHZT, NF, SQR, SQRXM, SQSJ, SQMC, SPZT, KYFYXX, BZJE, BXPZ, BZJE2, SFBYJ, KYBG, ERPBH, XMLX, XMFZR, SSBM, SFBZ, SMWJ, BHSJE, SF, NYS, BZ)
+        insert into sta_BudgetApproval(XMMC, XMID, BH, SQSM, SQJE, FYLB, BBM, FJ, SHZT, NF, SQR, SQRXM, SQSJ, SQMC,
+        SPZT, KYFYXX, BZJE, BXPZ, BZJE2, SFBYJ, KYBG, ERPBH, XMLX, XMFZR, SSBM, SFBZ, SMWJ, BHSJE, SF, NYS, BZ)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.xmmc}, #{entity.xmid}, #{entity.bh}, #{entity.sqsm}, #{entity.sqje}, #{entity.fylb}, #{entity.bbm}, #{entity.fj}, #{entity.shzt}, #{entity.nf}, #{entity.sqrxm}, #{entity.sqr}, #{entity.sqsj}, #{entity.sqmc},
-            #{entity.spzt}, #{entity.kyfyxx}, #{entity.bzje}, #{entity.bxpz}, #{entity.bzje2}, #{entity.sfbyj}, #{entity.kybg}, #{entity.erpbh}, #{entity.xmlx}, #{entity.xmfzr}, #{entity.ssbm}, #{entity.sfbz}, #{entity.smwj},
+            (#{entity.xmmc}, #{entity.xmid}, #{entity.bh}, #{entity.sqsm}, #{entity.sqje}, #{entity.fylb},
+            #{entity.bbm}, #{entity.fj}, #{entity.shzt}, #{entity.nf}, #{entity.sqrxm}, #{entity.sqr}, #{entity.sqsj},
+            #{entity.sqmc},
+            #{entity.spzt}, #{entity.kyfyxx}, #{entity.bzje}, #{entity.bxpz}, #{entity.bzje2}, #{entity.sfbyj},
+            #{entity.kybg}, #{entity.erpbh}, #{entity.xmlx}, #{entity.xmfzr}, #{entity.ssbm}, #{entity.sfbz},
+            #{entity.smwj},
             #{entity.bhsje}, #{entity.sf}, ##{entity.nys}, #{entity.bz})
         </foreach>
         on duplicate key update
@@ -318,13 +331,13 @@
     <update id="update">
         update sta_BudgetApproval
         set SQJE = #{sqje},
-            FJ = #{fj},
-            BZ = #{bz},
+            FJ   = #{fj},
+            BZ   = #{bz},
             SQMC = #{sqmc},
             SQSM = #{sqsm}
         where ID = #{id}
     </update>
-<!--    修改方法-->
+    <!--    修改方法-->
     <!--通过主键修改基础数据-->
     <update id="updateImprest">
         update sta_BudgetApproval
@@ -334,35 +347,37 @@
             SQSM = #{sqsm}
         where ID = #{id}
     </update>
-<!--    修改方法-->
+    <!--    修改方法-->
     <!--备用金关联项目-->
     <update id="ImprestConnect">
         update sta_BudgetApproval
-        set XMMC = #{xmmc},
-            XMID = #{xmid},
-            FYLB = #{fylb},
-            FJ = #{fj},
+        set XMMC  = #{xmmc},
+            XMID  = #{xmid},
+            FYLB  = #{fylb},
+            FJ    = #{fj},
             ERPBH = #{erpbh},
-            XMLX = #{xmlx},
+            XMLX  = #{xmlx},
             XMFZR = #{xmfzr},
-            SSBM = #{ssbm},
-            NYS = #{nys},
-            BZ = #{bz}
+            SSBM  = #{ssbm},
+            NYS   = #{nys},
+            BZ    = #{bz}
         where ID = #{id}
     </update>
     <!--通过主键修改其它数据-->
     <update id="updateOthers">
         update sta_BudgetApproval
         set ERPBH = #{erpbh},
-            XMLX = #{xmlx},
+            XMLX  = #{xmlx},
             XMFZR = #{xmfzr},
-            SSBM = #{ssbm}
+            SSBM  = #{ssbm}
         where ID = #{id}
     </update>
 
     <!--通过主键删除-->
     <delete id="deleteById">
-        delete from sta_BudgetApproval where ID = #{id}
+        delete
+        from sta_BudgetApproval
+        where ID = #{id}
     </delete>
 
     <!--获取费用申请列表-->
@@ -372,7 +387,7 @@
         where id in (select dkyfzrid from
         (select DISTINCT zwmc,SUBSTRING(dkyfzr, number,CHARINDEX(',',dkyfzr+',',number)-number) as dkyfzrid
         from prj_Project WITH(nolock) ,master..spt_values with(nolock) where number >= 1 and len(DKYFZR) > number
-        and SUBSTRING(','+DKYFZR,number,1)=',' and  ID = b.XMID) t)) B  for xml path('')),1,1,'')) as DKYFZRXM
+        and SUBSTRING(','+DKYFZR,number,1)=',' and ID = b.XMID) t)) B for xml path('')),1,1,'')) as DKYFZRXM
         from sta_BudgetApproval b
         left join base_ProjectType t on t.XMLX = b.XMLX
         left join prj_Project p on p.ID = b.XMID
@@ -380,13 +395,16 @@
         left join prj_AnnualBudgetDetail g on g.ID = b.FYLB
         left join base_Person r on r.ID = b.XMFZR
         where b.SFBYJ = 0
-        --           and b.SPZT != '审批结束'
+        -- and b.SPZT != '审批结束'
         <if test="userId != null and userId != ''">
             and (b.SQR = #{userId} or #{userId} in (select SHR from prj_ApproveRecord where XMID = b.ID))
         </if>
         <if test="sqmc != null and sqmc != ''">
             and b.SQMC like '%'+#{sqmc}+'%'
         </if>
+        <if test="fylb != null and fylb != ''">
+            and g.FYMC like '%'+#{fylb}+'%'
+        </if>
         <if test="spzt != null and spzt != ''">
             and b.SPZT = #{spzt}
         </if>
@@ -493,7 +511,7 @@
         where id in (select dkyfzrid from
         (select DISTINCT zwmc,SUBSTRING(dkyfzr, number,CHARINDEX(',',dkyfzr+',',number)-number) as dkyfzrid
         from prj_Project WITH(nolock) ,master..spt_values with(nolock) where number >= 1 and len(DKYFZR) > number
-        and SUBSTRING(','+DKYFZR,number,1)=',' and  ID = b.XMID) t)) B  for xml path('')),1,1,'')) as DKYFZRXM
+        and SUBSTRING(','+DKYFZR,number,1)=',' and ID = b.XMID) t)) B for xml path('')),1,1,'')) as DKYFZRXM
         from sta_BudgetApproval b
         left join base_ProjectType t on t.XMLX = b.XMLX
         left join prj_Project p on p.ID = b.XMID
@@ -555,7 +573,7 @@
         where id in (select dkyfzrid from
         (select DISTINCT zwmc,SUBSTRING(dkyfzr, number,CHARINDEX(',',dkyfzr+',',number)-number) as dkyfzrid
         from prj_Project WITH(nolock) ,master..spt_values with(nolock) where number >= 1 and len(DKYFZR) > number
-        and SUBSTRING(','+DKYFZR,number,1)=',' and  ID = b.XMID) t)) B  for xml path('')),1,1,'')) as DKYFZRXM
+        and SUBSTRING(','+DKYFZR,number,1)=',' and ID = b.XMID) t)) B for xml path('')),1,1,'')) as DKYFZRXM
         from sta_BudgetApproval b
         left join base_ProjectType t on t.XMLX = b.XMLX
         left join prj_Project p on p.ID = b.XMID
@@ -578,6 +596,9 @@
         <if test="xmmc != null and xmmc != ''">
             and b.XMMC like '%'+#{xmmc}+'%'
         </if>
+        <if test="fylb != null and fylb != ''">
+            and g.FYMC like '%'+#{fylb}+'%'
+        </if>
         <if test="ssbmmc != null and ssbmmc != ''">
             and d.dept_name like '%'+#{ssbm}+'%'
         </if>
@@ -618,7 +639,7 @@
         WHEN b.SPZT = '作废' THEN 999
         END
         ASC,
-            b.SQSJ DESC
+        b.SQSJ DESC
     </select>
 
 
@@ -630,7 +651,7 @@
         where id in (select dkyfzrid from
         (select DISTINCT zwmc,SUBSTRING(dkyfzr, number,CHARINDEX(',',dkyfzr+',',number)-number) as dkyfzrid
         from prj_Project WITH(nolock) ,master..spt_values with(nolock) where number >= 1 and len(DKYFZR) > number
-        and SUBSTRING(','+DKYFZR,number,1)=',' and  ID = b.XMID) t)) B  for xml path('')),1,1,'')) as DKYFZRXM
+        and SUBSTRING(','+DKYFZR,number,1)=',' and ID = b.XMID) t)) B for xml path('')),1,1,'')) as DKYFZRXM
         from sta_BudgetApproval b
         left join base_ProjectType t on t.XMLX = b.XMLX
         left join prj_Project p on p.ID = b.XMID
@@ -684,7 +705,7 @@
     <delete id="batchDelete" parameterType="java.util.ArrayList">
         delete from sta_BudgetApproval
         where ID in
-        <foreach item="item" index="index" collection="idList" open = "(" separator = "," close = ")">
+        <foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
             #{item}
         </foreach>
     </delete>
@@ -698,20 +719,38 @@
     <!--通过主键修改审批状态-->
     <update id="updateSpzt">
         update sta_BudgetApproval
-        set SPZT = #{spzt}, BH=#{bh}
+        set SPZT = #{spzt},
+            BH=#{bh}
         where ID = #{id}
     </update>
 
     <!--获取费用申请信息-->
-                 <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,
-               (SELECT STUFF((SELECT ','+XM from (select xm from base_Person
-                                                  where id in (select dkyfzrid from
-                                                      (select DISTINCT zwmc,SUBSTRING(dkyfzr, number,CHARINDEX(',',dkyfzr+',',number)-number) as dkyfzrid
-                                                       from prj_Project WITH(nolock) ,master..spt_values with(nolock) where number >= 1 and len(DKYFZR) > number
-                                                                                                                        and SUBSTRING(','+DKYFZR,number,1)=',' and  ID = b.XMID) t)) B  for xml path('')),1,1,'')) as DKYFZRXM
+    <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,
+               (SELECT STUFF((SELECT ',' + XM
+                              from (select xm
+                                    from base_Person
+                                    where id in (select dkyfzrid
+                                                 from (select DISTINCT zwmc,
+                                                                       SUBSTRING(dkyfzr, number,
+                                                                                 CHARINDEX(',', dkyfzr + ',', number) -
+                                                                                 number) as dkyfzrid
+                                                       from prj_Project WITH(nolock) ,master..spt_values
+                                                       with (nolock)
+                                                       where number >= 1
+                                                         and len(DKYFZR)
+                                                           > number
+                                                         and SUBSTRING (','+DKYFZR
+                                                           , number
+                                                           , 1)=','
+                                                         and ID = b.XMID) t)) B for xml path ('')),1,1,'')) as DKYFZRXM
         from sta_BudgetApproval b
                  left join base_ProjectType t on t.XMLX = b.XMLX
                  left join prj_Project p on p.ID = b.XMID

src/main/resources/mapper/StaReimbursementDao.xml

@@ -14,7 +14,7 @@
         <result property="cjsj" column="CJSJ" jdbcType="TIMESTAMP"/>
         <result property="mc" column="MC" jdbcType="VARCHAR"/>
         <result property="spzt" column="SPZT" jdbcType="VARCHAR"/>
-        <result property="sfbyj" column="SFBYJ" jdbcType="VARCHAR" />
+        <result property="sfbyj" column="SFBYJ" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--id查询单个-->
@@ -153,7 +153,7 @@
     <!--通过主键修改数据-->
     <update id="update">
         update sta_Reimbursement
-        set MC = #{mc},
+        set MC    = #{mc},
             BXPZ  = #{bxpz},
             BZJE  = #{bzje},
             SL    = #{sl},
@@ -215,6 +215,12 @@
         ASC,
         CJSJ DESC
     </select>
+    <select id="getRwsIdByBzId" resultType="java.lang.Integer">
+        SELECT sb.XMID
+        from sta_Reimbursement sr
+                 left join sta_BudgetApproval sb on sb.id = sr.fysq
+        where sr.id = #{bzID}
+    </select>
 
     <!--批量删除报账-->
     <delete id="batchDelete" parameterType="java.util.ArrayList">

src/main/resources/templates/annualbudget/update_annualbudget.html

@@ -362,6 +362,7 @@
             var value = obj.value,
                 item = obj.data,
                 colName = obj.field;
+            console.log(obj);
             if(item.children == undefined)
             {
                 //当前行预算

src/main/resources/templates/annualbudget/view_annualbudget.html

@@ -28,44 +28,53 @@
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">名称</label>
                             <div class="layui-input-inline" style="width: 855px">
-                                <input type="hidden" id="id" name="id" class="layui-input" th:value="${annualbudget.id}">
-                                <input type="text" id="mc" name="mc" class="layui-input" th:value="${annualbudget.mc}" readonly>
+                                <input type="hidden" id="id" name="id" class="layui-input"
+                                       th:value="${annualbudget.id}">
+                                <input type="text" id="mc" name="mc" class="layui-input" th:value="${annualbudget.mc}"
+                                       readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">任务书</label>
                             <div class="layui-input-inline" style="width: 855px">
-                                <input type="hidden" id="rws" name="rws" class="layui-input" th:value="${annualbudget.rws}">
-                                <input type="text" id="rwsmc" name="rwsmc" class="layui-input" th:value="${annualbudget.rwsmc}" readonly>
+                                <input type="hidden" id="rws" name="rws" class="layui-input"
+                                       th:value="${annualbudget.rws}">
+                                <input type="text" id="rwsmc" name="rwsmc" class="layui-input"
+                                       th:value="${annualbudget.rwsmc}" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">项目执行期</label>
                             <div class="layui-input-inline" style="width: 855px">
-                                <input type="text" id="xmzxq" name="xmzxq" class="layui-input" autocomplete="off" th:value="${annualbudget.xmzxq}" readonly>
+                                <input type="text" id="xmzxq" name="xmzxq" class="layui-input" autocomplete="off"
+                                       th:value="${annualbudget.xmzxq}" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label required" style="width: 70px">年份</label>
                             <div class="layui-input-inline" style="width: 855px">
                                 <input type="number" id="nf" name="nf" value="2023" lay-verify="required"
-                                       lay-reqtext="年份不能为空" class="layui-input" autocomplete="off" th:value="${annualbudget.nf}" readonly>
+                                       lay-reqtext="年份不能为空" class="layui-input" autocomplete="off"
+                                       th:value="${annualbudget.nf}" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">说明</label>
                             <div class="layui-input-inline" style="width: 855px">
-                                <textarea id="sm" name="sm"  class="layui-textarea" style="width: 100%;height: 150px" th:text="${annualbudget.sm}" readonly></textarea>
+                                <textarea id="sm" name="sm" class="layui-textarea" style="width: 100%;height: 150px"
+                                          th:text="${annualbudget.sm}" readonly></textarea>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">申请人</label>
                             <div class="layui-input-inline" style="width: 380px">
-                                <input type="text" name="sqrxm" class="layui-input" th:value="${annualbudget.sqrxm}" readonly>
+                                <input type="text" name="sqrxm" class="layui-input" th:value="${annualbudget.sqrxm}"
+                                       readonly>
                             </div>
                             <label class="layui-form-label" style="width: 65px">申请时间</label>
                             <div class="layui-input-inline" style="width: 370px">
-                                <input type="text" id="sqsj" name="sqsj" class="layui-input" th:value="${annualbudget.sqsj}" readonly>
+                                <input type="text" id="sqsj" name="sqsj" class="layui-input"
+                                       th:value="${annualbudget.sqsj}" readonly>
                             </div>
                         </div>
                         <!--                        <div class="layui-form-item layui-inline" style="width: 100%">-->
@@ -77,27 +86,32 @@
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">可研报告</label>
                             <div class="layui-input-inline" style="width: 855px">
-                                <input type="text" id="xmmc" name="xmmc" class="layui-input" th:value="${annualbudget.xmmc}" readonly>
+                                <input type="text" id="xmmc" name="xmmc" class="layui-input"
+                                       th:value="${annualbudget.xmmc}" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 70px">ERP编号</label>
                             <div class="layui-input-inline" style="width: 380px">
-                                <input type="text" id="erpbh" name="erpbh" class="layui-input" th:value="${annualbudget.erpbh}" readonly>
+                                <input type="text" id="erpbh" name="erpbh" class="layui-input"
+                                       th:value="${annualbudget.erpbh}" readonly>
                             </div>
                             <label class="layui-form-label" style="width: 65px">项目类型</label>
                             <div class="layui-input-inline" style="width: 370px">
-                                <input type="text" id="xmlxmc" name="xmlxmc" class="layui-input" th:value="${annualbudget.xmlxmc}" readonly>
+                                <input type="text" id="xmlxmc" name="xmlxmc" class="layui-input"
+                                       th:value="${annualbudget.xmlxmc}" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 90px">电科院负责人</label>
                             <div class="layui-input-inline" style="width: 370px">
-                                <input type="text" id="xmfzrxm" name="xmfzrxm" class="layui-input" th:value="${annualbudget.xmfzrxm}" readonly>
+                                <input type="text" id="xmfzrxm" name="xmfzrxm" class="layui-input"
+                                       th:value="${annualbudget.xmfzrxm}" readonly>
                             </div>
                             <label class="layui-form-label" style="width: 65px">所属部门</label>
                             <div class="layui-input-inline" style="width: 370px">
-                                <input type="text" id="ssbmmc" name="ssbmmc" class="layui-input" th:value="${annualbudget.ssbmmc}" readonly>
+                                <input type="text" id="ssbmmc" name="ssbmmc" class="layui-input"
+                                       th:value="${annualbudget.ssbmmc}" readonly>
                             </div>
                         </div>
 
@@ -120,19 +134,23 @@
                     <div class="layui-form layuimini-form">
                         <div class="layui-form-item" style="margin-bottom: -10px">
                             <div class="layui-inline">
-                                <label class="layui-form-label " style="width: fit-content; margin-bottom: -10px">单位：万元</label>
+                                <label class="layui-form-label "
+                                       style="width: fit-content; margin-bottom: -10px">单位：万元</label>
                                 <label class="layui-form-label" style="width: 100px"></label>
                             </div>
                             <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 120px; margin-left: -10px">[[${ysmc}]]</label>
+                                <label class="layui-form-label"
+                                       style="width: 120px; margin-left: -10px">[[${ysmc}]]</label>
                                 <div class="layui-input-inline" style="width: 100px">
-                                    <input type="text" id="rwsys" name="rwsys" class="layui-input" th:value="${rwsys}" readonly>
+                                    <input type="text" id="rwsys" name="rwsys" class="layui-input" th:value="${rwsys}"
+                                           readonly>
                                 </div>
                             </div>
                             <div class="layui-inline">
                                 <label class="layui-form-label" style="width: 60px; margin-left: -15px">年度经费</label>
                                 <div class="layui-input-inline" style="width: 100px">
-                                    <input type="text" id="ndczje" name="ndczje" class="layui-input" th:value="${ndczje}" readonly>
+                                    <input type="text" id="ndczje" name="ndczje" class="layui-input"
+                                           th:value="${ndczje}" readonly>
                                 </div>
                             </div>
                             <div class="layui-inline">
@@ -177,10 +195,10 @@
 
         var rwsId = $("#rws").val(),
             ysId = $("#id").val();
-        var zjfy=0;
+        var zjfy = 0;
 
         // 监听查看任务书按钮
-        $("button[lay-filter='viewRwsBtn']").click(function(){
+        $("button[lay-filter='viewRwsBtn']").click(function () {
             parent.layer.open({
                 title: '查看项目任务书',
                 type: 2,
@@ -205,9 +223,9 @@
             dataType: "json",
             success: function (result) {
                 dataBudget = result;
-                for (let i = 0; i <dataBudget.length ; i++) {
-                    if(dataBudget[i].fymc.indexOf('总计')>-1){
-                        zjfy=i;
+                for (let i = 0; i < dataBudget.length; i++) {
+                    if (dataBudget[i].fymc.indexOf('总计') > -1) {
+                        zjfy = i;
                     }
                 }
                 $("#ndbyj").val(dataBudget[zjfy].byj);
@@ -226,7 +244,15 @@
                 dataBudget1 = result;
             }
         });
-
+        console.log(dataBudget1);
+        let fjArray = []
+        fjArray = Array.from(dataBudget1,({fj}) => fj)
+        console.log('fjArray'+fjArray);
+        for (var j = 0; j < dataBudget1.length; j++){
+            if (!fjArray.includes(dataBudget1[j].bm)) {
+                setFjBudget(dataBudget1[j].fj);
+            }
+        }
         treeTable.render({
             elem: '#currentTableId',
             data: dataBudget1,
@@ -261,13 +287,80 @@
                     // {field: 'byjybz', width: '11%', title: '备用金已报账'}
                 ]
             ],
+            done: function () {
+            }
         });
 
         // 监听取消按钮
-        $("button[lay-filter='cancleBtn']").click(function(){
+        $("button[lay-filter='cancleBtn']").click(function () {
             var iframeIndex = parent.layer.getFrameIndex(window.name);
             parent.layer.close(iframeIndex);
         });
+
+        //父级预算
+        function setFjBudget(fj) {
+            if (fj != null && fj != '') {
+                var xmzys = 0, xmz = 0, byj = 0, xtjsyzx = 0, sjyzx = 0;
+                //子节点的值相加
+                for (var j = 0; j < dataBudget1.length; j++) {
+                    if (fj == dataBudget1[j].fj) {
+                        // var t = parseFloat(dataBudget[j].xmzys);
+                        // if (!isNaN(t))
+                        //     xmzys += t;
+                        var t1 = parseFloat(dataBudget1[j].xmz);
+                        if (!isNaN(t1))
+                            xmz += t1;
+                        var t2 = parseFloat(dataBudget1[j].byj);
+                        if (!isNaN(t2))
+                            byj += t2;
+                        var t3 = parseFloat(dataBudget1[j].xtjsyzx);
+                        if (!isNaN(t3))
+                            xtjsyzx += t3;
+                        var t4 = parseFloat(dataBudget1[j].sjyzx);
+                        if (!isNaN(t4))
+                            sjyzx += t4;
+                    }
+                }
+                console.log(sjyzx);
+                //更新父节点的值
+                for (var j = 0; j < dataBudget1.length; j++) {
+                    if (fj == dataBudget1[j].bm) {
+                        // if (xmzys == 0)
+                        //     dataBudget[j].xmzys = '';
+                        // else
+                        //     dataBudget[j].xmzys = xmzys.toFixed(2);
+                        if (xmz == 0)
+                            dataBudget1[j].xmz = '';
+                        else
+                            dataBudget1[j].xmz = xmz.toFixed(2);
+                        if (xtjsyzx == 0)
+                            dataBudget1[j].xtjsyzx = '';
+                        else
+                            dataBudget1[j].xtjsyzx = xtjsyzx.toFixed(2);
+                        if (sjyzx == 0)
+                            dataBudget1[j].sjyzx = '';
+                        else
+                            dataBudget1[j].sjyzx = sjyzx.toFixed(2);
+                        // if (byj > 0)
+                        //     dataBudget[j].byj = byj.toFixed(2);
+                        // else if(dataBudget[j].fj != '')
+                        //     dataBudget[j].byj = '';
+
+                        // console.log(dataBudget[j].fj);
+                        // console.log(dataBudget[j].byj);
+
+                        var ysje = xmz + byj;
+                        if (ysje == 0)
+                            dataBudget1[j].ysje = "";
+                        else
+                            dataBudget1[j].ysje = ysje.toFixed(2);
+
+                        setFjBudget(dataBudget1[j].fj);
+                        break;
+                    }
+                }
+            }
+        }
     });
 </script>
 </body>

src/main/resources/templates/payapply/add.html

@@ -33,7 +33,7 @@
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 60px">合同</label>
             <div class="layui-input-inline" style="width: 380px">
-                <select name="ht" id="ht" lay-filter="ht" lay-verify="required" lay-reqtext="合同不能为空">
+                <select name="ht" id="ht" lay-filter="ht" lay-verify="required" lay-reqtext="合同不能为空" lay-search=“”>
                     <option value="">-- 请选择 --</option>
                     <option th:each="item:${htList}" th:text="${item.htmc}" th:value="${item.id}"></option>
                 </select>

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

@@ -23,6 +23,13 @@
 
                             </div>
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">费用类别</label>
+                            <div class="layui-input-inline" style="width: 405px">
+                                <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; margin-left: -10px">审批状态</label>
                             <div class="layui-input-inline" style="width: 180px">

src/main/resources/templates/stafeemanage/list_allapply.html

@@ -23,6 +23,12 @@
                                 <input type="text" id="xmmc" name="xmmc" 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: 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: 30px">编号</label>
                             <div class="layui-input-inline" style="width: 150px">