2022年12月16日08:32:00

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

@@ -784,10 +784,10 @@ public class TFeeServiceImpl implements ITFeeService {
             BigDecimal amount = new BigDecimal("0.00");
             BigDecimal stlamount = new BigDecimal("0.00");
 //            if (tWareHouseFees.getSwitchSection() == 0) {
-            if (ObjectUtils.isNotNull(map.get("reviewDate"))) {
+            if (ObjectUtils.isNotNull(map.get("f_bstime"))) {
                 List<String> list1 = new ArrayList<>();
-                list1.add(map.get("reviewDate").toString());
-                list1.add(map.get("reviewDate").toString());
+                list1.add(map.get("f_bstime").toString());
+                list1.add(map.get("f_bstime").toString());
                 feeDTO.setFAuditList(list1);
             }
            /* } else {

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

@@ -2063,8 +2063,9 @@
             ${params.dataScope}
         </where>
         GROUP BY
-            c.f_name,
-            reviewDate
+        c.f_name,
+        c.f_id,
+        DATE_FORMAT(w.f_bsdate,'%Y-%m')
     </select>
 
     <select id="selectFeeList" resultType="java.util.Map">
@@ -2895,7 +2896,7 @@
         GROUP BY
             w.f_corpid,
             w.f_dc,
-            reviewDate
+        DATE_FORMAT(w.f_bsdate,'%Y-%m')
     </select>
 
     <select id="selectFinancialLedgerDetails" resultMap="feeVOResult">