From c7fc7a0cd28d0721700f870ea9baa01019f11382 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sun, 31 Aug 2025 18:24:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ComplexQueryServiceImpl.java | 4 ++- .../impl/PurchaseCheckInfoServiceImpl.java | 27 ++++++++++++------- .../UseMaintenanceWarningController.java | 12 ++++----- .../mapper/UseMaintenanceWarningMapper.java | 2 +- .../service/UseMaintenanceWarningService.java | 2 +- .../UseMaintenanceWarningServiceImpl.java | 2 +- .../mapper/material/basic/BmReportMapper.xml | 3 ++- .../material/basic/ComplexQueryMapper.xml | 1 + .../UseMaintenanceWarningMapper.xml | 1 + 9 files changed, 33 insertions(+), 21 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java index 26113b32..6187f32e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java @@ -162,6 +162,7 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { OutRecordInfo recordInfo = new OutRecordInfo(); BeanUtils.copyProperties(outRecordInfo, recordInfo); recordInfo.setMaCode(code); + recordInfo.setOutNum(BigDecimal.ONE); list.add(recordInfo); } } else { @@ -386,7 +387,8 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { // 批量查询并缓存结果，减少数据库交互 Map leaseInfoMap = Collections.emptyMap(); if (!leaseIds.isEmpty()) { - leaseInfoMap = complexQueryMapper.batchSelectInfo(leaseIds).stream() + List queryResults = complexQueryMapper.batchSelectInfo(leaseIds); + leaseInfoMap = queryResults.stream() // 先过滤掉null元素，避免后续调用方法时空指针 .filter(Objects::nonNull) // 再过滤LeaseId为null的元素 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 3dfabbaa..dd75e0e3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -403,7 +403,11 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { if (signedOrgSet.size() == 1) { purchaseCheckInfo.setSignLevel("2"); } else { - purchaseCheckInfo.setSignLevel("3"); + // 获取purchaseSignRecordList中是否存在auditStatus为2，即被驳回的数据 + boolean isRejected = purchaseSignRecordList.stream().anyMatch(item -> "2".equals(item.getAuditStatus())); + if (!isRejected) { + purchaseCheckInfo.setSignLevel("3"); + } } } } @@ -841,22 +845,25 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { extractedFile(details); } } else { - // 验收驳回处理流程 - for (PurchaseCheckDetails details : purchaseVerifyVo.getPurchaseCheckDetailsList()) { - details.setStatus(PurchaseTaskStatusEnum.TO_CHECK_AFTER_REJECT.getStatus()); - int res = purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details); - if (res < 1) { - return AjaxResult.error("验收驳回失败,请联系管理员"); + if (!CollectionUtils.isEmpty(purchaseVerifyVo.getPurchaseCheckDetailsList())) { + // 验收驳回处理流程 + for (PurchaseCheckDetails details : purchaseVerifyVo.getPurchaseCheckDetailsList()) { + details.setStatus(PurchaseTaskStatusEnum.TO_CHECK_AFTER_REJECT.getStatus()); + int res = purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details); + if (res < 1) { + return AjaxResult.error("验收驳回失败,请联系管理员"); + } + extractedFile(details); } - extractedFile(details); + PurchaseCheckDetails purchaseCheckDetails = purchaseVerifyVo.getPurchaseCheckDetailsList().get(0); PurchaseSignRecord purchaseSignRecord = new PurchaseSignRecord(); - purchaseSignRecord.setTaskId(details.getTaskId()); + purchaseSignRecord.setTaskId(purchaseCheckDetails.getTaskId()); purchaseSignRecord.setUserId(SecurityUtils.getLoginUser().getUserid()); purchaseSignRecord.setOrgId(loginUserDeptId); // 审核驳回 purchaseSignRecord.setAuditStatus("2"); purchaseSignRecord.setCreateTime(DateUtils.getNowDate()); - purchaseSignRecord.setAuditRemark(details.getCheckResult()); + purchaseSignRecord.setAuditRemark(purchaseCheckDetails.getCheckResult()); int addPurchaseSignResult = signProcessMapper.insertPurchaseSignRecord(purchaseSignRecord); if (addPurchaseSignResult < 1) { return AjaxResult.error("会签失败，purchase_audit_record表插入0条数据"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java index cf5d27dd..21d95ddf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java @@ -42,11 +42,11 @@ public class UseMaintenanceWarningController extends BaseController } /** - * 查询检修过期列表 + * 查询安全工器具检修过期列表 * @param bean * @return */ - @ApiOperation(value = "查询检修过期列表") + @ApiOperation(value = "查询安全工器具检修过期列表") @GetMapping("/getOverTimeList") public TableDataInfo getOverTimeList(UseMaintenanceWarningBean bean) { @@ -56,19 +56,19 @@ public class UseMaintenanceWarningController extends BaseController } /** - * 导出检修过期列表 + * 导出安全工器具检修过期列表 * @param response * @param bean */ - @ApiOperation(value = "导出检修过期列表") + @ApiOperation(value = "导出安全工器具检修过期列表") @PreventRepeatSubmit - @SysLog(title = "检修预警", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出检修过期列表") + @SysLog(title = "检修预警", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出安全工器具检修过期列表") @PostMapping("/exportOverTimeList") public void exportOverTimeList(HttpServletResponse response, UseMaintenanceWarningBean bean) { List list = service.getOverTimeListList(bean); ExcelUtil util = new ExcelUtil(UseMaintenanceWarningBean.class); - util.exportExcel(response, list, "检修过期数据"); + util.exportExcel(response, list, "安全工器具检修过期列表"); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java index ca8d6869..5346ee49 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/mapper/UseMaintenanceWarningMapper.java @@ -33,7 +33,7 @@ public interface UseMaintenanceWarningMapper List getUserManger(UseMaintenanceWarningBean bean); /** - * 查询检修过期列表 + * 查询安全工器具检修过期列表 * @param bean * @return */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java index b5eaf274..8031555c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/UseMaintenanceWarningService.java @@ -20,7 +20,7 @@ public interface UseMaintenanceWarningService public List getList(UseMaintenanceWarningBean bean); /** - * 查询检修过期列表 + * 查询安全工器具检修过期列表 * @param bean * @return */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java index 2426339d..939e26f7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/service/impl/UseMaintenanceWarningServiceImpl.java @@ -38,7 +38,7 @@ public class UseMaintenanceWarningServiceImpl implements UseMaintenanceWarningSe } /** - * 查询检修过期列表 + * 查询安全工器具检修过期列表 * @param bean * @return */ diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml index 495c2970..f6cad5e2 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml @@ -228,7 +228,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id LEFT JOIN bm_unit bu ON bai.unit_id = bu.unit_id LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id - LEFT JOIN ( SELECT parent_id, type_id, GROUP_CONCAT( DISTINCT create_by ) AS createBy, MAX( create_time ) AS createTime FROM lease_out_details GROUP BY parent_id, type_id ) a ON a.parent_id = lad.parent_id + LEFT JOIN ( SELECT lod.parent_id, lod.type_id, GROUP_CONCAT( DISTINCT su.nick_name ) AS createBy, MAX( lod.create_time ) AS createTime FROM lease_out_details lod + LEFT JOIN sys_user su ON lod.create_by = su.user_id GROUP BY parent_id, type_id ) a ON a.parent_id = lad.parent_id AND a.type_id = lad.type_id LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 9c6d77bb..5983d37e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -1494,6 +1494,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"