From 03805f3cfd53cbb2f94e4b67bba4728ca22dfc80 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 03 十一月 2023 15:36:21 +0800
Subject: [PATCH] # log日志
---
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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..8d88509 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,17 +116,20 @@
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())
- .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());
+ .like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),BikeRepair::getBinkeId,pageWrap.getModel().getBikeCode())
+ .eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus());
+ if (Objects.nonNull(pageWrap.getModel().getStartDate())) {
+ queryWrapper.ge(BikeRepair::getCreateDate,pageWrap.getModel().getStartDate());
+ }
+ if (Objects.nonNull(pageWrap.getModel().getEndDate())) {
+ queryWrapper.le(BikeRepair::getCreateDate, pageWrap.getModel().getEndDate());
+ }
return PageData.from(bikeRepairJoinMapper.selectJoinPage(page, BikeRepairDTO.class,queryWrapper));
}
@@ -141,7 +142,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())){
@@ -167,12 +168,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