From 3cb93ce84c98f42888002de8ce49ea34a0e80f70 Mon Sep 17 00:00:00 2001 From: FCL Date: Tue, 20 Jan 2026 17:54:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zt/plat/module/qms/enums/QmsCommonConstant.java | 5 +++-- .../plat/module/qms/enums/QmsPermissionConstant.java | 3 +++ .../device/controller/admin/DeviceApplyController.java | 8 ++++---- .../resource/device/dal/mapper/DeviceApplyMapper.java | 9 +++++++-- .../device/dal/mapper/DeviceInfomationMapper.java | 5 ++++- .../resource/device/service/DeviceApplyService.java | 3 +++ .../device/service/DeviceApplyServiceImpl.java | 10 ++++++++++ 7 files changed, 34 insertions(+), 9 deletions(-) diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java index adafb2b..90824f2 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java @@ -207,7 +207,8 @@ public interface QmsCommonConstant { /** 允许提交 **/ String ALLOW_SUBMIT = "allow_submit"; - - + + /** 临时数据标识 **/ + String TEMP_DATA_CODE = "-1"; } diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsPermissionConstant.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsPermissionConstant.java index ee8342e..c395f37 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsPermissionConstant.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsPermissionConstant.java @@ -16,9 +16,12 @@ public interface QmsPermissionConstant { //目标权限类型-自定义 String TARGET_TYPE_CUSTOM = "custom"; + String DEPT_DATA_AND_SUB = "ytjyDeptAndSub"; //部门 + //======================各业务模块权限常量============================= String REPORT_DOCUMENT_TYPE_START = "report_document_type_start"; //报告发起权限 String SAMPLE_WAREHOUSE_ADMIN = "sample_warehouse_admin"; //样品库管理员 + String DEVICE_MANAGER = "qms_device_manager"; //设备管理员 } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceApplyController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceApplyController.java index 42cbe8b..a01d45b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceApplyController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceApplyController.java @@ -56,11 +56,11 @@ public class DeviceApplyController extends AbstractFileUploadController implemen private DeviceApplyService deviceApplyService; //todo 通过设备通用流程配置创建 - @PostMapping("/create") - @Operation(summary = "创建设备通用流程,验收、降级、停用、报废、还原、启用") + @PostMapping("/createTempData") + @Operation(summary = "创建创建临时数据") // @PreAuthorize("@ss.hasPermission('qms:device-apply:create')") - public CommonResult createDeviceApply(@Valid @RequestBody DeviceApplySaveReqVO createReqVO) { - return success(deviceApplyService.createDeviceApply(createReqVO)); + public CommonResult createTempData(@Valid @RequestBody DeviceApplySaveReqVO createReqVO) { + return success(deviceApplyService.createTempData(createReqVO)); } @PutMapping("/update") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceApplyMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceApplyMapper.java index 813b61b..2e55afc 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceApplyMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceApplyMapper.java @@ -4,10 +4,14 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.module.qms.core.aspect.annotation.QmsPermission; +import com.zt.plat.module.qms.enums.QmsCommonConstant; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceApplyPageReqVO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceApplyDO; import org.apache.ibatis.annotations.Mapper; +import static com.zt.plat.module.qms.enums.QmsPermissionConstant.DEPT_DATA_AND_SUB; +import static com.zt.plat.module.qms.enums.QmsPermissionConstant.DEVICE_MANAGER; + /** * 设备通用流程,验收、降级、停用、报废、还原、启用 Mapper * @@ -16,10 +20,11 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DeviceApplyMapper extends BaseMapperX { - @QmsPermission + @QmsPermission(deptDataRoleCodes = DEPT_DATA_AND_SUB, moduleDataRoleCodes = DEVICE_MANAGER) default PageResult selectPage(DeviceApplyPageReqVO reqVO) { LambdaQueryWrapperX wrapper = new LambdaQueryWrapperX<>(); - wrapper.likeIfPresent(DeviceApplyDO::getBusinessName, reqVO.getBusinessName()) + wrapper.neIfPresent(DeviceApplyDO::getBusinessStatus, QmsCommonConstant.TEMP_DATA_CODE) + .likeIfPresent(DeviceApplyDO::getBusinessName, reqVO.getBusinessName()) .likeIfPresent(DeviceApplyDO::getApplyDepartmentName, reqVO.getApplyDepartmentName()) .eqIfPresent(DeviceApplyDO::getApplyDepartment, reqVO.getApplyDepartment()) .likeIfPresent(DeviceApplyDO::getApplyUserName, reqVO.getApplyUserName()) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.java index 4acbce6..cfe5e22 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.java @@ -13,6 +13,9 @@ import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; +import static com.zt.plat.module.qms.enums.QmsPermissionConstant.DEPT_DATA_AND_SUB; +import static com.zt.plat.module.qms.enums.QmsPermissionConstant.DEVICE_MANAGER; + /** * 设备-设备信息 Mapper * @@ -21,7 +24,7 @@ import java.util.Map; @Mapper public interface DeviceInfomationMapper extends BaseMapperX { - @QmsPermission(deptDataRoleCodes = "ytjyDeptAndSub", moduleDataRoleCodes = "qms_device_manager") + @QmsPermission(deptDataRoleCodes = DEPT_DATA_AND_SUB, moduleDataRoleCodes = DEVICE_MANAGER) default PageResult selectPage(DeviceInfomationPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(DeviceInfomationDO::getProductId, reqVO.getProductId()) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyService.java index f1a7379..b71c358 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyService.java @@ -24,6 +24,9 @@ public interface DeviceApplyService { */ DeviceApplyRespVO createDeviceApply(@Valid DeviceApplySaveReqVO createReqVO); + //创建临时数据 + DeviceApplyRespVO createTempData(@Valid DeviceApplySaveReqVO createReqVO); + /** * 更新设备通用流程,验收、降级、停用、报废、还原、启用 * diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java index 02ec912..be003b0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java @@ -1,6 +1,7 @@ package com.zt.plat.module.qms.resource.device.service; import cn.hutool.core.collection.CollUtil; +import com.zt.plat.module.qms.enums.QmsCommonConstant; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceApplyPageReqVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceApplyRespVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceApplySaveReqVO; @@ -41,6 +42,15 @@ public class DeviceApplyServiceImpl implements DeviceApplyService { return BeanUtils.toBean(deviceApply, DeviceApplyRespVO.class); } + @Override + public DeviceApplyRespVO createTempData(DeviceApplySaveReqVO createReqVO) { + DeviceApplyDO deviceApply = BeanUtils.toBean(createReqVO, DeviceApplyDO.class); + deviceApply.setBusinessStatus(QmsCommonConstant.TEMP_DATA_CODE); + deviceApplyMapper.insert(deviceApply); + // 返回 + return BeanUtils.toBean(deviceApply, DeviceApplyRespVO.class); + } + @Override public void updateDeviceApply(DeviceApplySaveReqVO updateReqVO) { // 校验存在