github/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2026-04-19 13:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat：【erp】优化对 pgsql 的兼容性，对应 https://t.zsxq.com/rM8Y1

Browse Source
This commit is contained in:
YunaiV
2026-01-18 14:57:04 +08:00
parent fdfca8588f
commit 5bb29a3fa0
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentItemMapper.java
View File

@@ -31,14 +31,14 @@ public interface ErpFinancePaymentItemMapper extends BaseMapperX<ErpFinancePayme
default BigDecimal selectPaymentPriceSumByBizIdAndBizType(Long bizId, Integer bizType) { default BigDecimal selectPaymentPriceSumByBizIdAndBizType(Long bizId, Integer bizType) {
// SQL sum 查询 // SQL sum 查询
List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpFinancePaymentItemDO>() List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpFinancePaymentItemDO>()
.select("SUM(payment_price) AS paymentPriceSum") .select("SUM(payment_price) AS payment_price_sum")
.eq("biz_id", bizId) .eq("biz_id", bizId)
.eq("biz_type", bizType)); .eq("biz_type", bizType));
// 获得数量 // 获得数量
if (CollUtil.isEmpty(result)) { if (CollUtil.isEmpty(result)) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "paymentPriceSum", 0D)); return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "payment_price_sum", 0D));
} }
} }

4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinanceReceiptItemMapper.java
View File

@@ -31,14 +31,14 @@ public interface ErpFinanceReceiptItemMapper extends BaseMapperX<ErpFinanceRecei
default BigDecimal selectReceiptPriceSumByBizIdAndBizType(Long bizId, Integer bizType) { default BigDecimal selectReceiptPriceSumByBizIdAndBizType(Long bizId, Integer bizType) {
// SQL sum 查询 // SQL sum 查询
List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpFinanceReceiptItemDO>() List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpFinanceReceiptItemDO>()
.select("SUM(receipt_price) AS receiptPriceSum") .select("SUM(receipt_price) AS receipt_price_sum")
.eq("biz_id", bizId) .eq("biz_id", bizId)
.eq("biz_type", bizType)); .eq("biz_type", bizType));
// 获得数量 // 获得数量
if (CollUtil.isEmpty(result)) { if (CollUtil.isEmpty(result)) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "receiptPriceSum", 0D)); return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "receipt_price_sum", 0D));
} }
} }

4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInItemMapper.java
View File

@@ -46,11 +46,11 @@ public interface ErpPurchaseInItemMapper extends BaseMapperX<ErpPurchaseInItemDO
} }
// SQL sum 查询 // SQL sum 查询
List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpPurchaseInItemDO>() List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpPurchaseInItemDO>()
.select("order_item_id, SUM(count) AS sumCount") .select("order_item_id, SUM(count) AS sum_count")
.groupBy("order_item_id") .groupBy("order_item_id")
.in("in_id", inIds)); .in("in_id", inIds));
// 获得数量 // 获得数量
return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sumCount")); return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sum_count"));
} }
} }

4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnItemMapper.java
View File

@@ -46,11 +46,11 @@ public interface ErpPurchaseReturnItemMapper extends BaseMapperX<ErpPurchaseRetu
} }
// SQL sum 查询 // SQL sum 查询
List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpPurchaseReturnItemDO>() List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpPurchaseReturnItemDO>()
.select("order_item_id, SUM(count) AS sumCount") .select("order_item_id, SUM(count) AS sum_count")
.groupBy("order_item_id") .groupBy("order_item_id")
.in("return_id", returnIds)); .in("return_id", returnIds));
// 获得数量 // 获得数量
return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sumCount")); return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sum_count"));
} }
} }

4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOutItemMapper.java
View File

@@ -46,11 +46,11 @@ public interface ErpSaleOutItemMapper extends BaseMapperX<ErpSaleOutItemDO> {
} }
// SQL sum 查询 // SQL sum 查询
List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpSaleOutItemDO>() List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpSaleOutItemDO>()
.select("order_item_id, SUM(count) AS sumCount") .select("order_item_id, SUM(count) AS sum_count")
.groupBy("order_item_id") .groupBy("order_item_id")
.in("out_id", outIds)); .in("out_id", outIds));
// 获得数量 // 获得数量
return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sumCount")); return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sum_count"));
} }
} }

4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleReturnItemMapper.java
View File

@@ -46,11 +46,11 @@ public interface ErpSaleReturnItemMapper extends BaseMapperX<ErpSaleReturnItemDO
} }
// SQL sum 查询 // SQL sum 查询
List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpSaleReturnItemDO>() List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpSaleReturnItemDO>()
.select("order_item_id, SUM(count) AS sumCount") .select("order_item_id, SUM(count) AS sum_count")
.groupBy("order_item_id") .groupBy("order_item_id")
.in("return_id", returnIds)); .in("return_id", returnIds));
// 获得数量 // 获得数量
return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sumCount")); return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sum_count"));
} }
} }

4
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMapper.java
View File

@@ -52,13 +52,13 @@ public interface ErpStockMapper extends BaseMapperX<ErpStockDO> {
default BigDecimal selectSumByProductId(Long productId) { default BigDecimal selectSumByProductId(Long productId) {
// SQL sum 查询 // SQL sum 查询
List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpStockDO>() List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpStockDO>()
.select("SUM(count) AS sumCount") .select("SUM(count) AS sum_count")
.eq("product_id", productId)); .eq("product_id", productId));
// 获得数量 // 获得数量
if (CollUtil.isEmpty(result)) { if (CollUtil.isEmpty(result)) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "sumCount", 0D)); return BigDecimal.valueOf(MapUtil.getDouble(result.get(0), "sum_count", 0D));
} }
} }