From f57064d2fa563ee4cfeeccd715850ba8b8aa4f60 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 18 五月 2026 09:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
index 383193b..bd6f2df 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
@@ -23,9 +23,11 @@
import com.ruoyi.production.bean.dto.ProductionOperationTaskDto;
import com.ruoyi.production.bean.vo.ProductionOperationTaskVo;
import com.ruoyi.production.mapper.ProductionOrderMapper;
+import com.ruoyi.production.mapper.ProductionOrderRoutingOperationMapper;
import com.ruoyi.production.mapper.ProductionOperationTaskMapper;
import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.pojo.ProductionOperationTask;
+import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;
import com.ruoyi.production.service.ProductionOperationTaskService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
@@ -48,6 +50,7 @@
private final SysUserMapper sysUserMapper;
private final ProductionOrderMapper productionOrderMapper;
+ private final ProductionOrderRoutingOperationMapper productionOrderRoutingOperationMapper;
private final FileUtil fileUtil;
@@ -58,26 +61,32 @@
@Override
public IPage<ProductionOperationTaskVo> pageProductionOperationTask(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto) {
+ // 鍒嗛〉鏌ヨ鐢熶骇宸ュ簭浠诲姟
Page<ProductionOperationTaskVo> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
IPage<ProductionOperationTaskVo> result = baseMapper.pageProductionOperationTask(voPage, dto);
+ fillOperationTypes(result.getRecords());
fillUserNames(result.getRecords());
return result;
}
@Override
public List<ProductionOperationTaskVo> listProductionOperationTask(ProductionOperationTaskDto dto) {
+ // 鏌ヨ宸ュ簭浠诲姟鍒楄〃
List<ProductionOperationTaskVo> result = BeanUtil.copyToList(this.list(buildQueryWrapper(dto)), ProductionOperationTaskVo.class);
+ fillOperationTypes(result);
fillUserNames(result);
return result;
}
@Override
public ProductionOperationTaskVo getProductionOperationTaskInfo(Long id) {
+ // 鑾峰彇鐢熶骇宸ュ簭浠诲姟璇︽儏
ProductionOperationTask item = this.getById(id);
if (item == null) {
return null;
}
ProductionOperationTaskVo vo = BeanUtil.copyProperties(item, ProductionOperationTaskVo.class);
+ fillOperationTypes(Collections.singletonList(vo));
if (item.getProductionOrderId() != null) {
ProductionOrder productionOrder = productionOrderMapper.selectById(item.getProductionOrderId());
if (productionOrder != null) {
@@ -90,21 +99,25 @@
@Override
public boolean saveProductionOperationTask(ProductionOperationTask productionOperationTask) {
+ // 淇濆瓨鐢熶骇宸ュ簭浠诲姟
return this.saveOrUpdate(productionOperationTask);
}
@Override
public boolean removeProductionOperationTask(List<Long> ids) {
+ // 鍒犻櫎鐢熶骇宸ュ簭浠诲姟
return ids != null && !ids.isEmpty() && this.removeByIds(ids);
}
@Override
public int updateProductWorkOrder(ProductionOperationTaskDto dto) {
+ // 鏇存柊宸ュ簭浠诲姟瀵瑰簲鐨勫伐鍗曚俊鎭�
return baseMapper.updateById(dto);
}
@Override
public boolean assign(ProductionOperationTaskDto dto) {
+ // 鍒嗛厤宸ュ簭浠诲姟鎵ц浜�
if (dto == null || dto.getId() == null) {
throw new ServiceException("宸ュ崟ID涓嶈兘涓虹┖");
}
@@ -120,6 +133,7 @@
}
private LambdaQueryWrapper<ProductionOperationTask> buildQueryWrapper(ProductionOperationTaskDto dto) {
+ // 鎸夋潯浠跺姩鎬佹瀯寤烘暟鎹簱鏌ヨ鏉′欢
ProductionOperationTask query = dto == null ? new ProductionOperationTask() : dto;
return Wrappers.<ProductionOperationTask>lambdaQuery()
.eq(query.getId() != null, ProductionOperationTask::getId, query.getId())
@@ -133,10 +147,12 @@
}
private void fillUserNames(List<ProductionOperationTaskVo> voList) {
+ // 濉厖鐢ㄦ埛鍚嶇О
if (voList == null || voList.isEmpty()) {
return;
}
Set<Long> userIdSet = new LinkedHashSet<>();
+ // 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
for (ProductionOperationTaskVo vo : voList) {
if (vo == null) {
continue;
@@ -172,6 +188,7 @@
}
private List<Long> parseUserIdList(String userIds, boolean strict) {
+ // 瑙ｆ瀽骞舵牎楠岀敤鎴稩D鏁扮粍瀛楃涓�
if (StringUtils.isBlank(userIds)) {
if (strict) {
throw new ServiceException("userIds鏍煎紡涓嶆纭紝蹇呴』涓篔SON鏁板瓧鏁扮粍");
@@ -199,6 +216,7 @@
@Override
public void down(HttpServletResponse response, ProductionOperationTaskDto dto) {
+ // 瀵煎嚭宸ュ簭浠诲姟鏁版嵁
if (dto == null || dto.getId() == null) {
throw new ServiceException("宸ュ崟ID涓嶈兘涓虹┖");
}
@@ -250,15 +268,18 @@
}
private List<Map<String, Object>> buildTaskAttachmentImages(Long taskId) {
+ // 缁勮浠诲姟闄勪欢鍥剧墖鏁版嵁鐢ㄤ簬瀵煎嚭
List<Map<String, Object>> images = new ArrayList<>();
StorageAttachmentDTO storageAttachmentDTO = new StorageAttachmentDTO();
storageAttachmentDTO.setRecordType(RecordTypeEnum.PRODUCTION_OPERATION_TASK.getType());
storageAttachmentDTO.setRecordId(taskId);
List<StorageBlobVO> taskWorkOrderFiles =
fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(storageAttachmentDTO);
+ // 鍙傛暟涓庡墠缃潯浠舵牎楠�
if (CollectionUtils.isEmpty(taskWorkOrderFiles)) {
return images;
}
+ // 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
for (StorageBlobVO blobVO : taskWorkOrderFiles) {
if (blobVO == null) {
continue;
@@ -286,6 +307,7 @@
}
private File resolveImageFile(StorageBlobVO blobVO) {
+ // 灏嗛檮浠朵俊鎭В鏋愪负鏈湴鍥剧墖鏂囦欢瀵硅薄
if (blobVO == null || StringUtils.isBlank(blobVO.getUidFilename())) {
return null;
}
@@ -296,6 +318,7 @@
}
private PictureType resolvePictureType(StorageBlobVO blobVO) {
+ // 鎸夋枃浠跺悕鎴栧唴瀹圭被鍨嬭瘑鍒浘鐗囨牸寮�
if (blobVO == null) {
return null;
}
@@ -311,6 +334,7 @@
}
private PictureType parsePictureTypeByFileName(String fileName) {
+ // 鏍规嵁鏂囦欢鍚庣紑瑙ｆ瀽鍥剧墖鏍煎紡
if (StringUtils.isBlank(fileName) || !fileName.contains(".")) {
return null;
}
@@ -322,6 +346,7 @@
}
private PictureType parsePictureTypeByContentType(String contentType) {
+ // 鏍规嵁Content-Type瑙ｆ瀽鍥剧墖鏍煎紡
if (StringUtils.isBlank(contentType)) {
return null;
}
@@ -350,6 +375,39 @@
@Override
public List<ProductionOperationTaskVo> getOperation(ProductionOperationTaskDto dto) {
- return baseMapper.getOperation(dto);
+ // 鏌ヨ宸ュ簭浠诲姟鍒楄〃
+ List<ProductionOperationTaskVo> result = baseMapper.getOperation(dto);
+ fillOperationTypes(result);
+ return result;
+ }
+
+ private void fillOperationTypes(List<ProductionOperationTaskVo> voList) {
+ // 鍥炲～宸ュ簭绫诲瀷锛�0 璁℃椂 / 1 璁′欢锛�
+ if (voList == null || voList.isEmpty()) {
+ return;
+ }
+ Set<Long> operationIds = voList.stream()
+ .filter(Objects::nonNull)
+ .map(ProductionOperationTaskVo::getProductionOrderRoutingOperationId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toCollection(LinkedHashSet::new));
+ if (operationIds.isEmpty()) {
+ return;
+ }
+ Map<Long, Integer> typeByOperationId = productionOrderRoutingOperationMapper
+ .selectBatchIds(new ArrayList<>(operationIds))
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toMap(
+ ProductionOrderRoutingOperation::getId,
+ ProductionOrderRoutingOperation::getType,
+ (left, right) -> left
+ ));
+ for (ProductionOperationTaskVo vo : voList) {
+ if (vo == null || vo.getType() != null || vo.getProductionOrderRoutingOperationId() == null) {
+ continue;
+ }
+ vo.setType(typeByOperationId.get(vo.getProductionOrderRoutingOperationId()));
+ }
}
}
--
Gitblit v1.9.3