From 62ad99ee2a374c1726730146335ed82cbcfacebb Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 28 五月 2025 00:04:18 +0800
Subject: [PATCH] 工具管理-新增方式出库接口及部分查询调整
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java | 15 +++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundAddDto.java | 31 +++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundRequestDto.java | 3
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml | 3
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java | 5 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java | 4
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundDetailServiceImpl.java | 8 ++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java | 8 ++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java | 122 +++++++++++++++++++++++++++++-
9 files changed, 186 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
index cb806cf..cc98da0 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
@@ -12,6 +12,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.TranslateDictTextUtils;
+import org.jeecg.modules.tms.entity.dto.OutBoundAddDto;
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutBoundRequestDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
@@ -180,9 +181,17 @@
@AutoLog(value = "鐢宠鍗曟柟寮忓嚭搴�")
@ApiOperation(value = "鐢宠鍗曟柟寮忓嚭搴�", notes = "鐢宠鍗曟柟寮忓嚭搴�")
- @PostMapping(value = "/outBound")
- public Result<?> outBound(@RequestBody List<OutBoundRequestDto> outBoundRequestList) {
- outboundOrderService.outBound(outBoundRequestList);
+ @PostMapping(value = "/outBoundByApply")
+ public Result<?> outBoundByApply(@RequestBody List<OutBoundRequestDto> outBoundRequestList) {
+ outboundOrderService.outBoundByApply(outBoundRequestList);
+ return Result.OK("鍑哄簱鎴愬姛");
+ }
+
+ @AutoLog(value = "鏂板鏂瑰紡鍑哄簱")
+ @ApiOperation(value = "鏂板鏂瑰紡鍑哄簱", notes = "鏂板鏂瑰紡鍑哄簱")
+ @PostMapping(value = "/outBoundByAdd")
+ public Result<?> outBoundByAdd(@RequestBody List<OutBoundAddDto> boundAddList) {
+ outboundOrderService.outBoundByAdd(boundAddList);
return Result.OK("鍑哄簱鎴愬姛");
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundAddDto.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundAddDto.java
new file mode 100644
index 0000000..d02c1c2
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundAddDto.java
@@ -0,0 +1,31 @@
+package org.jeecg.modules.tms.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 鏂板鏂瑰紡鍑哄簱鍙傛暟灏佽
+ */
+@Data
+public class OutBoundAddDto {
+ //鍙拌处鏄庣粏id
+ @ApiModelProperty(value = "鍙拌处鏄庣粏id")
+ private String toolLedgerDetailId;
+ //宸ュ叿缂栫爜(tms_base_tool琛ㄤ富閿甶d)
+ @ApiModelProperty(value = "宸ュ叿缂栫爜(tms_base_tool琛ㄤ富閿甶d)")
+ private String toolCode;
+ //宸ュ叿缂栧彿(鍞竴缂栧彿锛岀鍒版妸鐨勫睘鎬�)
+ @ApiModelProperty(value = "宸ュ叿缂栧彿(鍞竴缂栧彿锛岀鍒版妸鐨勫睘鎬�)")
+ private String toolId;
+ //鍑哄簱鏂瑰紡
+ @ApiModelProperty(value = "鍑哄簱鏂瑰紡")
+ private String outStorehouseType;
+ //鍑哄簱鏁伴噺
+ @ApiModelProperty(value = "鍑哄簱鏁伴噺")
+ private BigDecimal outboundQuantity;
+ //搴撲綅鍙�
+ @ApiModelProperty(value = "搴撲綅鍙�")
+ private String outboundLocation;
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundRequestDto.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundRequestDto.java
index 9d5f862..5ce1ec5 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundRequestDto.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/OutBoundRequestDto.java
@@ -5,6 +5,9 @@
import java.math.BigDecimal;
+/**
+ * 鐢宠鍗曟柟寮忓嚭搴撳弬鏁板皝瑁�
+ */
@Data
public class OutBoundRequestDto {
//鍑哄簱鐢宠鍗昳d
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml
index 4956f45..59e9ae8 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml
@@ -49,8 +49,7 @@
</choose>
FROM tms_out_store_detail t1
LEFT JOIN tms_base_tools t2 on t1.tool_code = t2.id
- LEFT JOIN tms_tools_config_property t3 on t3.tool_code = t2.id
- LEFT JOIN tms_tools_classify t11 on t11.id = t2.classify_id
+ LEFT JOIN tms_tools_config_property t3 on t3.tool_code = t1.tool_code
<choose>
<when test="ew.paramNameValuePairs.paramaTableName == '1'">
LEFT JOIN tms_para_common_tool t4 on t4.tool_code = t2.id
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java
index f055c95..ba2b05b 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IOutboundOrderService.java
@@ -5,6 +5,7 @@
import org.jeecg.modules.tms.entity.OutboundDetail;
import org.jeecg.modules.tms.entity.OutboundOrder;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.tms.entity.dto.OutBoundAddDto;
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutBoundRequestDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
@@ -47,5 +48,7 @@
void approvalProcess(OutBoundOrderFlowDto outBoundOrderFlowDto);
- void outBound(List<OutBoundRequestDto> outBoundRequestList);
+ void outBoundByApply(List<OutBoundRequestDto> outBoundRequestList);
+
+ void outBoundByAdd(List<OutBoundAddDto> boundAddList);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
index 8087404..7f0709d 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
@@ -28,9 +28,9 @@
QueryWrapper<OutStoreDetailVo> queryWrapper = Wrappers.query();
String[] classifyIds = parameterMap.get("classifyId");
if (classifyIds != null && classifyIds.length > 0) {
- queryWrapper.eq("t11.classify_id", classifyIds[0]);
+ queryWrapper.eq("t2.classify_id", classifyIds[0]);
}
- queryWrapper.orderByDesc("create_time");
+ queryWrapper.orderByDesc("t1.create_time");
return this.baseMapper.queryPageList(page, queryWrapper);
}
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundDetailServiceImpl.java
index 18abddc..b9262fd 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundDetailServiceImpl.java
@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.OutboundDetail;
import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
import org.jeecg.modules.tms.mapper.OutboundDetailMapper;
import org.jeecg.modules.tms.service.IOutboundDetailService;
import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -39,6 +42,11 @@
if (outStorehouseIds != null && outStorehouseIds.length > 0) {
queryWrapper.eq("t1.out_storehouse_id", outStorehouseIds[0]);
}
+ String[] statuses = parameterMap.get("status");
+ if (statuses != null && statuses.length > 0) {
+ String[] statusArr = statuses[0].split(",");
+ queryWrapper.in("t1.status", statusArr);
+ }
return this.baseMapper.queryPageList(page, queryWrapper);
}
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
index f5cdf56..603c545 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +28,7 @@
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecg.modules.tms.entity.*;
+import org.jeecg.modules.tms.entity.dto.OutBoundAddDto;
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutBoundRequestDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
@@ -64,6 +66,8 @@
private IToolLedgerDetailService toolLedgerDetailService;
@Autowired
private IOutStoreDetailService outStoreDetailService;
+ @Autowired
+ private IBaseToolsService baseToolsService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
@Autowired
@@ -125,9 +129,13 @@
if (outStorehouseTypes != null && outStorehouseTypes.length > 0) {
queryWrapper.eq("t.out_storehouse_type", outStorehouseTypes[0]);
}
- String[] statuses = parameterMap.get("orderStatus");
- if (statuses != null && statuses.length > 0) {
- queryWrapper.eq("t.order_status", statuses[0]);
+ String[] orderStatuses = parameterMap.get("orderStatus");
+ if (orderStatuses != null && orderStatuses.length > 0) {
+ queryWrapper.eq("t.order_status", orderStatuses[0]);
+ }
+ String[] outStatuses = parameterMap.get("outStatus");
+ if (outStatuses != null && outStatuses.length > 0) {
+ queryWrapper.eq("t.out_status", outStatuses[0]);
}
String[] startTimes = parameterMap.get("startTime");
if (startTimes != null && startTimes.length > 0) {
@@ -219,6 +227,11 @@
if (OutBillStatus.APPROVED.getValue().equals(outBoundOrderFlowDto.getStatus())) {
outboundOrder.setOutStatus(OutBoundStatusEnum.NOT_OUTBOUND.getValue());
outboundOrder.setOrderStatus(OutBillStatus.APPROVED.getValue());
+ //鍒濆鍖栫敵璇锋槑缁嗕俊鎭殑鍑哄簱鐘舵��/瀹為檯鍑哄簱鏁伴噺瀛楁
+ outboundDetailService.update(new LambdaUpdateWrapper<OutboundDetail>()
+ .eq(OutboundDetail::getOutStorehouseId, outboundOrder.getId())
+ .set(OutboundDetail::getStatus, OutBoundStatusEnum.NOT_OUTBOUND.getValue())
+ .set(OutboundDetail::getOutActualCount, BigDecimal.ZERO));
}
if (OutBillStatus.REJECTED.getValue().equals(outBoundOrderFlowDto.getStatus())) {
//濡傛灉椹冲洖锛屽鎵瑰崟鐘舵�佸洖鍒拌崏绋�
@@ -232,7 +245,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void outBound(List<OutBoundRequestDto> outBoundRequestList) {
+ public void outBoundByApply(List<OutBoundRequestDto> outBoundRequestList) {
//鏍￠獙鏄惁鏉ヨ嚜涓�涓敵璇峰崟
if (!fromOneApply(outBoundRequestList)) {
throw new JeecgBootException("鍑哄簱鏄庣粏蹇呴』鏉ヨ嚜鍚屼竴鍑哄簱鐢宠鍗曪紒");
@@ -259,7 +272,7 @@
queryWrapper.or();
}
OutboundDetail detail = outboundDetailList.get(i);
- queryWrapper.and(wrapper ->
+ queryWrapper.or(wrapper ->
wrapper.eq(ToolLedgerDetail::getToolCode, detail.getToolCode())
.eq(ToolLedgerDetail::getToolId, detail.getToolId()) //濡傛灉涓嶇鍒版妸锛岃瀛楁涓虹┖
);
@@ -362,6 +375,105 @@
updateById(outboundOrder);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void outBoundByAdd(List<OutBoundAddDto> boundAddList) {
+ //鏍￠獙鍙拌处涓昏〃搴撳瓨鏁伴噺
+ Map<String, BigDecimal> toolBoundQuantityMap = boundAddList.stream()
+ .collect(Collectors.groupingBy(OutBoundAddDto::getToolCode,
+ Collectors.mapping(OutBoundAddDto::getOutboundQuantity, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add))));
+ Map<String, ToolLedger> toolLedgerMap = toolLedgerService.list(new LambdaQueryWrapper<ToolLedger>().in(ToolLedger::getToolId, toolBoundQuantityMap.keySet()))
+ .stream().collect(Collectors.toMap(ToolLedger::getToolId, item -> item, (k1, k2) -> k1));
+ List<ToolLedger> toolLedgerUpdateList = CollectionUtil.newArrayList();
+ for (String toolCode : toolBoundQuantityMap.keySet()) {
+ ToolLedger toolLedger = toolLedgerMap.get(toolCode);
+ BigDecimal outBoundQuantity = toolBoundQuantityMap.get(toolCode);
+ if (Objects.isNull(toolLedger) || toolLedger.getAvailableCount().compareTo(outBoundQuantity) < 0) {
+ BaseTools tools = baseToolsService.getById(toolCode);
+ throw new JeecgBootException("缂栫爜涓恒��" + tools.getToolCode() + "銆戠殑宸ュ叿锛屽簱瀛樹笉瓒筹紒");
+ } else {
+ OutStorehouseType outStorehouseType = OutStorehouseType.getByValue(boundAddList.get(0).getOutStorehouseType());
+ switch (outStorehouseType) {
+ case TOOL_BORROW:
+ toolLedger.setLendCount(toolLedger.getLendCount().add(outBoundQuantity));
+ break;
+ case MAINTENANCE_OUTBOUND:
+ toolLedger.setRepairCount(toolLedger.getRepairCount().add(outBoundQuantity));
+ break;
+ case CALIBRATION_OUTBOUND:
+ toolLedger.setDetectionCount(toolLedger.getDetectionCount().add(outBoundQuantity));
+ break;
+ case GRINDING_OUTBOUND:
+ toolLedger.setSharpeningCount(toolLedger.getSharpeningCount().add(outBoundQuantity));
+ break;
+ default:
+ throw new JeecgBootException("鏈煡鐨勫嚭搴撶被鍨嬶紒");
+ }
+ //鎵ｅ噺鍙拌处涓昏〃鍙敤搴撳瓨
+ toolLedger.setAvailableCount(toolLedger.getAvailableCount().subtract(outBoundQuantity));
+ toolLedgerUpdateList.add(toolLedger);
+ }
+ }
+ //鏍￠獙鍙拌处鏄庣粏搴撳瓨鏁伴噺
+ Map<String, OutBoundAddDto> boundAddDtoMap = boundAddList.stream().collect(Collectors
+ .toMap(OutBoundAddDto::getToolLedgerDetailId, item -> item, (k1, k2) -> k1));
+ Map<String, ToolLedgerDetail> toolLedgerDetailMap = toolLedgerDetailService.listByIds(boundAddDtoMap.keySet()).stream()
+ .collect(Collectors.toMap(ToolLedgerDetail::getId, item -> item, (k1, k2) -> k1));
+ List<ToolLedgerDetail> toolLedgerDetailUpdateList = CollectionUtil.newArrayList();
+ for (String toolLedgerDetailId : boundAddDtoMap.keySet()) {
+ OutBoundAddDto outBoundAddDto = boundAddDtoMap.get(toolLedgerDetailId);
+ BigDecimal outboundQuantity = outBoundAddDto.getOutboundQuantity();
+ ToolLedgerDetail toolLedgerDetail = toolLedgerDetailMap.get(toolLedgerDetailId);
+ if (Objects.isNull(toolLedgerDetail) || toolLedgerDetail.getQuantity().compareTo(outboundQuantity) < 0) {
+ BaseTools tools = baseToolsService.getById(outBoundAddDto.getToolCode());
+ throw new JeecgBootException("缂栫爜涓恒��" + tools.getToolCode() + "銆戠殑宸ュ叿锛屽簱瀛樹笉瓒筹紒");
+ } else {
+ //鎵ｅ噺鍙拌处鏄庣粏搴撳瓨
+ if (StrUtil.isBlank(toolLedgerDetail.getToolId())) {
+ //娌℃湁鍞竴缂栫爜锛屼笉绠″埌鎶婄殑
+ toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().subtract(outboundQuantity));
+ } else {
+ //鏈夊敮涓�缂栫爜锛岀閬撴妸鐨�
+ toolLedgerDetail.setQuantity(BigDecimal.ZERO);//鏁伴噺鍙細鏄�0鍜�1
+ OutStorehouseType outStorehouseType = OutStorehouseType.getByValue(boundAddList.get(0).getOutStorehouseType());
+ switch (outStorehouseType) {
+ case TOOL_BORROW:
+ toolLedgerDetail.setStatus(ToolCirculationStatus.BORROWED.getValue());
+ break;
+ case MAINTENANCE_OUTBOUND:
+ toolLedgerDetail.setStatus(ToolCirculationStatus.REPAIRING.getValue());
+ break;
+ case CALIBRATION_OUTBOUND:
+ toolLedgerDetail.setStatus(ToolCirculationStatus.INSPECTING.getValue());
+ break;
+ case GRINDING_OUTBOUND:
+ toolLedgerDetail.setStatus(ToolCirculationStatus.GRINDING.getValue());
+ break;
+ default:
+ throw new JeecgBootException("鏈煡鐨勫嚭搴撶被鍨嬶紒");
+ }
+ }
+ toolLedgerDetailUpdateList.add(toolLedgerDetail);
+ }
+ }
+ toolLedgerService.updateBatchById(toolLedgerUpdateList);
+ toolLedgerDetailService.updateBatchById(toolLedgerDetailUpdateList);
+ //璁板綍鍑哄簱娴佹按
+ List<OutStoreDetail> outStoreAddList = CollectionUtil.newArrayList();
+ for (OutBoundAddDto outBoundAddDto : boundAddList) {
+ OutStoreDetail outStoreDetail = new OutStoreDetail()
+ .setToolCode(outBoundAddDto.getToolCode())
+ .setToolId(outBoundAddDto.getToolId())
+ .setOutStorehouseType(outBoundAddDto.getOutStorehouseType())
+ .setGoodsShelvesCode(outBoundAddDto.getOutboundLocation())
+ .setOutNumber(outBoundAddDto.getOutboundQuantity())
+ .setOperateType("2");//2锛氭墜宸ユ搷浣�
+ outStoreAddList.add(outStoreDetail);
+ }
+ outStoreDetailService.saveBatch(outStoreAddList);
+ }
+
+
private boolean fromOneApply(List<OutBoundRequestDto> outBoundRequestList) {
long count = outBoundRequestList.stream().map(OutBoundRequestDto::getOutBoundOrderId).distinct().count();
if (count > 1) {
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java
index 284b226..ef5a081 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java
@@ -31,6 +31,14 @@
if (statuses != null && statuses.length > 0) {
queryWrapper.eq("t.status", statuses[0]);
}
+ String[] quantities = parameterMap.get("quantity");
+ if (quantities != null && quantities.length > 0) {
+ queryWrapper.gt("t.quantity", quantities[0]);
+ }
+ String[] classifyIds = parameterMap.get("classifyId");
+ if (classifyIds != null && classifyIds.length > 0) {
+ queryWrapper.eq("p.classify_id", classifyIds[0]);
+ }
String[] excludeIds = parameterMap.get("excludeIds");
if (excludeIds != null && excludeIds.length > 0) {
String[] idArray = excludeIds[0].split(",");
--
Gitblit v1.9.3