From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 29 十二月 2023 11:52:29 +0800 Subject: [PATCH] 服务商 --- server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 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 5237d39..6adcb52 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 @@ -1,5 +1,8 @@ package com.doumee.service.business.impl; import com.doumee.biz.system.SystemDictDataBiz; +import com.doumee.core.constants.ResponseStatus; +import com.doumee.core.exception.BusinessException; +import com.doumee.core.model.LoginUserInfo; import com.google.common.collect.Lists; import com.doumee.biz.system.SystemDictDataBiz; @@ -23,6 +26,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -82,6 +86,23 @@ public void updateById(BikeRepair bikeRepair) { bikeRepairMapper.updateById(bikeRepair); } + @Override + public void dealDo(BikeRepair param){ + + BikeRepair bikeRepair = findById(param.getId()); + if(bikeRepair == null ){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + if(Constants.formatIntegerNum(bikeRepair.getStatus()) != Constants.ZERO ){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ヤ笂鎶ュ凡澶勭悊锛屾棤闇�閲嶅澶勭悊锛�"); + } + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + bikeRepair.setDealInfo(param.getDealInfo()); + bikeRepair.setDealUser(user.getId()); + bikeRepair.setStatus(Constants.ONE); + bikeRepair.setDealDate(new Date()); + bikeRepairMapper.updateById(bikeRepair); + } @Override public void updateByIdInBatch(List<BikeRepair> bikeRepairs) { @@ -125,11 +146,12 @@ .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,Utils.Date.getEnd(pageWrap.getModel().getStartDate())); + queryWrapper.ge(BikeRepair::getCreateDate,Utils.Date.getStart(pageWrap.getModel().getStartDate())); } if (Objects.nonNull(pageWrap.getModel().getEndDate())) { queryWrapper.le(BikeRepair::getCreateDate,Utils.Date.getEnd(pageWrap.getModel().getEndDate())); } + queryWrapper.orderByDesc(BikeRepair::getCreateDate); return PageData.from(bikeRepairJoinMapper.selectJoinPage(page, BikeRepairDTO.class,queryWrapper)); } -- Gitblit v1.9.3