xc

efs-bus/src/main/java/com/zjty/efs/bus/controller/AttentionController.java

@@ -27,7 +27,7 @@ public class AttentionController {
     AttentionService attentionService;
     @ApiOperation(value = "获取提醒列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", value = "当前登录用户", dataType = "int", paramType = "query", required = true),
+            @ApiImplicitParam(name = "userId", value = "当前登录用户", dataType = "String", paramType = "query", required = true),
             @ApiImplicitParam(name = "pageNum", value = "页码", dataType = "int", paramType = "query", required = true),
             @ApiImplicitParam(name = "pageSize", value = "条数", dataType = "int", paramType = "query", required = true)
     })

efs-bus/src/main/java/com/zjty/efs/bus/entity/Attention.java

 package com.zjty.efs.bus.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zjty.efs.misc.config.AutoDocument;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,6 +59,7 @@ public class Attention {
 
     @ApiModelProperty(value = "updateTime", name = "更新时间")
     @Column(name = "update_time")
+//    @JsonFormat(pattern = "yyyy:HH:dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
 }

efs-bus/src/main/java/com/zjty/efs/bus/entity/Notice.java

 package com.zjty.efs.bus.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zjty.efs.misc.config.AutoDocument;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -82,6 +83,7 @@ public class Notice {
      */
     @ApiModelProperty(value = "deadline", name = "通知失效时间")
     @Column(name = "deadline")
+//    @JsonFormat(pattern = "yyyy:HH:dd HH:mm:ss", timezone = "GMT+8")
     private Date deadline;
 
     /**
@@ -89,6 +91,7 @@ public class Notice {
      */
     @ApiModelProperty(value = "updateTime", name = "通知更新时间")
     @Column(name = "update_time")
+//    @JsonFormat(pattern = "yyyy:HH:dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     /**

efs-bus/src/main/java/com/zjty/efs/bus/service/impl/NoticeServiceImpl.java

@@ -37,13 +37,12 @@ public class NoticeServiceImpl implements NoticeService {
             Calendar calendar = Calendar.getInstance();
             calendar.add(Calendar.DATE, 7);
             UserDo userDo = userService.findById(notice.getSender()); // 发送人
-            UserDo userDo1 = userService.findById(notice.getAddressee()); //接收人
+
             notice.setUpdateTime(new Date());
             notice.setDeadline(calendar.getTime());
             notice.setUnit(userDo.getUnit());
             notice.setStatus(0);
 
-            noticeDao.save(notice);
             String data = "";
 
             if(notice.getType() == 2){
@@ -53,13 +52,20 @@ public class NoticeServiceImpl implements NoticeService {
             }else {
                 //如果是发送，就新增接收
 
+                String[] addressees = notice.getAddressee().split(",");
+                for (String addressee:addressees){
+                    notice.setAddressee(addressee);
+                    noticeDao.save(notice);
+
+                    UserDo userDo1 = userService.findById(addressee); //接收人
+
                     data = "[" +userDo.getUnit() + "][" + userDo.getDepartment() + "]的[" + userDo.getName()
                             + "]给[" + userDo1.getUnit() + "][" + userDo1.getDepartment() + "]的[" + userDo1.getName()
                             + "发送了关于[" + notice.getTitle() + "]的通知";
                     Notice notice1 = new Notice();
                     notice1.setType(0);
                     notice1.setTitle(notice.getTitle());
-                notice1.setAddressee(notice.getAddressee());
+                    notice1.setAddressee(addressee);
                     notice1.setDeadline(notice.getDeadline());
                     notice1.setFileList(notice.getFileList());
                     notice1.setMessage(notice.getMessage());
@@ -71,9 +77,11 @@ public class NoticeServiceImpl implements NoticeService {
                     noticeDao.save(notice1);
                     String data1 = "[" +userDo1.getUnit() + "][" + userDo1.getDepartment() + "]的[" + userDo1.getName()
                             + "]收到了来自[" + userDo.getUnit() + "][" + userDo.getDepartment() + "]的[" + userDo.getName()
-                        + "关于[" + notice.getTitle() + "的通知";
+                            + "]关于[" + notice.getTitle() + "的通知";
                     efsLogUtil.addLog(new EfsLog(null, userDo1.getId(), data1, new Date()));
                 }
+
+            }
             efsLogUtil.addLog(new EfsLog(null, userDo.getId(), data, new Date()));
             return true;
 
@@ -106,12 +114,6 @@ public class NoticeServiceImpl implements NoticeService {
             notice.setStatus(1);
             noticeDao.save(notice);
             String userId = "";
-            if (notice.getType() == 0){
-                //已接收
-                userId = notice.getAddressee();
-            }else {
-                userId = notice.getSender();
-            }
 
             if (notice.getType() == 0){
                 //已接收