xc

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

@@ -105,4 +105,12 @@ public class Notice {
     @Column(name = "file_list")
     private String fileList;
 
+    /**
+     * 附件列表
+     */
+    @ApiModelProperty(value = "unit", example = "", dataType = "String", name = "单位名称")
+    @Column(name = "unit")
+    private String unit;
+
+
 }

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

@@ -14,6 +14,7 @@ import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -28,8 +29,15 @@ public class NoticeServiceImpl implements NoticeService {
     @Override
     public boolean addNotice(Notice notice) {
         try{
+
+            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(new Date());
+            notice.setDeadline(calendar.getTime());
+            notice.setUnit(userDo.getUnit());
+
             noticeDao.save(notice);
 
             Notice notice1 = new Notice();
@@ -43,10 +51,10 @@ public class NoticeServiceImpl implements NoticeService {
             notice1.setSender(notice.getSender());
             notice1.setStatus(notice.getStatus());
             notice1.setUpdateTime(notice.getUpdateTime());
+            notice1.setUnit(notice.getUnit());
             noticeDao.save(notice1);
             System.out.println(notice.getSender() + notice.getAddressee());
-            UserDo userDo = userService.findById(notice.getSender()); // 发送人
-            UserDo userDo1 = userService.findById(notice.getAddressee()); //接收人
+
 
             String data = "[" +userDo.getUnit() + "][" + userDo.getDepartment() + "]的[" + userDo.getName()
                     + "]给[" + userDo1.getUnit() + "][" + userDo1.getDepartment() + "]的[" + userDo1.getName()