预付费余额查询接口新增以及报表接口调整

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/bjgl/service/impl/YhCbkxxServiceImpl.java

@@ -276,9 +276,11 @@ public class YhCbkxxServiceImpl extends ServiceImpl<YhCbkxxMapper, YhCbkxx> impl
         check(update);
         for (String yhbh : yhbhs) {
             YhCbkxx yhCbkxx = this.getById(yhbh);
+            YhCbkxx oldYhCbkxx = yhCbkxx;
             if (yhCbkxx == null) throw new FeesException("水表档案不存在", FeesErrorCode.BUSINESS_ERROR);
             BeanUtils.copyProperties(update, yhCbkxx);
             this.updateById(yhCbkxx);
+            saveLog(yhCbkxx, oldYhCbkxx, czyUserDetails, "修改");
             if (yhCbkxx.getSblb().equals("2") || yhCbkxx.getSblb().equals("3")) {
                 YhKhjbxx yhKhjbxx = yhKhjbxxService.getById(yhCbkxx.getYhbh());
                 if (!znbYhdaService.updateZnbYhda(yhKhjbxx, yhCbkxx, "1", czyUserDetails)) {
@@ -309,9 +311,9 @@ public class YhCbkxxServiceImpl extends ServiceImpl<YhCbkxxMapper, YhCbkxx> impl
         if (yhCbkxx.getSblb().equals("2") || yhCbkxx.getSblb().equals("3")) {
             YhKhjbxx yhKhjbxx = yhKhjbxxService.getById(yhbh);
             if (znbYhdaService.count(new QueryWrapper<ZnbYhda>().lambda().eq(ZnbYhda::getYhbh, yhbh)) > 0) {
-                znbYhdaService.updateZnbYhda(yhKhjbxx,yhCbkxx,"2",czyUserDetails);
+                znbYhdaService.updateZnbYhda(yhKhjbxx, yhCbkxx, "2", czyUserDetails);
             } else {
-                znbYhdaService.savaZnbYhda(yhKhjbxx,yhCbkxx,"2",czyUserDetails);
+                znbYhdaService.savaZnbYhda(yhKhjbxx, yhCbkxx, "2", czyUserDetails);
             }
         }
         saveLog(yhCbkxx, oldYhCbkxx, czyUserDetails, "换表");

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/sfgl/controller/YyQfmxController.java

@@ -166,6 +166,8 @@ public class YyQfmxController {
         return ResultRespone.success(new CollectionData<>(list, list.size()));
     }
 
+
+
     @ApiOperationSupport(order = 21)
     @GetMapping("/stat")
     @ApiOperation(value = "欠费信息统计", tags = {"综合查询"})

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/sfgl/controller/YySspjxxController.java

@@ -204,6 +204,26 @@ public class YySspjxxController {
         return ResultRespone.success(stat);
     }
 
+    @ApiOperationSupport(order = 24)
+    @GetMapping("/yffyeseach")
+    @ApiOperation(value = "预付费余额查询", tags = {"预付费余额"})
+    public ResultRespone<PageResult<YffYeSeachSelect>> yffyeseach(PageDto pageDto, @ModelAttribute YffYeSeachFilter filter) {
+        PageResult<YffYeSeachSelect> yffYeSeachSelectPageDto = yySspjxxService.yffyeseach(pageDto,filter);
+        return ResultRespone.success(yffYeSeachSelectPageDto);
+    }
+
+
+    @ApiOperationSupport(order = 25)
+    @GetMapping("/exportyffye")
+    @ApiOperation(value = "导出预付费余额明细", tags = "预付费余额")
+    public void export(HttpServletResponse response,
+                       @ModelAttribute YffYeSeachFilter filter) throws IOException {
+        List<YffYeSeachSelect> list = yySspjxxService.yffyeseachList(filter);
+        if (!list.isEmpty()) {
+            ExcleFileUtil.exportExcel(response, list, YffYeSeachSelect.class, "预付费余额列表.xlsx");
+        }
+    }
+
     /**
      * 修改收费明细
      * @param yySspjxx 收费明细

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/sfgl/entity/dto/YffYeSeachFilter.java

@@ -0,0 +1,24 @@
+package com.tofly.feesapi.sfgl.entity.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lihaoli
+ * @date 2024/5/14
+ */
+@Data
+@ApiModel("预付费余额查询参数DTO")
+public class YffYeSeachFilter {
+    @ApiModelProperty("用户编号")
+    private String yhbh;
+    @ApiModelProperty("所属公司编码")
+    private String ssgs;
+    @ApiModelProperty("所属抄表片区")
+    private String sscbpq;
+    @ApiModelProperty("所属抄表本(册)编码")
+    private String sscbb;
+    @ApiModelProperty("关键字")
+    private String keyword;
+}

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/sfgl/entity/dto/YySjStat.java

@@ -1,5 +1,7 @@
 package com.tofly.feesapi.sfgl.entity.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.tofly.feesapi.common.MoneySerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -37,5 +39,11 @@ public class YySjStat {
     @ApiModelProperty(value = "垃圾费")
     private BigDecimal ljf;
 
+    /**
+     * 滞纳金
+     */
+    @ApiModelProperty(value = "滞纳金")
+    private BigDecimal znj;
+
 
 }

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/sfgl/entity/vo/YffYeSeachSelect.java

@@ -0,0 +1,45 @@
+package com.tofly.feesapi.sfgl.entity.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lihaoli
+ * @date 2024/5/14
+ */
+@ApiModel(value = "预付费余额查询VO", description = "预付费余额查询")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class YffYeSeachSelect {
+    @ExcelProperty(value = "用户编号",order = 1)
+    @ApiModelProperty(value = "用户编号")
+    private String yhbh;
+    @ExcelProperty(value = "用户卡编号",order = 2)
+    @ApiModelProperty(value = "用户卡编号")
+    private String ykhbh;
+    @ExcelProperty(value = "用户名称",order = 3)
+    @ApiModelProperty(value = "用户姓名")
+    private String yhxm;
+    @ExcelProperty(value = "用户地址",order = 4)
+    @ApiModelProperty(value = "用户地址")
+    private String yhdz;
+    @ExcelProperty(value = "联系电话",order = 5)
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+    @ExcelProperty(value = "结算止度",order = 6)
+    @ApiModelProperty(value = "结算止度")
+    private BigDecimal zszd;
+    @ExcelProperty(value = "结算余额",order = 7)
+    @ApiModelProperty(value = "结算余额")
+    private BigDecimal zsye;
+    @ExcelProperty(value = "可用余额",order = 8)
+    @ApiModelProperty(value = "可用余额")
+    private BigDecimal kyye;
+}

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/sfgl/entity/vo/YySspjxxMonthlyStat.java

@@ -34,6 +34,10 @@ public class YySspjxxMonthlyStat {
     @JsonSerialize(using = MoneySerializer.class)
     private BigDecimal ljf;
 
+    @ApiModelProperty(value = "滞纳金")
+    @JsonSerialize(using = MoneySerializer.class)
+    private BigDecimal znj;
+
     @ApiModelProperty(value = "合计")
     @JsonSerialize(using = MoneySerializer.class)
     private BigDecimal hj;

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/sfgl/mapper/YySspjxxMapper.java

@@ -91,6 +91,7 @@ public interface YySspjxxMapper extends BaseMapper<YySspjxx> {
 
     /**
      * 水价收费统计
+     *
      * @param filter
      * @param tag
      * @return
@@ -100,6 +101,7 @@ public interface YySspjxxMapper extends BaseMapper<YySspjxx> {
 
     /**
      * 其它收费统计
+     *
      * @param filter
      * @return
      */
@@ -108,8 +110,15 @@ public interface YySspjxxMapper extends BaseMapper<YySspjxx> {
 
     /**
      * 用户缴费信息统计
+     *
      * @param filter
      * @return
      */
     YyStat stat(@Param("filter") YySspjxxStatFilter filter);
+
+
+    PageDto<YffYeSeachSelect> yffyeseach(PageDto pageDto,
+                                         @Param("filter") YffYeSeachFilter filter);
+
+    List<YffYeSeachSelect> yffyeseachList( @Param("filter") YffYeSeachFilter filter);
 }

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/sfgl/service/YySspjxxService.java

@@ -73,4 +73,8 @@ public interface YySspjxxService extends IService<YySspjxx> {
     List<YySspjxxMonthlyStat> monthlyStat(YySspjxxStatFilter filter);
 
     YyStat stat(YySspjxxStatFilter filter);
+
+    PageResult<YffYeSeachSelect> yffyeseach(PageDto pageDto, YffYeSeachFilter filter);
+
+    List<YffYeSeachSelect> yffyeseachList(YffYeSeachFilter filter);
 }

collect-fees/collect-fees-api/src/main/java/com/tofly/feesapi/sfgl/service/impl/YySspjxxServiceImpl.java

@@ -464,7 +464,8 @@ public class YySspjxxServiceImpl extends ServiceImpl<YySspjxxMapper, YySspjxx> i
             BigDecimal sf = sjmxs.stream().map(e -> e.getSf()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
             BigDecimal wsf = sjmxs.stream().map(e -> e.getWsf()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
             BigDecimal ljf = sjmxs.stream().map(e -> e.getLjf()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
-            results.add(new YySspjxxMonthlyStat(sjmc, sl, sf, wsf, ljf, sf.add(wsf).add(ljf)));
+            BigDecimal znj = sjmxs.stream().map(e -> e.getZnj()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
+            results.add(new YySspjxxMonthlyStat(sjmc, sl, sf, wsf, ljf, znj, sf.add(wsf).add(ljf).add(znj)));
         });
         if (!results.isEmpty()) {
             BigDecimal sl = results.stream().map(e -> e.getSl()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
@@ -472,15 +473,16 @@ public class YySspjxxServiceImpl extends ServiceImpl<YySspjxxMapper, YySspjxx> i
             BigDecimal wsf = results.stream().map(e -> e.getWsf()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
             BigDecimal ljf = results.stream().map(e -> e.getLjf()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
             BigDecimal hj = results.stream().map(e -> e.getHj()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
-            results.add(new YySspjxxMonthlyStat("小计", sl, sf, wsf, ljf, hj));
+            BigDecimal znj = results.stream().map(e -> e.getZnj()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
+            results.add(new YySspjxxMonthlyStat("小计", sl, sf, wsf, ljf, znj, hj));
         }
-        results.add(new YySspjxxMonthlyStat("充值(旧)", null, null, null, null, BigDecimal.ZERO));
-        results.add(new YySspjxxMonthlyStat("工本费", null, null, null, null, BigDecimal.ZERO));
-        results.add(new YySspjxxMonthlyStat("预交水费", null, null, null, null, yff == null ? BigDecimal.ZERO : yff));
-        results.add(new YySspjxxMonthlyStat("预存扣款金额", null, null, null, null, yckj == null ? BigDecimal.ZERO : yckj.negate()));
-        results.add(new YySspjxxMonthlyStat("水费补差", null, null, null, null, bc == null ? BigDecimal.ZERO : bc));
+        results.add(new YySspjxxMonthlyStat("充值(旧)", null, null, null, null, null, BigDecimal.ZERO));
+        results.add(new YySspjxxMonthlyStat("工本费", null, null, null, null, null, BigDecimal.ZERO));
+        results.add(new YySspjxxMonthlyStat("预交水费", null, null, null, null, null, yff == null ? BigDecimal.ZERO : yff));
+        results.add(new YySspjxxMonthlyStat("预存扣款金额", null, null, null, null, null, yckj == null ? BigDecimal.ZERO : yckj.negate()));
+        results.add(new YySspjxxMonthlyStat("水费补差", null, null, null, null, null, bc == null ? BigDecimal.ZERO : bc));
         BigDecimal hj = results.stream().map(e -> e.getHj()).filter(Objects::nonNull).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
-        results.add(new YySspjxxMonthlyStat("合计", null, null, null, null, hj));
+        results.add(new YySspjxxMonthlyStat("合计", null, null, null, null, null, hj));
         return results;
     }
 
@@ -631,6 +633,15 @@ public class YySspjxxServiceImpl extends ServiceImpl<YySspjxxMapper, YySspjxx> i
         return new YySspjxxDailyStat.SrxmStat(srxm, fffsStats);
     }
 
+    public PageResult<YffYeSeachSelect> yffyeseach(PageDto pageDto, YffYeSeachFilter filter) {
+        PageDto<YffYeSeachSelect> yffYeSeachSelectPageDto = this.baseMapper.yffyeseach(pageDto, filter);
+        return yffYeSeachSelectPageDto.toVo();
+    }
+    public List<YffYeSeachSelect> yffyeseachList(YffYeSeachFilter filter) {
+        List<YffYeSeachSelect> list = this.baseMapper.yffyeseachList(filter);
+        return list;
+    }
+
     private BigDecimal getValue(YyFjFffsStat stat, String propertyName) {
         Field field = null;
         try {

collect-fees/collect-fees-api/src/main/resources/mapper/sfgl/YySspjxxMapper.xml

@@ -4,10 +4,10 @@
 <mapper namespace="com.tofly.feesapi.sfgl.mapper.YySspjxxMapper">
     <select id="fjFffsStat" resultType="com.tofly.feesapi.sfgl.entity.dto.YyFjFffsStat">
         SELECT
-        a.fffs,          --付费方式
+        a.fffs, --付费方式
         SUM(yswsf) yswsf,--预交水费
         SUM(ysljf) ysljf,--垃圾费
-        SUM(ssznj) wyj,  --违约金
+        SUM(ssznj) wyj, --违约金
         SUM(CASE WHEN sflx = 6 THEN a.sszje ELSE 0 END) cz, --充值(旧)
         SUM(CASE WHEN sflx = 5 THEN a.sszje ELSE 0 END) gbf,--工本费
         SUM(CASE WHEN sflx = 3 THEN a.sszje ELSE 0 END) yjsf,--预交水费
@@ -24,7 +24,7 @@
             AND (a.sfrq BETWEEN #{filter.startTime} AND #{filter.endTime})
         </if>
         <if test="filter.sfrybm!=null">
-        AND a.sfrybm = #{filter.sfrybm}
+            AND a.sfrybm = #{filter.sfrybm}
         </if>
         GROUP BY
         a.fffs
@@ -32,10 +32,10 @@
 
     <select id="sjSffsStat" resultType="com.tofly.feesapi.sfgl.entity.dto.YySjFffsStat">
         SELECT
-        a.sjbm${tag} sjbm,      --水价编码
-        a.fffs,                 --付费方式
-        SUM(a.sl${tag}) sl,     --水量
-        SUM(a.sf${tag}) sf      --水费
+        a.sjbm${tag} sjbm, --水价编码
+        a.fffs, --付费方式
+        SUM(a.sl${tag}) sl, --水量
+        SUM(a.sf${tag}) sf --水费
         FROM
         YY_SSPJXX a
         WHERE a.sszje > 0 AND a.sjbm${tag} IS NOT NULL AND a.sfbc!=1 AND a.sflx IN(1,2)
@@ -43,7 +43,7 @@
             AND (a.sfrq BETWEEN #{filter.startTime} AND #{filter.endTime})
         </if>
         <if test="filter.sfrybm!=null">
-        AND a.sfrybm = #{filter.sfrybm}
+            AND a.sfrybm = #{filter.sfrybm}
         </if>
         GROUP BY
         a.sjbm${tag},
@@ -96,7 +96,8 @@
             AND a.sfrybm = #{filter.sfrybm}
         </if>
         <if test="filter.sjbm!=null">
-            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 = #{filter.sjbm})
+            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 =
+            #{filter.sjbm})
         </if>
         <if test="filter.sfrqStart!=null and filter.sfrqEnd!=null">
             AND (a.sfrq BETWEEN #{filter.sfrqStart} AND #{filter.sfrqEnd})
@@ -110,38 +111,34 @@
     </sql>
     <!-- 今日统计 -->
     <select id="jrtj" resultType="com.tofly.feesapi.sfgl.entity.vo.JrtjSelect">
-        SELECT
-        b.name fffs,      --付费方式
-        COUNT(DISTINCT a.sflsbh) bs, --笔数
-        SUM(a.sszje) je     --金额
-        FROM
-        YY_SSPJXX a
-        LEFT JOIN BM_FFFS b ON a.fffs = b.code
-        WHERE a.sszje > 0 AND a.sfrybm = #{sfrybm}
-        AND TO_CHAR(a.sfrq,'yyyy-MM-dd') = TO_CHAR(sysdate,'yyyy-MM-dd')
+        SELECT b.name                   fffs, --付费方式
+               COUNT(DISTINCT a.sflsbh) bs,   --笔数
+               SUM(a.sszje)             je    --金额
+        FROM YY_SSPJXX a
+                 LEFT JOIN BM_FFFS b ON a.fffs = b.code
+        WHERE a.sszje > 0
+          AND a.sfrybm = #{sfrybm}
+          AND TO_CHAR(a.sfrq, 'yyyy-MM-dd') = TO_CHAR(sysdate, 'yyyy-MM-dd')
         GROUP BY b.name
     </select>
     <!-- 上笔金额 -->
     <select id="sbje" resultType="java.math.BigDecimal">
-        SELECT b.je FROM (
-            SELECT
-            a.sflsbh,
-            SUM(a.sszje) je
-            FROM
-            YY_SSPJXX a
-            WHERE a.yhbh = #{yhbh} AND a.sszje > 0
-            GROUP BY a.sflsbh
-        ) b
+        SELECT b.je
+        FROM (SELECT a.sflsbh,
+                     SUM(a.sszje) je
+              FROM YY_SSPJXX a
+              WHERE a.yhbh = #{yhbh}
+                AND a.sszje > 0
+              GROUP BY a.sflsbh) b
         WHERE ROWNUM = 1
         ORDER BY b.sflsbh DESC
     </select>
     <!-- 实收总金额 -->
     <select id="sszje" resultType="java.math.BigDecimal">
-        SELECT
-        SUM(a.sszje) je
-        FROM
-        YY_SSPJXX a
-        WHERE a.sflsbh = #{sflsbh} AND a.sszje > 0
+        SELECT SUM(a.sszje) je
+        FROM YY_SSPJXX a
+        WHERE a.sflsbh = #{sflsbh}
+          AND a.sszje > 0
     </select>
     <!--综合收费报表-->
     <select id="zhSfStat" resultType="com.tofly.feesapi.sfgl.entity.vo.YySspjxxZhSfStat">
@@ -173,7 +170,8 @@
             AND a.sfrybm = #{filter.sfrybm}
         </if>
         <if test="filter.sjbm!=null">
-            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 = #{filter.sjbm})
+            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 =
+            #{filter.sjbm})
         </if>
         <if test="filter.sfrqStart!=null and filter.sfrqEnd!=null">
             AND (a.sfrq BETWEEN #{filter.sfrqStart} AND #{filter.sfrqEnd})
@@ -215,7 +213,8 @@
             AND a.sfrybm = #{filter.sfrybm}
         </if>
         <if test="filter.sjbm!=null">
-            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 = #{filter.sjbm})
+            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 =
+            #{filter.sjbm})
         </if>
         <if test="filter.sfrqStart!=null and filter.sfrqEnd!=null">
             AND (a.sfrq BETWEEN #{filter.sfrqStart} AND #{filter.sfrqEnd})
@@ -234,7 +233,8 @@
         SUM(a.sl${tag}) sl,
         SUM(a.sf${tag}) sf,
         SUM(a.wsf${tag}) wsf,
-        SUM(a.ljf${tag}) ljf
+        SUM(a.ljf${tag}) ljf,
+        SUM(a.znj) znj
         FROM YY_SSPJXX a
         WHERE a.sszje > 0 AND a.sjbm${tag} IS NOT NULL AND a.sfbc!=1 AND a.sflx IN(1,2)
         <if test="filter.yhbh!=null">
@@ -250,7 +250,8 @@
             AND a.sfrybm = #{filter.sfrybm}
         </if>
         <if test="filter.sjbm!=null">
-            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 = #{filter.sjbm})
+            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 =
+            #{filter.sjbm})
         </if>
         <if test="filter.sfrqStart!=null and filter.sfrqEnd!=null">
             AND (a.sfrq BETWEEN #{filter.sfrqStart} AND #{filter.sfrqEnd})
@@ -266,10 +267,10 @@
     <select id="qtStat" resultType="java.math.BigDecimal">
         SELECT
         <if test="flag!='yckj'">
-        SUM(a.sszje) sszje
+            SUM(a.sszje) sszje
         </if>
         <if test="flag=='yckj'">
-        SUM(a.bckj) yckj
+            SUM(a.bckj) yckj
         </if>
         FROM YY_SSPJXX a
         WHERE a.sszje > 0
@@ -295,7 +296,8 @@
             AND a.sfrybm = #{filter.sfrybm}
         </if>
         <if test="filter.sjbm!=null">
-            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 = #{filter.sjbm})
+            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 =
+            #{filter.sjbm})
         </if>
         <if test="filter.sfrqStart!=null and filter.sfrqEnd!=null">
             AND (a.sfrq BETWEEN #{filter.sfrqStart} AND #{filter.sfrqEnd})
@@ -329,7 +331,8 @@
             AND a.sfrybm = #{filter.sfrybm}
         </if>
         <if test="filter.sjbm!=null">
-            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 = #{filter.sjbm})
+            AND (a.sjbm = #{filter.sjbm} OR a.sjbm1 = #{filter.sjbm} OR a.sjbm2 = #{filter.sjbm} OR a.sjbm3 =
+            #{filter.sjbm})
         </if>
         <if test="filter.sfrqStart!=null and filter.sfrqEnd!=null">
             AND (a.sfrq BETWEEN #{filter.sfrqStart} AND #{filter.sfrqEnd})
@@ -341,4 +344,66 @@
             AND a.jfqd = #{filter.jfqd}
         </if>
     </select>
+    <select id="yffyeseach" resultType="com.tofly.feesapi.sfgl.entity.vo.YffYeSeachSelect">
+        SELECT a.yhbh,
+        b.ykhbh,
+        b.yhxm,
+        b.yhdz,
+        b.lxdh,
+        c.bcds zszd,
+        a.syje zsye,
+        a.nbsyje kyye
+        FROM yy_zjzh a,
+        yh_khjbxx b,
+        yy_cblr c
+        where a.yhbh = b.yhbh  and a.yhbh = c.yhbh and a.syje > 0 and c.jfzt = '1'
+        <if test="filter.keyword!=null">
+            AND (
+            a.yhbh like '%${filter.keyword}%'
+            or b.yhxm like '%${filter.keyword}%'
+            or b.yhdz like '%${filter.keyword}%'
+            or b.lxdh like '%${filter.keyword}%'
+            )
+        </if>
+        <if test="filter.ssgs!=null">
+            AND b.ssgs = #{filter.ssgs}
+        </if>
+        <if test="filter.sscbpq!=null">
+            AND b.sscbpq = #{filter.sscbpq}
+        </if>
+        <if test="filter.sscbb!=null">
+            AND b.sscbb = #{filter.sscbb}
+        </if>
+    </select>
+    <select id="yffyeseachList" resultType="com.tofly.feesapi.sfgl.entity.vo.YffYeSeachSelect">
+        SELECT a.yhbh,
+        b.ykhbh,
+        b.yhxm,
+        b.yhdz,
+        b.lxdh,
+        c.bcds zszd,
+        a.syje zsye,
+        a.nbsyje kyye
+        FROM yy_zjzh a,
+        yh_khjbxx b,
+        yy_cblr c
+        where a.yhbh = b.yhbh and a.yhbh = c.yhbh and a.syje > 0 and c.jfzt = '1'
+        <if test="filter.keyword!=null">
+            AND (
+            a.yhbh like '%${filter.keyword}%'
+            or b.yhxm like '%${filter.keyword}%'
+            or b.yhdz like '%${filter.keyword}%'
+            or b.lxdh like '%${filter.keyword}%'
+            )
+        </if>
+        <if test="filter.ssgs!=null">
+            AND b.ssgs = #{filter.ssgs}
+        </if>
+        <if test="filter.sscbpq!=null">
+            AND b.sscbpq = #{filter.sscbpq}
+        </if>
+        <if test="filter.sscbb!=null">
+            AND b.sscbb = #{filter.sscbb}
+        </if>
+    </select>
 </mapper>