From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 556b696..9ed224b 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,8 +116,8 @@
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(Bikes.class,Bikes::getCode,BikeRepair::getBinkeId)
+ .leftJoin(BaseParam.class,BaseParam::getId,BikeRepair::getTypeId);
queryWrapper.selectAll(BikeRepair.class)
.selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
.selectAs(Bikes::getCode,BikeRepairDTO::getBikeCode)
@@ -165,12 +165,15 @@
BeanUtils.copyProperties(repairRequest,bikeRepair);
bikeRepair.setCreateDate(new Date());
bikeRepair.setIsdeleted(Constants.ZERO);
+ bikeRepair.setStatus(Constants.ZERO);
+ bikeRepair.setId(Constants.getUUID());
bikeRepairMapper.insert(bikeRepair);
//澶勭悊闄勪欢淇℃伅
List<String> stringList = repairRequest.getFileUrlList();
if(!Objects.isNull(stringList)&&stringList.size()>Constants.ZERO){
for (int i = 0; i < stringList.size(); i++) {
Multifile multifile = new Multifile();
+ multifile.setId(Constants.getUUID());
multifile.setCreateDate(new Date());
multifile.setIsdeleted(Constants.ZERO);
multifile.setSortnum(i+Constants.ONE);
--
Gitblit v1.9.3