From 2916c4c250268482d8dd31aa9cc00b950f6b7cc9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 25 八月 2023 17:32:37 +0800
Subject: [PATCH] # 企业端用户
---
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 72 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 15 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
index dc253be..b2148a5 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -1,6 +1,7 @@
package doumeemes.service.business.impl;
import com.baomidou.mybatisplus.extension.api.R;
+import doumeemes.biz.system.SystemDictBiz;
import doumeemes.core.constants.ResponseStatus;
import doumeemes.core.exception.BusinessException;
import doumeemes.core.model.ApiResponse;
@@ -17,6 +18,8 @@
import doumeemes.dao.ext.dto.DeviceImportDTO;
import doumeemes.dao.ext.dto.QueryDeviceExtDTO;
import doumeemes.dao.ext.vo.DeviceExtListVO;
+import doumeemes.dao.system.SystemDictDataMapper;
+import doumeemes.dao.system.model.SystemDictData;
import doumeemes.service.business.DeviceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -62,6 +65,13 @@
@Autowired
private WarehouseLocationMapper warehouseLocationMapper;
+
+ @Autowired
+ private WarehouseMapper warehouseMapper;
+
+
+ @Autowired
+ private SystemDictDataMapper systemDictDataMapper;
@Override
public Integer create(Device device) {
@@ -329,17 +339,41 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璁惧缂栫爜涓嶅瓨鍦�");
}
+
+
QueryWrapper<WarehouseLocation> warehouseLocationQuery = new QueryWrapper<>();
warehouseLocationQuery.lambda()
.eq(WarehouseLocation::getRootDepartId,department.getRootId())
- .in(WarehouseLocation::getUnionName
- ,Arrays.asList(s.getFinishWarehouseLocationName(),s.getProduceWarehouseLocationName()));
- if(Objects.equals(list.size(),2)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"搴撲綅淇℃伅宸插瓨鍦�");
- }
- List<WarehouseLocation> warehouseLocations = warehouseLocationMapper.selectList(warehouseLocationQuery);
+ .eq(WarehouseLocation::getUnionName
+ ,s.getProduceWarehouseLocationName()).last("limit 1");
- Map<String, WarehouseLocation> collect = warehouseLocations.stream().collect(Collectors.toMap(w -> w.getUnionName(), w -> w));
+ WarehouseLocation warehouseLocation = warehouseLocationMapper.selectOne(warehouseLocationQuery);
+
+ if (Objects.isNull(warehouseLocation)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"寰呯敓浜ц揣浣嶄笉瀛樺湪");
+ }
+
+ QueryWrapper<SystemDictData> systemDictDataQuery = new QueryWrapper<>();
+ systemDictDataQuery.lambda()
+ .eq(SystemDictData::getDictId,3)
+ .eq(SystemDictData::getCode,"娣峰悎");
+ SystemDictData systemDictData = systemDictDataMapper.selectOne(systemDictDataQuery);
+
+ warehouseLocationQuery.clear();
+ warehouseLocationQuery.lambda()
+ .eq(WarehouseLocation::getRootDepartId,department.getRootId())
+ .eq(WarehouseLocation::getSystemDicDataId,systemDictData.getId())
+ .eq(WarehouseLocation::getUnionName,s.getFinishWarehouseLocationName()).last("limit 1");
+
+ WarehouseLocation finishWarehouseLocations = warehouseLocationMapper.selectOne(warehouseLocationQuery);
+
+ if (Objects.isNull(finishWarehouseLocations)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸插畬宸ヨ揣浣嶄笉瀛樺湪");
+ }
+
+ Map<String, WarehouseLocation> collect =new HashMap<>();
+ collect.put(warehouseLocation.getUnionName(),warehouseLocation);
+ collect.put(finishWarehouseLocations.getUnionName(),finishWarehouseLocations);
Device device = new Device();
device.setDeleted(Constants.ZERO);
@@ -348,8 +382,8 @@
device.setUpdateUser(user.getId());
device.setUpdateTime(new Date());
// device.setRemark();
- device.setRootDepartId(department.getRootId());
- device.setDepartId(procedures.getId());
+ device.setRootDepartId(user.getRootDepartment().getId());
+ device.setDepartId(user.getCurComDepartment().getId());
device.setProcedureId(procedures.getId());
device.setCode(StringUtils.isNotBlank(device.getCode()) ? device.getCode() : this.getNextCode(user.getCompany().getId()));
@@ -357,15 +391,23 @@
device.setName(s.getDeviceName());
device.setModel(s.getModel());
device.setStatus(Constants.ZERO);
-// device.setSupplier();
device.setStationCode(s.getStationCode());
-// device.setGroupId();
-// device.setSerialNum();
- device.setProduceWarehouseLocationId(Optional.ofNullable(collect.get(s.getProduceWarehouseLocationName())).map(m->m.getId()).orElse(null));
- device.setFinishWarehouseLocationId(Optional.ofNullable(collect.get(s.getFinishWarehouseLocationName())).map(m->m.getId()).orElse(null));
+ device.setProduceWarehouseLocationId(Optional.ofNullable(collect.get(s.getProduceWarehouseLocationName())).map(m->m.getId()).orElseThrow(null));
+ device.setFinishWarehouseLocationId(Optional.ofNullable(collect.get(s.getFinishWarehouseLocationName())).map(m->m.getId()).orElseThrow(null));
deviceMapper.insert(device);
if(StringUtils.isNotBlank(s.getUserIds())){
- this.dealDeviceUserId(Constants.ZERO,device.getUserIds().trim(),device.getId(),user);
+
+ QueryWrapper<CompanyUser> companyUserQuery = new QueryWrapper<>();
+
+ companyUserQuery.lambda()
+ .eq(CompanyUser::getComDepartId,user.getComDepartment().getId())
+ .in(CompanyUser::getPhone,Arrays.asList(s.getUserIds().split("[.,;锛宂")));
+ List<CompanyUser> list1 = companyUserService.findList(companyUserQuery);
+ if (!CollectionUtils.isEmpty(list1)){
+ List<String> collect1 = list1.stream().map(c -> c.getId().toString()).collect(Collectors.toList());
+ this.dealDeviceUserId(Constants.ZERO,StringUtils.join(collect1,","),device.getId(),user);
+ }
+
}
});
--
Gitblit v1.9.3