diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowCcController.java b/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowCcController.java index ea434d7..ff5dcf1 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowCcController.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/controller/HrmFlowCcController.java @@ -66,7 +66,14 @@ public class HrmFlowCcController extends BaseController { Long userId = LoginHelper.getUserId(); return toAjax(service.markRead(ccId, userId)); } - + /** + * 标记抄送未读(新增) + */ + @PostMapping("/{ccId}/unread") + public R unread(@PathVariable Long ccId) { + Long userId = LoginHelper.getUserId(); + return toAjax(service.markUnread(ccId, userId)); + } @GetMapping("/ping") public R ping(@RequestParam @NotNull String x) { return R.ok(x); diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmFlowCcService.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmFlowCcService.java index 9dab1ca..a94c427 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmFlowCcService.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/IHrmFlowCcService.java @@ -27,5 +27,9 @@ public interface IHrmFlowCcService { * 标记已读 */ Boolean markRead(Long ccId, Long userId); + /** + * 标记未读 + */ + Boolean markUnread(Long ccId, Long userId); } diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowCcServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowCcServiceImpl.java index 2d4a292..28db56c 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowCcServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmFlowCcServiceImpl.java @@ -99,6 +99,23 @@ public class HrmFlowCcServiceImpl implements IHrmFlowCcService { .eq(HrmFlowCc::getDelFlag, 0) ) > 0; } + /** + * 标记未读 + */ + @Override + public Boolean markUnread(Long ccId, Long userId) { + if (ccId == null || userId == null) { + return false; + } + return baseMapper.update( + null, + Wrappers.lambdaUpdate() + .set(HrmFlowCc::getReadFlag, 0) + .eq(HrmFlowCc::getCcId, ccId) + .eq(HrmFlowCc::getCcUserId, userId) + .eq(HrmFlowCc::getDelFlag, 0) + ) > 0; + } private LambdaQueryWrapper buildQueryWrapper(HrmFlowCcBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); diff --git a/ruoyi-ui/src/api/hrm/cc.js b/ruoyi-ui/src/api/hrm/cc.js index 1bf5c74..a6b8998 100644 --- a/ruoyi-ui/src/api/hrm/cc.js +++ b/ruoyi-ui/src/api/hrm/cc.js @@ -16,7 +16,13 @@ export function readCc(ccId) { method: 'post' }) } - +// 标记抄送为未读 +export function unreadCc(ccId) { + return request({ + url: `/hrm/flow/cc/${ccId}/unread`, + method: 'post' + }) +} // 手动抄送 export function addCc(data) { return request({ diff --git a/ruoyi-ui/src/views/hrm/flow/cc.vue b/ruoyi-ui/src/views/hrm/flow/cc.vue index 49bc06b..a2ca8d4 100644 --- a/ruoyi-ui/src/views/hrm/flow/cc.vue +++ b/ruoyi-ui/src/views/hrm/flow/cc.vue @@ -56,8 +56,8 @@