From 488b9158fc873d228c2c0106050ece8272a49653 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 25 十二月 2024 10:36:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwTransitCarServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 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..8ecf276 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);
}
@@ -84,4 +102,15 @@
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