mapper优化

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/mapper/PurchaseContractMapper.java

@@ -23,7 +23,6 @@ import com.fjhx.purchase.entity.PurchaseContract;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -140,12 +139,12 @@ public interface PurchaseContractMapper extends BaseMapper<PurchaseContract> {
      */
     @TenantIgnore
     Integer getCount(
-            @RequestParam("prefixCode") int prefixCode,
-            @RequestParam("countryId") String countryId,
-            @RequestParam("customerId") String customerId,
-            @RequestParam("productId") String productId,
-            @RequestParam("tenantId") String tenantId,
-            @RequestParam("userId") String userId
+            @Param("prefixCode") int prefixCode,
+            @Param("countryId") String countryId,
+            @Param("customerId") String customerId,
+            @Param("productId") String productId,
+            @Param("tenantId") String tenantId,
+            @Param("userId") String userId
     );
 
     /**

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/mapper/PurchaseContractProductMapper.java

@@ -69,7 +69,7 @@ public interface PurchaseContractProductMapper extends BaseMapper<PurchaseContra
      * @return
      */
     @TenantIgnore
-    List<JSONObject> getPurchaseCountByContractProductIds(String tenantId, List<String> contractProductIds);
+    List<JSONObject> getPurchaseCountByContractProductIds(@Param("tenantId") String tenantId, @Param("contractProductIds") List<String> contractProductIds);
 
     /**
      * 获取合同产品已采购数量

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/reportPrice/mapper/ReportPriceBillMapper.java

@@ -5,7 +5,6 @@ import com.fjhx.reportPrice.entity.ReportPriceBill;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -60,8 +59,8 @@ public interface ReportPriceBillMapper extends BaseMapper<ReportPriceBill> {
      * @return
      */
     @TenantIgnore
-    Integer getDailySumReportListCount(@RequestParam("tenantId") String tenantId,
-                                       @RequestParam("createUser") String createUser);
+    Integer getDailySumReportListCount(@Param("tenantId") String tenantId,
+                                       @Param("createUser") String createUser);
 
     /**
      * 查询列表
@@ -71,8 +70,8 @@ public interface ReportPriceBillMapper extends BaseMapper<ReportPriceBill> {
      * @return
      */
     @TenantIgnore
-    List<ReportPriceBill> getDailySumReportList(@RequestParam("tenantId") String tenantId,
-                                                @RequestParam("createUser") String createUser);
+    List<ReportPriceBill> getDailySumReportList(@Param("tenantId") String tenantId,
+                                                @Param("createUser") String createUser);
 
     /**
      * 查询列表
@@ -91,7 +90,7 @@ public interface ReportPriceBillMapper extends BaseMapper<ReportPriceBill> {
      * @return
      */
     @TenantIgnore
-    List<ReportPriceBill> getByUserIds(@RequestParam("userIds") List<String> userIds, @RequestParam("year") String year);
+    List<ReportPriceBill> getByUserIds(@Param("userIds") List<String> userIds, @Param("year") String year);
 
     /**
      * 根据子编号前缀代码统计
@@ -106,12 +105,12 @@ public interface ReportPriceBillMapper extends BaseMapper<ReportPriceBill> {
      */
     @TenantIgnore
     Integer getCount(
-            @RequestParam("prefixCode") int prefixCode,
-            @RequestParam("countryId") String countryId,
-            @RequestParam("customerId") String customerId,
-            @RequestParam("productId") String productId,
-            @RequestParam("tenantId") String tenantId,
-            @RequestParam("userId") String userId
+            @Param("prefixCode") int prefixCode,
+            @Param("countryId") String countryId,
+            @Param("customerId") String customerId,
+            @Param("productId") String productId,
+            @Param("tenantId") String tenantId,
+            @Param("userId") String userId
     );
 
     /**

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/sample/mapper/SampleBillMapper.java

@@ -2,9 +2,9 @@ package com.fjhx.sample.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.sample.entity.SampleBill;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -39,5 +39,5 @@ public interface SampleBillMapper extends BaseMapper<SampleBill> {
      * @return
      */
     @TenantIgnore
-    List<SampleBill> getByUserIds(@RequestParam("userIds") List<String> userIds, @RequestParam("year") String year);
+    List<SampleBill> getByUserIds(@Param("userIds") List<String> userIds, @Param("year") String year);
 }

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/supply/mapper/SupplyMapper.java

@@ -5,7 +5,6 @@ import com.fjhx.supply.entity.Supply;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -64,7 +63,7 @@ public interface SupplyMapper extends BaseMapper<Supply> {
      * @param tenantId
      * @return
      */
-    List<String> selectAllNameByTenantId(@RequestParam("tenantId") String tenantId);
+    List<String> selectAllNameByTenantId(@Param("tenantId") String tenantId);
 
     /**
      * 通过账号查询

bladex-saas-project/saas-wms/src/main/java/com/fjhx/wms/inventory/mapper/InventoryDetailMapper.java

@@ -22,7 +22,6 @@ import com.fjhx.wms.inventory.entity.InventoryDetail;
 import com.fjhx.wms.inventory.vo.InventoryDetailVO;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tenant.annotation.TenantIgnore;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -88,7 +87,7 @@ public interface InventoryDetailMapper extends BaseMapper<InventoryDetail> {
      * @return
      */
     @TenantIgnore
-    List<InventoryDetail> getListByMonth(@Param("dueId")String dueId, @RequestParam("tenantId")String tenantId);
+    List<InventoryDetail> getListByMonth(@Param("dueId") String dueId, @Param("tenantId") String tenantId);
 
     /**
      * 查询本月出库的总数量