|
@@ -7,8 +7,6 @@
|
|
|
package services
|
|
|
|
|
|
import (
|
|
|
- "strconv"
|
|
|
-
|
|
|
"go.mod/comm"
|
|
|
"go.mod/conf"
|
|
|
"go.mod/dao"
|
|
@@ -18,7 +16,7 @@ import (
|
|
|
|
|
|
//定义项目Service接口
|
|
|
type ProjectMessageService interface {
|
|
|
- GetAll(projectId int, accountId int) []*viewmodels.ProjectMessage
|
|
|
+ GetAll(projectId int, accountId int) []*viewmodels.ProjectMessageVM
|
|
|
}
|
|
|
|
|
|
//返回service操作类
|
|
@@ -34,17 +32,17 @@ func NewProjectMessageService() ProjectMessageService {
|
|
|
}
|
|
|
|
|
|
// 获得需要关注人
|
|
|
-func (s *projectMessageService) GetAll(projectId int, accountId int) []*viewmodels.ProjectMessage {
|
|
|
+func (s *projectMessageService) GetAll(projectId int, accountId int) []*viewmodels.ProjectMessageVM {
|
|
|
dataList := s.projectMessagedao.GetAll(projectId, accountId)
|
|
|
|
|
|
- projectMessageVM := make([]*viewmodels.ProjectMessage, 0)
|
|
|
+ projectMessageVM := make([]*viewmodels.ProjectMessageVM, 0)
|
|
|
for _, item := range dataList {
|
|
|
- viewProjectMessage := &viewmodels.ProjectMessage{}
|
|
|
- id, _ := comm.AesEncrypt(strconv.Itoa(item.Id), conf.SignSecret)
|
|
|
- projectId, _ := comm.AesEncrypt(strconv.Itoa(item.ProjectId), conf.SignSecret)
|
|
|
- bidsectionId, _ := comm.AesEncrypt(strconv.Itoa(item.BidsectionId), conf.SignSecret)
|
|
|
- accountId, _ := comm.AesEncrypt(strconv.Itoa(item.AccountId), conf.SignSecret)
|
|
|
- dataId, _ := comm.AesEncrypt(strconv.Itoa(item.DataId), conf.SignSecret)
|
|
|
+ viewProjectMessage := &viewmodels.ProjectMessageVM{}
|
|
|
+ id, _ := comm.AesEncrypt(item.Id, conf.SignSecret)
|
|
|
+ projectId, _ := comm.AesEncrypt(item.ProjectId, conf.SignSecret)
|
|
|
+ bidsectionId, _ := comm.AesEncrypt(item.BidsectionId, conf.SignSecret)
|
|
|
+ accountId, _ := comm.AesEncrypt(item.AccountId, conf.SignSecret)
|
|
|
+ dataId, _ := comm.AesEncrypt(item.DataId, conf.SignSecret)
|
|
|
|
|
|
viewProjectMessage.Id = id
|
|
|
viewProjectMessage.ProjectId = projectId
|
|
@@ -54,7 +52,8 @@ func (s *projectMessageService) GetAll(projectId int, accountId int) []*viewmode
|
|
|
viewProjectMessage.DataId = dataId
|
|
|
viewProjectMessage.Title = item.Title
|
|
|
viewProjectMessage.Content = item.Content
|
|
|
- viewProjectMessage.CreateTime = item.CreateTime.Format(conf.SysTimeform)
|
|
|
+ viewProjectMessage.CreateTime = item.CreateTime
|
|
|
+ viewProjectMessage.BidsectionName = item.BidsectionName
|
|
|
|
|
|
projectMessageVM = append(projectMessageVM, viewProjectMessage)
|
|
|
}
|