Merge branch 'feature/xgh/202507迭代' into 'developer'

任务通知

See merge request !3089

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TaskNoticeController.java

@@ -6,13 +6,20 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.HaobanTaskNoticeDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDTO;
 import com.gic.haoban.manage.api.service.HaobanTaskNoticeApiService;
+import com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService;
+import com.gic.haoban.manage.api.service.moment.QwMomentApiService;
 import com.gic.haoban.manage.web.log.LogRecordUserServiceImpl;
 import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
+import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -27,7 +34,12 @@ public class TaskNoticeController {
 
     private static Logger logger = LogManager.getLogger(TaskNoticeController.class);
 
+    @Autowired
     private HaobanTaskNoticeApiService taskNoticeApiService;
+    @Autowired
+    private QwMomentApiService qwMomentApiService;
+    @Autowired
+    private GroupChatPlanApiService groupChatPlanApiService;
 
     /**
      * 是否需要提醒 3社群 4朋友圈
@@ -52,6 +64,7 @@ public class TaskNoticeController {
     public RestResponse<String> momentSave(@RequestBody HaobanTaskNoticeDTO dto){
         ServiceResponse<Void> resp = this.save(dto,4) ;
         if(!resp.isSuccess()) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999",resp.getMessage()) ;
         }
         return RestResponse.successResult()  ;
@@ -69,6 +82,7 @@ public class TaskNoticeController {
     public RestResponse<String> chatSave(@RequestBody HaobanTaskNoticeDTO dto){
         ServiceResponse<Void> resp = this.save(dto,3) ;
         if(!resp.isSuccess()) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("9999",resp.getMessage()) ;
         }
         return RestResponse.successResult()  ;
@@ -81,6 +95,21 @@ public class TaskNoticeController {
         dto.setCreatorId(loginUser.getClerkId());
         dto.setPlanType(type);
         ServiceResponse<Void> resp = this.taskNoticeApiService.save(dto) ;
+        //活动名称-活动id下发任务提醒，提醒说明：这是提醒说明；（无提醒说明时，不显示提醒说明，例：6月新品-245675643456554下发任务提醒）
+        String name = "";
+        if(type==3) {
+            ServiceResponse<GroupChatPlanDTO> detail = this.groupChatPlanApiService.detail(Long.valueOf(dto.getPlanId())) ;
+            name = detail.getResult().getName() + "-" + dto.getPlanId() ;
+        }
+        if(type==4) {
+            ServiceResponse<QwMomentPlanDTO> detail = this.qwMomentApiService.detail(Long.valueOf(dto.getPlanId())) ;
+            name = detail.getResult().getTitle() + "-" + dto.getPlanId() ;
+        }
+        name = name +"下发任务提醒" ;
+        if(StringUtils.isNotBlank(dto.getRemark())) {
+            name = name + "，提醒说明：" + dto.getRemark()  ;
+        }
+        GicLogRecordEvaluationContext.putAttribute("logValue", name);
         return resp ;
     }