From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期三, 25 十月 2023 09:58:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 20 +++++++++++++++----- 1 files changed, 15 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 57d5745..0c6eb9d 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 @@ -2,7 +2,9 @@ import com.doumee.biz.system.SystemDictDataBiz; import com.google.common.collect.Lists; +import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.Constants; +import com.doumee.core.dingding.DingDingNotice; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Utils; @@ -49,6 +51,7 @@ @Autowired private MultifileMapper multifileMapper; + @Override public String create(BikeRepair bikeRepair) { @@ -98,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 @@ -113,11 +116,10 @@ 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()) @@ -157,17 +159,20 @@ @Override - public void saveRepair(RepairRequest repairRequest){ + public void saveRepair(RepairRequest repairRequest) throws Exception{ BikeRepair bikeRepair = new BikeRepair(); 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); @@ -178,6 +183,11 @@ multifileMapper.insert(multifile); } } + //鍙戦�侀拤閽夐�氱煡 + DingDingNotice.bikeRepair(repairRequest, + systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(), + systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode()); + } -- Gitblit v1.9.3