费用申请-增加一个费用类别的搜索栏

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

@@ -135,6 +135,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());
@@ -159,6 +160,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)){
@@ -732,6 +734,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,
@@ -759,6 +762,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/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>
@@ -489,7 +507,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
@@ -551,7 +569,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
@@ -574,6 +592,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>
@@ -614,7 +635,7 @@
         WHEN b.SPZT = '作废' THEN 999
         END
         ASC,
-            b.SQSJ DESC
+        b.SQSJ DESC
     </select>
 
 
@@ -626,7 +647,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
@@ -680,7 +701,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>
@@ -694,20 +715,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 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
@@ -751,11 +790,11 @@
     <!--更新报账数据-->
     <update id="updateReimburse">
         update sta_BudgetApproval
-        set SFBZ = 1,
-            BXPZ = #{bxpz},
-            BZJE = #{bzje},
+        set SFBZ  = 1,
+            BXPZ  = #{bxpz},
+            BZJE  = #{bzje},
             BHSJE = #{bhsje},
-            SF = #{sf}
+            SF    = #{sf}
         where ID = #{id}
     </update>
 
@@ -768,7 +807,7 @@
         BHSJE = null,
         SF = null
         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>
     </update>
@@ -778,43 +817,68 @@
         update sta_BudgetApproval
         set SPZT = '作废'
         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>
 
     <!--项目总体费用信息-->
     <select id="getXmFyInfo" resultMap="StaBudgetapprovalMap">
-        select b.NYS, (ISNULL(SUM(b.BZJE),0)+ISNULL((select SUM(SQJE) from sta_BudgetApproval where BZJE is NULL and NYS = #{nys1} and SPZT != '作废' and SFBYJ =0),0)) as SQJE,
-               SUM(b.BZJE) as BZJE,
+        select b.NYS,
+               (ISNULL(SUM(b.BZJE), 0) + ISNULL((select SUM(SQJE)
+                                                 from sta_BudgetApproval
+                                                 where BZJE is NULL
+                                                   and NYS = #{nys1}
+                                                   and SPZT != '作废' and SFBYJ =0),0))  as SQJE,
+               SUM(b.BZJE)                                                             as BZJE,
                (select YSJE from prj_AnnualBudgetDetail where NYS = b.NYS and FJ = '') as YSJE
         from sta_BudgetApproval b
-        where b.NYS = #{nys} and b.SPZT != '作废' and b.SFBYJ =0
+        where b.NYS = #{nys}
+          and b.SPZT != '作废' and b.SFBYJ =0
         GROUP BY b.NYS
     </select>
 
     <!--项目分项费用信息-->
     <select id="getKmFyInfo" resultMap="StaBudgetapprovalMap" parameterType="map">
-        select b.NYS, b.FYLB, (ISNULL(SUM(b.BZJE),0)+ISNULL((select SUM(SQJE) from sta_BudgetApproval where BZJE is NULL and NYS = #{nys1} and FYLB = #{fylb1} and SPZT != '作废' and SFBYJ =0),0)) as SQJE,
-               SUM(b.BZJE) as BZJE,
+        select b.NYS,
+               b.FYLB,
+               (ISNULL(SUM(b.BZJE), 0) + ISNULL((select SUM(SQJE)
+                                                 from sta_BudgetApproval
+                                                 where BZJE is NULL
+                                                   and NYS = #{nys1}
+                                                   and FYLB = #{fylb1}
+                                                   and SPZT != '作废' and SFBYJ =0),0))      as SQJE,
+               SUM(b.BZJE)                                                                 as BZJE,
                (select YSJE from prj_AnnualBudgetDetail where NYS = b.NYS and ID = b.FYLB) as YSJE
         from sta_BudgetApproval b
-        where b.NYS = #{nys} and b.FYLB = #{fylb} and b.SPZT != '作废' and b.SFBYJ =0
+        where b.NYS = #{nys}
+          and b.FYLB = #{fylb}
+          and b.SPZT != '作废' and b.SFBYJ =0
         GROUP BY b.NYS, b.FYLB
     </select>
 
     <!--未关联项目备用金 -->
     <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 = '审批结束'
     </select>
 
     <!--项目备用金信息-->
     <select id="getByjInfo" resultMap="StaBudgetapprovalMap">
-        select b.NYS, (ISNULL(SUM(b.BZJE),0)+ISNULL((select SUM(SQJE) from sta_BudgetApproval where BZJE is NULL and NYS = #{nys1} and SPZT != '作废' and SFBYJ =1),0)) as SQJE,
-               SUM(b.BZJE) as BZJE,
+        select b.NYS,
+               (ISNULL(SUM(b.BZJE), 0) + ISNULL((select SUM(SQJE)
+                                                 from sta_BudgetApproval
+                                                 where BZJE is NULL
+                                                   and NYS = #{nys1}
+                                                   and SPZT != '作废' and SFBYJ =1),0))  as SQJE,
+               SUM(b.BZJE)                                                             as BZJE,
                (select YSJE from prj_AnnualBudgetDetail where NYS = b.NYS and FJ = '') as YSJE
         from sta_BudgetApproval b
-        where b.NYS = #{nys} and b.SPZT != '作废' and b.SFBYJ =1
+        where b.NYS = #{nys}
+          and b.SPZT != '作废' and b.SFBYJ =1
         GROUP BY b.NYS
     </select>
 </mapper>

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">