From 6f7c3c99473becb95e2a60d0929e4cf3cc2889eb Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Wed, 13 Aug 2025 17:27:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/domain/lease/LeaseApplyInfo.java | 3 + .../back/mapper/BackApplyInfoMapper.java | 14 +- .../impl/BackApplyInfoServiceImpl.java | 35 ++- .../service/impl/LeaseTaskServiceImpl.java | 4 +- .../SysWorkflowRecordHisController.java | 2 + .../material/back/BackApplyInfoMapper.xml | 204 ++++++++++++++++++ .../mapper/material/lease/LeaseTaskMapper.xml | 2 +- 7 files changed, 259 insertions(+), 5 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java index 6e14e627..56bb4bd2 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java @@ -33,6 +33,9 @@ public class LeaseApplyInfo extends BaseEntity{ @ApiModelProperty(value = "登录用户id") private Long userId; + @ApiModelProperty(value = "登录用户部门id") + private Long deptId; + @ApiModelProperty(value = "申请时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "申请时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java index c197bb80..1e4485f7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java @@ -247,7 +247,7 @@ public interface BackApplyInfoMapper { * @return */ int deleteDetails(BackApplyInfo backApplyInfo); - + /** * 查询机具 * @param dto @@ -427,4 +427,16 @@ public interface BackApplyInfoMapper { * @return */ List selectBackApplyDetailsList(BackApplyDetails backApplyDetails); + + List getMachineByOne(BackApplyInfo dto); + + List getMachineByTwo(BackApplyInfo dto); + + List getMachineByThree(BackApplyInfo dto); + + List getMachineByOneMaCode(BackApplyInfo dto); + + List getMachineByTwoMaCode(BackApplyInfo dto); + + List getMachineByThreeMaCode(BackApplyInfo dto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index 173201c9..80c77d8c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -1527,12 +1527,43 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { List list = new ArrayList<>(); dto.setUserId(SecurityUtils.getLoginUser().getUserid()); if (dto.getMaCode() != null) { + // 判断是否有这个设备编码 + List listOneMaCode = backApplyInfoMapper.getMachineByOneMaCode(dto); + if(CollectionUtils.isEmpty(listOneMaCode)){ + return AjaxResult.error("该设备编码不存在，请重新选择"); + } + // 判断是否是在用状态 + List listTwoMaCode = backApplyInfoMapper.getMachineByTwoMaCode(dto); + if(CollectionUtils.isEmpty(listTwoMaCode)){ + return AjaxResult.error("该设备编码非在用状态，请重新选择"); + } + // 判断是否是当前协议下的设备 + List listThreeMaCode = backApplyInfoMapper.getMachineByThreeMaCode(dto); + if(CollectionUtils.isEmpty(listThreeMaCode)){ + return AjaxResult.error("该设备编码非当前协议下的设备，请重新选择"); + } + // 判断是否是当前人负责的设备 list = backApplyInfoMapper.getMachine(dto); if (CollectionUtils.isEmpty(list)) { - return AjaxResult.error("该编码非您负责的设备，请重新选择"); + return AjaxResult.error("该设备编码非您负责的设备，请重新选择"); } } else if (dto.getQrCode() != null) { - + // 判断是否有这个二维码 + List listOne = backApplyInfoMapper.getMachineByOne(dto); + if(CollectionUtils.isEmpty(listOne)){ + return AjaxResult.error("该二维码不存在，请重新选择"); + } + // 判断是否是在用状态 + List listTwo = backApplyInfoMapper.getMachineByTwo(dto); + if(CollectionUtils.isEmpty(listTwo)){ + return AjaxResult.error("该二维码非在用状态，请重新选择"); + } + // 判断是否是当前协议下的设备 + List listThree = backApplyInfoMapper.getMachineByThree(dto); + if(CollectionUtils.isEmpty(listThree)){ + return AjaxResult.error("该二维码非当前协议下的设备，请重新选择"); + } + // 判断是否是当前人负责的设备 list = backApplyInfoMapper.getMachineByQrCode(dto); if (CollectionUtils.isEmpty(list)) { return AjaxResult.error("该编码非您负责的设备，请重新选择"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index 314f6274..c3c1da0e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -553,7 +553,9 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { @Override public List selectAuditLeaseApplyInfoList(LeaseApplyInfo leaseApplyInfo) { Long userId = SecurityUtils.getLoginUser().getUserid(); - leaseApplyInfo.setUserId(userId == 0 ? null : userId); + Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); + leaseApplyInfo.setUserId(userId == 1 ? null : userId); + leaseApplyInfo.setDeptId(deptId == 1 ? null : deptId); log.info("用户id为{}",userId); List list = mapper.selectAuditLeaseApplyInfoList(leaseApplyInfo); try { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowRecordHisController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowRecordHisController.java index ba09327e..1cbb9168 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowRecordHisController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowRecordHisController.java @@ -3,6 +3,7 @@ package com.bonus.material.work.controller; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.work.domain.SysWorkflowNode; import com.bonus.material.work.domain.SysWorkflowRecordHistory; import com.bonus.material.work.service.SysWorkflowRecordHistoryService; @@ -27,6 +28,7 @@ public class SysWorkflowRecordHisController extends BaseController { */ @ApiOperation(value = "审批") @PostMapping("/update") + @PreventRepeatSubmit public AjaxResult update(@RequestBody SysWorkflowRecordHistory sysWorkflowRecordHistory) { try { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index dd4cd5fd..cafb3866 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -1146,4 +1146,208 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" back_check_details where parent_id = #{parentId} and type_id = #{typeId} + + + + + + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml index c21c0934..61da1d86 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml @@ -589,7 +589,7 @@ LEFT JOIN sys_workflow_config swc ON swn.id = swc.node_id LEFT JOIN sys_workflow_record_history swrs ON swr.id = swrs.record_id where 1=1 - + and bp.imp_unit = #{deptId} and lai.code = #{code} and lai.task_id = #{taskId} and lai.lease_person = #{leasePerson}