C退税列表及详情调整

trade-admin/src/main/java/com/trade/admin/trade/exportrebate/controller/ExportTaxRebateController.java

@@ -99,7 +99,7 @@ public class ExportTaxRebateController extends BaseController {
      * @param request 查询实体
      * @return
      */
-    @GetMapping("/declarationBatch/refundAmount")
+    @PostMapping("/declarationBatch/refundAmount")
     @PreAuthorize("@ss.hasPermi('trade:exportTaxRebate.exportTaxRefund')")
     public ResponseResult<BigDecimal> getRefundAmountForDeclarationBatch(ExportTaxRefundBatchRequest request) {
         return success(exportTaxRebateService.getRefundAmountForDeclarationBatch(request));
@@ -123,7 +123,7 @@ public class ExportTaxRebateController extends BaseController {
      * @param request 查询实体
      * @return
      */
-    @GetMapping("/exportDetails/refundAmount")
+    @PostMapping("/exportDetails/refundAmount")
     @PreAuthorize("@ss.hasPermi('trade:exportTaxRebate.exportTaxRefund')")
     public ResponseResult<BigDecimal> getRefundAmountForExportDetails(List<TaxRebateExportAbstractInfo> request) {
         return success(exportTaxRebateService.getRefundAmountForExportDetails(request));

trade-service/src/main/java/com/trade/service/trade/exportrebate/mapper/TaxRebatePurchaseDetailsMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.trade.service.trade.exportrebate.domain.TaxRebatePurchaseDetails;
 import com.trade.service.trade.exportrebate.dto.TaxRebatePurchaseAbstractInfo;
 import com.trade.service.trade.exportrebate.dto.search.TaxRebatePurchaseAbstractInfoSearchDto;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
  * @since 2024-10-24 20:48:57
  */
 public interface TaxRebatePurchaseDetailsMapper extends BaseMapper<TaxRebatePurchaseDetails> {
+
     /**
      * 出口退税进货明细摘要信息分页查询
      *
@@ -25,8 +27,9 @@ public interface TaxRebatePurchaseDetailsMapper extends BaseMapper<TaxRebatePurc
 
     /**
      * 根据出口明细ID获取进货明细
+     * 
      * @param exportDetailIds
      * @return
      */
-    List<TaxRebatePurchaseAbstractInfo> getByExportDetailIds(List<Long> exportDetailIds);
+    List<TaxRebatePurchaseAbstractInfo> getByExportDetailIds(@Param("exportDetailIds") List<Long> exportDetailIds);
 }

trade-service/src/main/resources/mapper/trade/exportrebate/TaxRebateExportDetailsMapper.xml

@@ -25,19 +25,19 @@
         d.customs_declaration_no,
         d.sales_order_no,
         d.proforma_invoice_no,
-        SUM(d.tax_refund_amount) AS tax_refund_amount ,
+        SUM(d.tax_refund_amount) AS tax_refund_amount,
         d.export_date,
         SUM(d.export_quantity) AS export_quantity,
         d.status
         FROM tax_rebate_export_details d
         WHERE d.deleted = 0 AND (d.agency_cert_no IS NULL OR d.agency_cert_no = '')
-        <if test="customerUserId!= null and customerUserId!= ''">
+        <if test="customerUserId!= null ">
             AND d.customer_user_id = #{customerUserId}
         </if>
-        <if test="declarationMonthYearStart != null">
+        <if test="declarationMonthYearStart != null and declarationMonthYearStart != ''">
             AND d.declaration_month_year <![CDATA[ >= ]]> #{declarationMonthYearStart}
         </if>
-        <if test="declarationMonthYearEnd != null">
+        <if test="declarationMonthYearEnd != null and declarationMonthYearEnd != ''">
             AND d.declaration_month_year <![CDATA[ <= ]]> #{declarationMonthYearEnd}
         </if>
         <if test="declarationBatch != null and declarationBatch != ''">