|
@@ -90,7 +90,7 @@ func (this *MorningMeetingController) List() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- condition += ` ORDER BY publish_time DESC `
|
|
|
+ condition += ` ORDER BY meeting_time DESC ,id DESC `
|
|
|
resp := new(cygx.CygxMorningMeetingReviewsList)
|
|
|
list, err := cygx.GetCygxMorningMeetingReviewsList(condition, pars, startSize, pageSize)
|
|
|
if err != nil {
|
|
@@ -109,6 +109,7 @@ func (this *MorningMeetingController) List() {
|
|
|
Status: item.Status,
|
|
|
PartNums: item.PartNums,
|
|
|
IndustryNames: item.IndustryNames,
|
|
|
+ OpUserName: item.OpUserName,
|
|
|
}
|
|
|
if item.Status == 1 {
|
|
|
respItem.PublishTime = item.PublishTime.Local().Format(utils.FormatDateTime)
|
|
@@ -165,19 +166,26 @@ func (this *MorningMeetingController) PreserveAndPublish() {
|
|
|
}
|
|
|
industryNames := strings.Join(industryNameslice, ",")
|
|
|
|
|
|
- if reqList.MeetingId <= 0 {
|
|
|
- //先新增主表
|
|
|
- reviewItem := cygx.CygxMorningMeetingReviews{
|
|
|
- MeetingTime: meetingTime,
|
|
|
- CreateTime: time.Now(),
|
|
|
- ModifyTime: time.Now(),
|
|
|
- PartNums: len(reqList.List),
|
|
|
- IndustryNames: industryNames,
|
|
|
- }
|
|
|
+ //先新增主表
|
|
|
+ reviewItem := cygx.CygxMorningMeetingReviews{
|
|
|
+ MeetingTime: meetingTime,
|
|
|
+ CreateTime: time.Now(),
|
|
|
+ ModifyTime: time.Now(),
|
|
|
+ PartNums: len(reqList.List),
|
|
|
+ IndustryNames: industryNames,
|
|
|
+ OpUserId: sysUser.AdminId,
|
|
|
+ OpUserName: sysUser.RealName,
|
|
|
+ }
|
|
|
+ if reqList.DoType == 1 {
|
|
|
+ reviewItem.Status = 2
|
|
|
+ }
|
|
|
|
|
|
+ if reqList.MeetingId <= 0 {
|
|
|
if reqList.DoType == 1 {
|
|
|
- reviewItem.PublishTime = time.Now()
|
|
|
- reviewItem.Status = 1
|
|
|
+ //reviewItem.PublishTime = time.Now()
|
|
|
+ //reviewItem.Status = 2
|
|
|
+ } else {
|
|
|
+ reviewItem.Status = 5
|
|
|
}
|
|
|
|
|
|
meetingId, err := cygx.AddCygxMorningMeetingReviews(&reviewItem)
|
|
@@ -254,10 +262,10 @@ func (this *MorningMeetingController) PreserveAndPublish() {
|
|
|
br.Msg = "保存成功"
|
|
|
br.Data = meetingId
|
|
|
} else {
|
|
|
- for _, item := range reqList.List {
|
|
|
- go services.SendWxMsgWithCygxMorningMeeting(int(meetingId), item.IndustryId, item.IndustryName)
|
|
|
- go cygxService.UpdateIndustrialManagementTimeLineDateList3ByRedis(item.IndustryId) //处理产业管理时间线相关内容的数据
|
|
|
- }
|
|
|
+ //for _, item := range reqList.List {
|
|
|
+ //go services.SendWxMsgWithCygxMorningMeeting(int(meetingId), item.IndustryId, item.IndustryName)
|
|
|
+ // go cygxService.UpdateIndustrialManagementTimeLineDateList3ByRedis(item.IndustryId) //处理产业管理时间线相关内容的数据
|
|
|
+ //}
|
|
|
//添加到首页最新
|
|
|
listchapter, err := cygx.GetCygxMorningMeetingReviewsListById(int(meetingId))
|
|
|
if err != nil {
|
|
@@ -267,8 +275,9 @@ func (this *MorningMeetingController) PreserveAndPublish() {
|
|
|
}
|
|
|
for _, itemchapter := range listchapter {
|
|
|
//go cygxService.UpdateResourceData(itemchapter.Id, "meetingreviewchapt", "add", time.Now().Format(utils.FormatDateTime))
|
|
|
- go cygxService.UpdateMeetingreviewchaptResourceData(itemchapter.Id) //写入首页最新 cygx_resource_data 表
|
|
|
- go elastic.AddComprehensiveMeetingreviewchapt(itemchapter.Id) //Es添加晨会精华
|
|
|
+ //go cygxService.UpdateMeetingreviewchaptResourceData(itemchapter.Id) //写入首页最新 cygx_resource_data 表
|
|
|
+ //go elastic.AddComprehensiveMeetingreviewchapt(itemchapter.Id) //Es添加晨会精华
|
|
|
+ go cygxService.AddCygxMorningMeetingReviewLog(itemchapter, "提交审核", sysUser.RealName, sysUser.AdminId, 2) //添加晨会精华日志信息,并发送模版消息
|
|
|
}
|
|
|
br.Msg = "发布成功"
|
|
|
br.Data = meetingId
|
|
@@ -285,22 +294,14 @@ func (this *MorningMeetingController) PreserveAndPublish() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- reviewItem := cygx.CygxMorningMeetingReviews{
|
|
|
- Id: reqList.MeetingId,
|
|
|
- MeetingTime: meetingTime,
|
|
|
- ModifyTime: time.Now(),
|
|
|
- PartNums: len(reqList.List),
|
|
|
- IndustryNames: industryNames,
|
|
|
- }
|
|
|
-
|
|
|
if reqList.DoType == 1 {
|
|
|
- reviewItem.PublishTime = time.Now()
|
|
|
- reviewItem.Status = 1
|
|
|
+ //reviewItem.PublishTime = time.Now()
|
|
|
+ //reviewItem.Status = 2
|
|
|
} else {
|
|
|
- reviewItem.PublishTime = reviewInfo.PublishTime
|
|
|
+ //reviewItem.PublishTime = reviewInfo.PublishTime
|
|
|
reviewItem.Status = reviewInfo.Status
|
|
|
}
|
|
|
-
|
|
|
+ reviewItem.Id = reqList.MeetingId
|
|
|
err = cygx.UpdateCygxMorningMeetingReviews(&reviewItem)
|
|
|
if err != nil {
|
|
|
br.Msg = "更新晨报点评失败!"
|
|
@@ -439,13 +440,14 @@ func (this *MorningMeetingController) PreserveAndPublish() {
|
|
|
if reqList.DoType == 0 {
|
|
|
br.Msg = "保存成功"
|
|
|
} else {
|
|
|
- for _, item := range reqList.List {
|
|
|
- go services.SendWxMsgWithCygxMorningMeeting(reqList.MeetingId, item.IndustryId, item.IndustryName)
|
|
|
- go cygxService.UpdateIndustrialManagementTimeLineDateList3ByRedis(item.IndustryId) //处理产业管理时间线相关内容的数据
|
|
|
- }
|
|
|
+ //for _, item := range reqList.List {
|
|
|
+ // go services.SendWxMsgWithCygxMorningMeeting(reqList.MeetingId, item.IndustryId, item.IndustryName)
|
|
|
+ // go cygxService.UpdateIndustrialManagementTimeLineDateList3ByRedis(item.IndustryId) //处理产业管理时间线相关内容的数据
|
|
|
+ //}
|
|
|
for _, itemchapter := range listchapter {
|
|
|
//go cygxService.UpdateResourceData(itemchapter.Id, "meetingreviewchapt", "add", time.Now().Format(utils.FormatDateTime))
|
|
|
- go cygxService.UpdateMeetingreviewchaptResourceData(itemchapter.Id) //写入首页最新 cygx_resource_data 表
|
|
|
+ //go cygxService.UpdateMeetingreviewchaptResourceData(itemchapter.Id) //写入首页最新 cygx_resource_data 表
|
|
|
+ go cygxService.AddCygxMorningMeetingReviewLog(itemchapter, "提交审核", sysUser.RealName, sysUser.AdminId, 2) //添加晨会精华日志信息,并发送模版消息
|
|
|
}
|
|
|
br.Msg = "发布成功"
|
|
|
}
|
|
@@ -882,3 +884,77 @@ func MorningMeetingHistoryListExport(this *MorningMeetingController, resp cygx.C
|
|
|
br.Success = true
|
|
|
br.Msg = "导出成功"
|
|
|
}
|
|
|
+
|
|
|
+// @Title 提交审核与撤回审核接口
|
|
|
+// @Description 提交审核与撤回审核接口
|
|
|
+// @Param request body cygx.MorningReviewApproveSubmiteq true "type json string"
|
|
|
+// @Success 200 Ret=200 取消发布成功
|
|
|
+// @router /morningMeeting/approve/submit [post]
|
|
|
+func (this *MorningMeetingController) ApproveSubmitReport() {
|
|
|
+ br := new(models.BaseResponse).Init()
|
|
|
+ defer func() {
|
|
|
+ this.Data["json"] = br
|
|
|
+ this.ServeJSON()
|
|
|
+ }()
|
|
|
+ sysUser := this.SysUser
|
|
|
+ if sysUser == nil {
|
|
|
+ br.Msg = "请登录"
|
|
|
+ br.ErrMsg = "请登录,SysUser Is Empty"
|
|
|
+ br.Ret = 408
|
|
|
+ return
|
|
|
+ }
|
|
|
+ var req cygx.MorningReviewApproveSubmiteq
|
|
|
+ err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "参数解析异常!"
|
|
|
+ br.ErrMsg = "参数解析失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ reviewId := req.ReviewId
|
|
|
+ status := req.Status
|
|
|
+ if reviewId <= 0 {
|
|
|
+ br.Msg = "参数错误"
|
|
|
+ br.ErrMsg = "参数错误,晨会id不可为空"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if status != 2 && status != 4 {
|
|
|
+ br.Msg = "操作失败"
|
|
|
+ br.ErrMsg = "发布状态错误"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ var operate string
|
|
|
+ if status == 2 {
|
|
|
+ operate = "提交审核"
|
|
|
+ } else {
|
|
|
+ operate = "撤回"
|
|
|
+ }
|
|
|
+
|
|
|
+ //reviewInfo, err := cygx.GetMorningMeetingReviewById(reviewId)
|
|
|
+ //if err != nil {
|
|
|
+ // br.Msg = "取消发布失败"
|
|
|
+ // br.ErrMsg = "取消发布失败,Err:" + err.Error()
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+
|
|
|
+ //添加到首页最新
|
|
|
+ listchapter, err := cygx.GetCygxMorningMeetingReviewsListById(reviewId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ err = cygx.UpdateMorningMeetingReviewStatusById(status, reviewId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "操作失败"
|
|
|
+ br.ErrMsg = "操作失败失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ for _, itemchapter := range listchapter {
|
|
|
+ go cygxService.AddCygxMorningMeetingReviewLog(itemchapter, operate, sysUser.RealName, sysUser.AdminId, status) //添加晨会精华日志信息,并发送模版消息
|
|
|
+ }
|
|
|
+
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = operate + "成功"
|
|
|
+}
|