fix bug1021027

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/biz/impl/TaskCompletedBizImpl.java

 package com.pcloud.book.timecontrol.biz.impl;
 
+import com.pcloud.book.consumer.content.ResourceConsr;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
+import com.pcloud.book.keywords.enums.ReplyTypeEnum;
 import com.pcloud.book.timecontrol.biz.TaskBiz;
 import com.pcloud.book.timecontrol.biz.TaskCompletedBiz;
 import com.pcloud.book.timecontrol.biz.TaskSubscribeBiz;
-import com.pcloud.book.timecontrol.dto.*;
+import com.pcloud.book.timecontrol.dto.ReplyMessageDto;
+import com.pcloud.book.timecontrol.dto.SubscribeTaskUserDTO;
+import com.pcloud.book.timecontrol.dto.TaskCompletedDto;
+import com.pcloud.book.timecontrol.dto.TaskItemSendDto;
+import com.pcloud.book.timecontrol.dto.TaskProgressDTO;
+import com.pcloud.book.timecontrol.dto.TaskProgressItemDTO;
+import com.pcloud.book.timecontrol.dto.TaskSendUserDto;
+import com.pcloud.book.timecontrol.dto.TodayTaskSendDto;
 import com.pcloud.book.timecontrol.entity.TimeControlTask;
 import com.pcloud.book.timecontrol.entity.TimeControlTaskPrize;
-import com.pcloud.book.timecontrol.mapper.*;
+import com.pcloud.book.timecontrol.mapper.TaskPrizeMapper;
+import com.pcloud.book.timecontrol.mapper.TimeControlReplyMessageMapper;
+import com.pcloud.book.timecontrol.mapper.TimeControlTaskItemMapper;
+import com.pcloud.book.timecontrol.mapper.TimeControlTaskMapper;
+import com.pcloud.book.timecontrol.mapper.TimeControlTaskSendMapper;
+import com.pcloud.book.timecontrol.mapper.TimeControlTaskSubscribeMapper;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.string.StringUtil;
+import com.pcloud.contentcenter.resource.dto.ResourceDTO;
 import com.pcloud.labelcenter.label.service.LabelService;
 import com.pcloud.wechatgroup.group.dto.GroupUserDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -60,6 +76,8 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
     private TaskPrizeMapper taskPrizeMapper;
     //@Autowired
     //private PcloudKeywordService pcloudKeywordService;
+    @Autowired
+    private ResourceConsr resourceConsr;
 
 
     @Override
@@ -166,6 +184,22 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
             }
             if (MapUtils.isNotEmpty(replyMap) && replyMap.containsKey(taskItemSendDto.getTaskItemId())) {
                 List<ReplyMessageDto> replyMessageDtoList = replyMap.get(taskItemSendDto.getTaskItemId());
+                if (!ListUtils.isEmpty(replyMessageDtoList)) {
+                    replyMessageDtoList.forEach(message -> {
+                        if (ReplyTypeEnum.RESOURCE.value.equals(message.getReplyType())) {
+                            Long resourceId = message.getResourceId();
+                            Map<Long, ResourceDTO> map = resourceConsr.mapByIds(Arrays.asList(resourceId));
+                            ResourceDTO resourceDTO = map.get(resourceId);
+                            if (resourceDTO != null) {
+                                message.setResourceName(resourceDTO.getResourceName());
+                                message.setResourceUrl(resourceDTO.getFileUrl());
+                                message.setFileType(resourceDTO.getFileType());
+                                message.setFileSize(resourceDTO.getFileSize());
+                                message.setResourceTypeCode(resourceDTO.getTypeCode());
+                            }
+                        }
+                    });
+                }
                 taskItemSendDto.setReplyMessageList(replyMessageDtoList);
             }
         }

pcloud-service-book/src/main/resources/mapper/timecontrol/TimeControlReplyMessageMapper.xml

@@ -82,7 +82,7 @@
     description description,
     content content,
     link_url linkUrl,
-    reply_type replyType, file_type fileType, size
+    reply_type replyType
     from time_control_reply_message
     where  type = #{type}
     <if test="taskItemIds !=null and taskItemIds.size()>0">

pcloud-service-book/src/main/resources/mapper/timecontrol/TimeControlTaskSendMapper.xml

@@ -130,7 +130,7 @@
       and b.task_name like concat('%', #{taskName}, '%')
     </if>
     <if test="sendContent !=null">
-      and d.text like concat('%', #{sendContent}, '%')
+      and d.content like concat('%', #{sendContent}, '%')
     </if>
     group by
     a.task_item_id,c.robot_wx_id
@@ -165,7 +165,7 @@
       and b.task_name like concat('%', #{taskName}, '%')
     </if>
     <if test="sendContent !=null">
-      and d.text like concat('%', #{sendContent}, '%')
+      and d.content like concat('%', #{sendContent}, '%')
     </if>
     GROUP BY
     a.task_item_id,c.robot_wx_id