From 2f3d3fb97bd4ebdc00c40a2774465c8b3487b6d1 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 02 四月 2025 17:14:27 +0800 Subject: [PATCH] bug修改 --- medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwTransitCarServiceImpl.java | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwTransitCarServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwTransitCarServiceImpl.java index 2abb700..357f8f2 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwTransitCarServiceImpl.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwTransitCarServiceImpl.java @@ -5,16 +5,20 @@ import com.sinata.common.entity.PageDTO; import com.sinata.common.exception.ServiceException; import com.sinata.common.utils.BeanUtils; +import com.sinata.common.utils.StringUtils; import com.sinata.system.domain.MwTransitCar; +import com.sinata.system.domain.SysDepartment; import com.sinata.system.domain.dto.MwTransitCarDTO; import com.sinata.system.domain.query.TransitCarQuery; import com.sinata.system.domain.vo.MwTransitCarVO; +import com.sinata.system.enums.DepartmentEnum; import com.sinata.system.mapper.MwTransitCarMapper; import com.sinata.system.service.MwTransitCarService; import com.sinata.system.service.SysDepartmentService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Objects; /** @@ -38,7 +42,21 @@ */ @Override public PageDTO<MwTransitCarVO> pageList(TransitCarQuery query) { - String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId()); + String treeCode; + if (Objects.isNull(query.getDepartmentId())) { + SysDepartment department = sysDepartmentService.getMyDepartment(); + treeCode = department.getTreeCode(); + } else { + SysDepartment department = sysDepartmentService.getById(query.getDepartmentId()); + //如果是处置单位,则获取父级部门 + if (department.getOrgType().equals(DepartmentEnum.DISPOSAL_UNIT.getCode())) { + department = sysDepartmentService.getDepartmentByParentId(department.getParentId()); + } + treeCode = department.getTreeCode(); + } + if (StringUtils.isBlank(treeCode)) { + return PageDTO.empty(0L, 0L); + } Page<MwTransitCarVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode); return PageDTO.of(page); } @@ -81,7 +99,23 @@ if (Objects.isNull(dto.getId())) { throw new ServiceException("车辆id不能为空"); } + Long count = lambdaQuery().eq(MwTransitCar::getLicensePlateNumber, + dto.getLicensePlateNumber()).ne(MwTransitCar::getId, dto.getId()).count(); + if (count > 0) { + throw new ServiceException("车牌号已存在"); + } MwTransitCar mwTransitCar = BeanUtils.copyBean(dto, MwTransitCar.class); updateById(mwTransitCar); } + + /** + * 关联车辆列表 + * + * @param id + * @return + */ + @Override + public List<MwTransitCarVO> getCarListByRouteId(Long id) { + return baseMapper.getCarListByRouteId(id); + } } -- Gitblit v1.7.1