From 7524560c663902ca679db9cc7adc6cd4fae040f7 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 17:11:40 +0800
Subject: [PATCH] 通知完善
---
src/main/java/com/mindskip/xzs/controller/admin/UserConditionExamineController.java | 19 ++++++++++++++++++-
src/main/java/com/mindskip/xzs/controller/admin/DepartmentExamineController.java | 2 +-
src/main/java/com/mindskip/xzs/service/impl/NotifyServiceImpl.java | 1 +
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentExamineController.java b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentExamineController.java
index c005913..eb299b6 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentExamineController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentExamineController.java
@@ -53,7 +53,7 @@
notify.setCreateTime(new Date());
notify.setReadStatus(2);
notify.setRefId(departmentExamine.getId());
- notify.setRefType(NotifyRefType.FEEDBACK.getValue());
+ notify.setRefType(NotifyRefType.MOBILIZE.getValue());
notify.setCreateUserId(webContext.getCurrentUser().getId());
notifyService.add(notify);
return RestResponse.ok();
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserConditionExamineController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserConditionExamineController.java
index 0a782c3..79594b5 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserConditionExamineController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserConditionExamineController.java
@@ -4,14 +4,19 @@
import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
+import com.mindskip.xzs.domain.Notify;
import com.mindskip.xzs.domain.UserConditionExamine;
+import com.mindskip.xzs.domain.enums.NotifyRefType;
import com.mindskip.xzs.domain.vo.UserConditionExamineVO;
+import com.mindskip.xzs.service.NotifyService;
import com.mindskip.xzs.service.UserConditionExamineService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -27,6 +32,7 @@
public class UserConditionExamineController extends BaseApiController {
private final UserConditionExamineService userConditionExamineService;
+ private final NotifyService notifyService;
@RequestMapping(value = "list", method = RequestMethod.POST)
public RestResponse<PageInfo<UserConditionExamineVO>> list(@RequestBody UserConditionExamineVO userConditionExamineVO) {
@@ -34,11 +40,22 @@
return RestResponse.ok(userConditionExamineService.pageInfo(userConditionExamineVO));
}
+ @Transactional(rollbackFor = Exception.class)
@RequestMapping(value = "save", method = RequestMethod.POST)
public RestResponse<Boolean> save(@RequestBody UserConditionExamine userConditionExamine) {
userConditionExamine.setCreateTime(LocalDateTime.now());
userConditionExamine.setCreateUser(getCurrentUser().getId());
- return RestResponse.ok(userConditionExamineService.save(userConditionExamine));
+ userConditionExamineService.save(userConditionExamine);
+
+ // 娣诲姞閫氱煡
+ Notify notify = new Notify();
+ notify.setCreateTime(new Date());
+ notify.setReadStatus(2);
+ notify.setRefId(userConditionExamine.getId());
+ notify.setRefType(NotifyRefType.STATUS.getValue());
+ notify.setCreateUserId(webContext.getCurrentUser().getId());
+ notifyService.add(notify);
+ return RestResponse.ok();
}
@RequestMapping(value = "delete/{id}", method = RequestMethod.POST)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/NotifyServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/NotifyServiceImpl.java
index cdd78f8..33e9199 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/NotifyServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/NotifyServiceImpl.java
@@ -22,6 +22,7 @@
@Override
public void add(Notify notify) {
+ notify.setDeleted(0);
notifyMapper.add(notify);
}
--
Gitblit v1.8.0