diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QualityNotificationController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QualityNotificationController.java index 60097556..82a47606 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QualityNotificationController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QualityNotificationController.java @@ -52,15 +52,6 @@ public class QualityNotificationController extends BaseController { return ApiResult.success(); } - /** - * 发布质量通知 - */ - @PostMapping("publish") - public ApiResult publish(@NotNull Long id) { - qualityNotificationControllerService.publish(id); - return ApiResult.success(); - } - /** * 分页查询质量通知列表 */ diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java index ca8a4343..205d9550 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java @@ -64,20 +64,12 @@ public class QualityNotificationControllerService { Long operatorId = UserUtil.getUserId(); LocalDateTime now = LocalDateTime.now(); - // 如果状态为已发布，设置发布时间 - LocalDateTime publishTime = null; - if (request.getStatus() == 2) { - publishTime = now; - } - QmsQualityNotification entity = new QmsQualityNotification() .setNotificationTypeId(request.getNotificationTypeId()) .setTitle(request.getTitle()) .setTargetType(request.getTargetType()) .setContent(request.getContent()) - .setStatus(request.getStatus()) .setState(1) // 默认启用 - .setPublishTime(publishTime) .setCreateById(operatorId) .setCreateBy(operator) .setCreateTime(now) @@ -101,9 +93,6 @@ public class QualityNotificationControllerService { QmsQualityNotification exist = qualityNotificationService.getById(request.getId()); VUtil.trueThrowBusinessError(Objects.isNull(exist)).throwMessage("通知不存在"); - // 已发布的通知不允许编辑 - VUtil.trueThrowBusinessError(exist.getStatus() == 2).throwMessage("已发布的通知不允许编辑"); - // 如果是手动选择用户，必须提供用户ID列表 if (request.getTargetType() == 2) { VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getUserIds())) @@ -120,7 +109,6 @@ public class QualityNotificationControllerService { .set(QmsQualityNotification::getTitle, request.getTitle()) .set(QmsQualityNotification::getTargetType, request.getTargetType()) .set(QmsQualityNotification::getContent, request.getContent()) - .set(QmsQualityNotification::getStatus, request.getStatus()) .set(QmsQualityNotification::getUpdateById, operatorId) .set(QmsQualityNotification::getUpdateBy, operator) .set(QmsQualityNotification::getUpdateTime, now) @@ -145,9 +133,6 @@ public class QualityNotificationControllerService { QmsQualityNotification exist = qualityNotificationService.getById(id); VUtil.trueThrowBusinessError(Objects.isNull(exist)).throwMessage("通知不存在"); - // 已发布的通知不允许删除 - VUtil.trueThrowBusinessError(exist.getStatus() == 2).throwMessage("已发布的通知不允许删除"); - // 删除通知 qualityNotificationService.removeById(id); @@ -157,31 +142,6 @@ public class QualityNotificationControllerService { .remove(); } - /** - * 发布质量通知 - */ - @Transactional - public void publish(Long id) { - QmsQualityNotification exist = qualityNotificationService.getById(id); - VUtil.trueThrowBusinessError(Objects.isNull(exist)).throwMessage("通知不存在"); - - // 已发布的通知不能重复发布 - VUtil.trueThrowBusinessError(exist.getStatus() == 2).throwMessage("通知已发布，不能重复发布"); - - String operator = UserUtil.getUserName(); - Long operatorId = UserUtil.getUserId(); - LocalDateTime now = LocalDateTime.now(); - - qualityNotificationService.lambdaUpdate() - .eq(QmsQualityNotification::getId, id) - .set(QmsQualityNotification::getStatus, 2) - .set(QmsQualityNotification::getPublishTime, now) - .set(QmsQualityNotification::getUpdateById, operatorId) - .set(QmsQualityNotification::getUpdateBy, operator) - .set(QmsQualityNotification::getUpdateTime, now) - .update(); - } - /** * 分页查询质量通知列表 */ @@ -205,9 +165,7 @@ public class QualityNotificationControllerService { vo.setTitle(entity.getTitle()); vo.setTargetType(entity.getTargetType()); vo.setContent(entity.getContent()); - vo.setStatus(entity.getStatus()); vo.setState(entity.getState()); - vo.setPublishTime(entity.getPublishTime()); vo.setCreateById(entity.getCreateById()); vo.setCreateBy(entity.getCreateBy()); vo.setCreateTime(entity.getCreateTime()); @@ -294,10 +252,6 @@ public class QualityNotificationControllerService { if (vo.getTargetType() != null) { vo.setTargetTypeName(vo.getTargetType() == 1 ? "全部" : "手动选择"); } - // 发布状态名称 - if (vo.getStatus() != null) { - vo.setStatusName(vo.getStatus() == 1 ? "草稿" : "已发布"); - } // 启用状态名称 if (vo.getState() != null) { vo.setStateName(vo.getState() == 1 ? "启用" : "禁用"); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationAddQO.java index 7f26faa5..7f7dc9c7 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationAddQO.java @@ -39,10 +39,4 @@ public class QmsQualityNotificationAddQO { * 通知内容（HTML格式） */ private String content; - - /** - * 状态：1=草稿，2=已发布 - */ - @NotNull(message = "状态不能为空") - private Integer status; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationSearchQO.java index b63887e3..9e6f2f45 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationSearchQO.java @@ -20,11 +20,6 @@ public class QmsQualityNotificationSearchQO extends SearchBaseQO { */ private Long notificationTypeId; - /** - * 状态：1=草稿，2=已发布 - */ - private Integer status; - /** * 启用状态：1=启用，2=禁用 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationUpdateQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationUpdateQO.java index f93e56ce..94329194 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationUpdateQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationUpdateQO.java @@ -45,10 +45,4 @@ public class QmsQualityNotificationUpdateQO { * 通知内容（HTML格式） */ private String content; - - /** - * 状态：1=草稿，2=已发布 - */ - @NotNull(message = "状态不能为空") - private Integer status; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityNotificationVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityNotificationVO.java index b152b0df..913c3dc0 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityNotificationVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityNotificationVO.java @@ -43,16 +43,6 @@ public class QmsQualityNotificationVO { */ private String content; - /** - * 状态：1=草稿，2=已发布 - */ - private Integer status; - - /** - * 状态名称 - */ - private String statusName; - /** * 启用状态：1=启用，2=禁用 */ @@ -63,11 +53,6 @@ public class QmsQualityNotificationVO { */ private String stateName; - /** - * 发布时间 - */ - private LocalDateTime publishTime; - /** * 创建人ID */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityNotification.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityNotification.java index d1a3afc4..8bd57777 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityNotification.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityNotification.java @@ -46,21 +46,11 @@ public class QmsQualityNotification implements Serializable { */ private String content; - /** - * 状态：1=草稿，2=已发布 - */ - private Integer status; - /** * 启用状态：1=启用，2=禁用 */ private Integer state; - /** - * 发布时间 - */ - private LocalDateTime publishTime; - /** * 创建人ID */ diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsQualityNotificationMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsQualityNotificationMapper.xml index 707f32b2..4073fda4 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsQualityNotificationMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsQualityNotificationMapper.xml @@ -9,9 +9,7 @@ q.title, q.target_type, q.content, - q.status, q.state, - q.publish_time, q.create_by_id, q.create_by, q.create_time, @@ -27,9 +25,6 @@ AND q.notification_type_id = #{request.notificationTypeId} - - AND q.status = #{request.status} - AND q.state = #{request.state}