From ad92f42691c3f5b1804bbc56040b93877e336995 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 30 十月 2023 14:25:33 +0800
Subject: [PATCH] # log日志
---
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index b4dc2e1..97d6f6a 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -116,14 +116,13 @@
MPJLambdaWrapper<BikeRepair> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.leftJoin(Member.class,Member::getId,BikeRepair::getMemberId)
- .leftJoin(Bikes.class,Bikes::getId,BikeRepair::getBinkeId)
- .leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId);
+ .leftJoin(BaseParam.class,BaseParam::getId,BikeRepair::getTypeId);
queryWrapper.selectAll(BikeRepair.class)
.selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
- .selectAs(Bikes::getCode,BikeRepairDTO::getBikeCode)
+ .selectAs(BikeRepair::getBinkeId,BikeRepairDTO::getBikeCode)
.selectAs(BaseParam::getName,BikeRepairDTO::getBikeTypeName);
queryWrapper.like(StringUtils.isNotEmpty(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
- .like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),Bikes::getCode,pageWrap.getModel().getBikeCode())
+ .like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),BikeRepair::getBinkeId,pageWrap.getModel().getBikeCode())
.eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus())
.ge(Objects.nonNull(pageWrap.getModel().getStartDate()),BikeRepair::getCreateDate,pageWrap.getModel().getStartDate())
.le(Objects.nonNull(pageWrap.getModel().getEndDate()),BikeRepair::getCreateDate,pageWrap.getModel().getEndDate());
@@ -139,7 +138,7 @@
.eq(Multifile::getIsdeleted,Constants.ZERO);
List<Multifile> multifiles = multifileMapper.selectList(wrapper);
//TODO 闇�瑕佷慨鏀�
- String path =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.PROJECT_FILE).getCode();
+ String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode()+ systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.REPAIR).getCode();
if (!CollectionUtils.isEmpty(multifiles)){
multifiles.forEach(s->{
if(StringUtils.isNotBlank(s.getFileurl())){
@@ -165,6 +164,7 @@
BeanUtils.copyProperties(repairRequest,bikeRepair);
bikeRepair.setCreateDate(new Date());
bikeRepair.setIsdeleted(Constants.ZERO);
+ bikeRepair.setStatus(Constants.ZERO);
bikeRepair.setId(Constants.getUUID());
bikeRepairMapper.insert(bikeRepair);
//澶勭悊闄勪欢淇℃伅
--
Gitblit v1.9.3