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/BikeRepairServiceImpl.java |   11 ++++++-----
 1 files changed, 6 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 7cb9291..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
@@ -52,8 +52,6 @@
     @Autowired
     private MultifileMapper multifileMapper;
 
-    @Autowired
-    private SystemDictDataBiz systemDictDataBiz;
 
     @Override
     public String create(BikeRepair bikeRepair) {
@@ -103,7 +101,7 @@
     @Override
     public BikeRepair findOne(BikeRepair bikeRepair) {
         QueryWrapper<BikeRepair> wrapper = new QueryWrapper<>(bikeRepair);
-        return bikeRepairMapper.selectOne(wrapper);
+        return bikeRepairMapper.selectOne(wrapper.last(" limit 1"));
     }
 
     @Override
@@ -118,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)
@@ -167,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