Merge remote-tracking branch 'origin/master'

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

@@ -411,7 +411,7 @@ public class YyQfmxServiceImpl extends ServiceImpl<YyQfmxMapper, YyQfmx> impleme
         //BigDecimal znj = this.baseMapper.qtStat(filter, "znj") == null ? BigDecimal.ZERO : this.baseMapper.qtStat(filter, "znj");//违约金
         List<YySjStat> list = new ArrayList<>();
         if ((long) list0.size() != 0) {
-            list.addAll(list0.stream().filter(i -> i.getSf().add(i.getLjf()).add(i.getWsf()).add(i.getSzyf()) != BigDecimal.ZERO).collect(Collectors.toList()));
+            list.addAll(list0.stream().filter(i -> !i.getSf().add(i.getLjf()).add(i.getWsf()).add(i.getSzyf()).equals(BigDecimal.ZERO) || !Objects.equals(i.getSl(), BigDecimal.ZERO)).collect(Collectors.toList()));
         }
         if ((long) list1.size() != 0) {
             list.addAll(list1);
@@ -454,7 +454,7 @@ public class YyQfmxServiceImpl extends ServiceImpl<YyQfmxMapper, YyQfmx> impleme
                 BigDecimal ljf = sjmxs.stream().map(YySjStat::getLjf).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
                 BigDecimal szyf = sjmxs.stream().map(YySjStat::getSzyf).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
                 BigDecimal bs = sjmxs.stream().map(YySjStat::getBs).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-                if (sf.add(wsf).add(ljf).add(szyf).compareTo(BigDecimal.ZERO) != 0) {
+                if (sf.add(wsf).add(ljf).add(szyf).compareTo(BigDecimal.ZERO) != 0 || !sl.equals(BigDecimal.ZERO)) {
                     if (bmsj.getJtbz().equals("0")) {
                         BigDecimal hjsj = bmsj.getSj().add(bmsj.getWsfdj()).add(bmsj.getSzyfdj());
                         result.add(new YyQfmxMonthlyStat(key, bmsj.getName(), bmsj.getSj(), hjsj, sl, sf, wsf, ljf, szyf, sf.add(wsf).add(ljf).add(szyf), bs));
@@ -483,7 +483,7 @@ public class YyQfmxServiceImpl extends ServiceImpl<YyQfmxMapper, YyQfmx> impleme
                             BigDecimal jtljf = yySjStats.stream().map(YySjStat::getLjf).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
                             BigDecimal jtszyf = yySjStats.stream().map(YySjStat::getSzyf).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
                             BigDecimal jtbs = yySjStats.stream().map(YySjStat::getBs).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-                            if (jtsf.add(jtwsf).add(jtljf).compareTo(BigDecimal.ZERO) != 0) {
+                            if (jtsf.add(jtwsf).add(jtljf).compareTo(BigDecimal.ZERO) != 0 || !jtsl.equals(BigDecimal.ZERO)) {
                                 BigDecimal jthjsj = yySjStats.get(0).getSj().add(bmsj.getWsfdj()).add(bmsj.getSzyfdj());
                                 result.add(new YyQfmxMonthlyStat(key, bmsj.getName(), yySjStats.get(0).getSj(), jthjsj, jtsl, jtsf, jtwsf, jtljf, jtszyf, jtsf.add(jtwsf).add(jtljf).add(jtszyf), jtbs));
                             }

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

@@ -404,8 +404,8 @@
         CASE WHEN 1=${tag} THEN SUM(nvl(a.ljf,0)) ELSE 0 END ljf,
         CASE WHEN 1=${tag} THEN SUM(nvl(a.szyf,0)) ELSE 0 END szyf,
         count(*) bs
-        FROM yy_qfmx a
-        WHERE a.sjbm IS NOT NULL AND a.sfbc!=3
+        FROM yy_qfmx a left join bm_sj b on a.sjbm=b.code
+        WHERE a.sjbm IS NOT NULL AND a.sfbc!=3 and b.jtbz='1'
         <if test="filter.chbz!=null">
             <choose>
                 <when test="filter.chbz.indexOf(',')!=-1">
@@ -469,8 +469,22 @@
         CASE WHEN 1=${tag} THEN SUM(nvl(a.ljf1,0)) ELSE 0 END ljf,
         CASE WHEN 1=${tag} THEN SUM(nvl(a.szyf1,0)) ELSE 0 END szyf,
         count(*) bs
-        FROM yy_qfmx a
-        WHERE a.sjbm1 IS NOT NULL AND a.sfbc!=3
+        FROM yy_qfmx a left join bm_sj b on a.sjbm1=b.code
+        WHERE a.sjbm1 IS NOT NULL AND a.sfbc!=3 and b.jtbz='1'
+        <if test="filter.chbz!=null">
+            <choose>
+                <when test="filter.chbz.indexOf(',')!=-1">
+                    AND a.chbz in
+                    <foreach item="item" index="index" collection="filter.chbz.split(',')" open="(" separator=","
+                             close=")">
+                        #{item}
+                    </foreach>
+                </when>
+                <otherwise>
+                    AND a.chbz=#{filter.chbz}
+                </otherwise>
+            </choose>
+        </if>
         <if test="filter.sfbz!=null">
             AND a.sfbz=#{filter.sfbz}
         </if>