From dddc473c582e983674913163dd4e93f840effbdb Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 10:54:55 +0800
Subject: [PATCH] fix(search): 修复多处搜索条件未生效的问题
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java
index b364041..41e87f1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java
@@ -23,15 +23,32 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.maintenrecord.vo.MesDvMaintenRecordImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.maintenrecord.vo.MesDvMaintenRecordImportRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryMapper;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.checkplan.MesDvCheckPlanDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.checkplan.MesDvCheckPlanMapper;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.hutool.core.util.StrUtil;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 璁惧淇濆吇璁板綍 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
public class MesDvMaintenRecordServiceImpl implements MesDvMaintenRecordService {
+
+ @Resource
+ private MesDvCheckPlanMapper checkPlanMapper;
+
+ @Resource
+ private MesDvMachineryMapper machineryMapper;
@Resource
private MesDvMaintenRecordMapper maintenRecordMapper;
@@ -147,4 +164,52 @@
return maintenRecordMapper.selectPage(pageReqVO);
}
+
+ @Override
+ public MesDvMaintenRecordImportRespVO importMaintenRecordList(List<MesDvMaintenRecordImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(DV_MAINTEN_RECORD_IMPORT_LIST_IS_EMPTY);
+ }
+ MesDvMaintenRecordImportRespVO respVO = MesDvMaintenRecordImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String key = "绗� " + currentIndex + " 琛�";
+ if (StrUtil.isBlank(importItem.getMachineryCode())) {
+ respVO.getFailureCodes().put(key, "璁惧缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ if (importItem.getMaintenTime() == null) {
+ respVO.getFailureCodes().put(key, "淇濆吇鏃堕棿涓嶈兘涓虹┖");
+ return;
+ }
+ MesDvMachineryDO machinery = machineryMapper.selectByCode(importItem.getMachineryCode());
+ if (machinery == null) {
+ respVO.getFailureCodes().put(key, "璁惧涓嶅瓨鍦細" + importItem.getMachineryCode());
+ return;
+ }
+ Long planId = null;
+ if (StrUtil.isNotBlank(importItem.getPlanCode())) {
+ MesDvCheckPlanDO plan = checkPlanMapper.selectByCode(importItem.getPlanCode());
+ if (plan == null) {
+ respVO.getFailureCodes().put(key, "鐐规淇濆吇鏂规涓嶅瓨鍦細" + importItem.getPlanCode());
+ return;
+ }
+ planId = plan.getId();
+ }
+ try {
+ MesDvMaintenRecordSaveReqVO saveReqVO = BeanUtils.toBean(importItem, MesDvMaintenRecordSaveReqVO.class);
+ saveReqVO.setMachineryId(machinery.getId());
+ saveReqVO.setPlanId(planId);
+ Long id = createMaintenRecord(saveReqVO);
+ respVO.getCreateCodes().add(String.valueOf(id));
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3