提交统计相关的bug

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -3292,7 +3292,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
             year = Integer.parseInt(financialReceivablesQueryVo.getYear());
         }
         financialReceivablesQueryVo.setBeginDate(SliceUpDateUtil.getYearBeginDateStr(year)+" 00:00:00");
-        financialReceivablesQueryVo.setBeginDate(SliceUpDateUtil.getYearEndDateStr(year)+" 23:59:59");
+        financialReceivablesQueryVo.setEndDate(SliceUpDateUtil.getYearEndDateStr(year)+" 23:59:59");
         financialReceivablesQueryVo.setType("1");
         //总应收
         BigDecimal ptSumAmount =  baseMapper.queryDateByTypeSumAmount(financialReceivablesQueryVo);

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -2452,7 +2452,7 @@
                 and pa.agreement_type =#{vo.type}
             </if>
             <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
-                AND  create_time  BETWEEN #{vo.beginDate} AND #{vo.endDate}
+                AND  a.create_time  BETWEEN #{vo.beginDate} AND #{vo.endDate}
             </if>
         </where>
     </select>
@@ -2464,8 +2464,8 @@
         a.commissionFeevalue as commissionFeevalue,
         a.noInvoicCommissionFeevalue as noInvoicCommissionFeevalue,
         a.readyCommissionFeevalue  as readyCommissionFeevalue,
-        b.settlementAmount as settlementAmount,
-        b.noSettlementAmount as noSettlementAmount
+        ifnull(b.settlementAmount,0) as settlementAmount,
+        ifnull(b.noSettlementAmount,0) as noSettlementAmount
         from (
         SELECT
         DATE_FORMAT( a.create_time, '%Y-%m' ) as years,
@@ -2485,7 +2485,6 @@
                 AND  a.create_time  BETWEEN #{vo.beginDate} AND #{vo.endDate}
             </if>
         </where>
-        a.create_time  BETWEEN '2024-01-01 00:00:00' AND '2024-12-31 23:59:59'
         GROUP BY
         DATE_FORMAT( a.create_time, '%Y-%m' )
 
@@ -2496,7 +2495,7 @@
         SUM(IFNULL(a.settlement_amount ,0 )) as  settlementAmount,
         SUM(IFNULL(a.total_amount ,0 ) -IFNULL(a.settlement_amount ,0 ) ) AS noSettlementAmount
         FROM
-        settlement_documentary_fees_2024_06_30 a
+        settlement_documentary_fees a
         <where>
             a.settlement_status=2
             <if test="vo.type !=null  and  vo.type  !=''">