From 453f63fd6cd6466222304df619e62b3a5667ca68 Mon Sep 17 00:00:00 2001 From: zhuguifei <zhuguifei@zhuguifeideiMac.local> Date: 星期二, 05 八月 2025 13:56:47 +0800 Subject: [PATCH] 修复0730测试问题 --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java index a9b17a7..8762224 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java @@ -249,13 +249,22 @@ @Override public Boolean updateBatchByBo(InspectRecordBo bo) { -// LoginUser loginUser = LoginHelper.getLoginUser(); + LoginUser loginUser = LoginHelper.getLoginUser(); List<EimsInspectRecord> inspRecordList = MapstructUtils.convert(bo.getInspRecordList(), EimsInspectRecord.class); inspRecordList.forEach(item->{ - // 鏇存柊涓哄凡鐐规 - item.setStatus(DictConstants.EIMS_INSPECT_STATUS_DETAIL.Y); + // 鍓嶇浼犲叆鐘舵�� + // item.setStatus(DictConstants.EIMS_INSPECT_STATUS_DETAIL.Y); // item.setInspTime(new Date()); // item.setInspUser(loginUser.getUserId()); + // 鐐规(0)-> 寰呯‘璁�(1) + if(item.getInspUser()==null && (item.getStatus()!=null && item.getStatus().equals("1"))){ + item.setInspUser(loginUser.getUserId()); + } + // 寰呯‘璁�(1)-> 瀹屾垚(2) + if(item.getVerifyUser()==null&& (item.getStatus()!=null && item.getStatus().equals("2"))){ + item.setVerifyUser(loginUser.getUserId()); + } + }); return baseMapper.updateBatchById(inspRecordList); } -- Gitblit v1.9.3