From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:40:34 +0800
Subject: [PATCH] #获取正常还车
---
server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
index b5d1112..9e09b2c 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
@@ -38,16 +38,17 @@
PricingParam insert = new PricingParam();
insert.setCreateDate(new Date());
insert.setCreator(principal.getId());
- insert.setEditDate(new Date());
- insert.setEditor(principal.getId());
+// insert.setEditDate(new Date());
+// insert.setEditor(principal.getId());
insert.setIsdeleted(Constants.ZERO);
insert.setName(pricingParam.getName());
insert.setStartDate(pricingParam.getStartDate());
insert.setEndDate(pricingParam.getEndDate());
insert.setSortnum(pricingParam.getSortnum());
insert.setStatus(Constants.ZERO);
- pricingParamMapper.insert(pricingParam);
- return pricingParam.getId();
+ insert.setInfo(pricingParam.getInfo());
+ pricingParamMapper.insert(insert);
+ return insert.getId();
}
@Override
@@ -71,10 +72,14 @@
@Override
public void update(PricingParam pricingParam) {
+
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
UpdateWrapper<PricingParam> wrapper = new UpdateWrapper<>();
wrapper.lambda()
.eq(PricingParam::getId,pricingParam.getId())
+ .set(PricingParam::getEditor,principal.getId())
.set(PricingParam::getName,pricingParam.getName())
+ .set(PricingParam::getStatus,pricingParam.getStatus())
.set(PricingParam::getStartDate,pricingParam.getStartDate())
.set(PricingParam::getEndDate,pricingParam.getEndDate())
.set(PricingParam::getSortnum,pricingParam.getSortnum());
@@ -105,7 +110,7 @@
@Override
public PricingParam findOne(PricingParam pricingParam) {
QueryWrapper<PricingParam> wrapper = new QueryWrapper<>(pricingParam);
- return pricingParamMapper.selectOne(wrapper);
+ return pricingParamMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -140,7 +145,7 @@
queryWrapper.lambda().eq(PricingParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(PricingParam::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(PricingParam::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getStartDate() != null) {
queryWrapper.lambda().ge(PricingParam::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
@@ -159,13 +164,8 @@
if (pageWrap.getModel().getInfo() != null) {
queryWrapper.lambda().eq(PricingParam::getInfo, pageWrap.getModel().getInfo());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByAsc(PricingParam::getSortnum);
+ queryWrapper.lambda().orderByAsc(PricingParam::getStatus);
return PageData.from(pricingParamMapper.selectPage(page, queryWrapper));
}
--
Gitblit v1.9.3