2022年11月10日13:36:19

ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/dto/FeeDTO.java

@@ -38,4 +38,9 @@ public class FeeDTO {
     // 审核时间集合
     private List<String> fAuditList;
 
+    /**
+     * 查询业务区间 业务时间
+     */
+    private List<String> fBstimeExamine;
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -729,8 +729,10 @@ public class TFeeServiceImpl implements ITFeeService {
         List<FeeVO> list = tFeeMapper.selectFinancialLedgerList(tWareHouseFees);
         for (FeeVO feeVO:list) {
             FeeDTO feeDTO = new FeeDTO();
-            feeDTO.setFDc("D");
+            feeDTO.setFDc(tWareHouseFees.getfDc());
             feeDTO.setFCorpId(feeVO.getfCorpid());
+            feeDTO.setFAuditList(tWareHouseFees.getTimeExamine());
+            feeDTO.setFBstimeExamine(tWareHouseFees.getfBstimeExamine());
             List<FeeVO> feeVOList = tFeeMapper.selectFinancialLedgerDetails(feeDTO);
             // 应收费用
             BigDecimal amount = feeVOList.stream().map(FeeVO::getFAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -2905,6 +2905,9 @@
             <if test='fAuditList != null and fAuditList[0] != null'>
                 and DATE_FORMAT(w.f_review_date, '%Y-%m') BETWEEN #{fAuditList[0]} and #{fAuditList[1]}
             </if>
+            <if test="fBstimeExamine != null and fBstimeExamine[0] != null and fBstimeExamine[0]!= ''">
+                and DATE_FORMAT(t.f_bstime, '%Y-%m') between #{fBstimeExamine[0]} and #{fBstimeExamine[1]}
+            </if>
         GROUP BY
         w.f_id
     </select>