Merge remote-tracking branch 'origin/dev_zhili'

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MyReportIcEvFormDTO.java

@@ -29,6 +29,8 @@ public class MyReportIcEvFormDTO extends PageFormDTO implements Serializable {
     }
     public interface RemoveRedGroup {
     }
-    @NotBlank(message = "事件id不能为空", groups = {ReplyListGroup.class,RemoveRedGroup.class})
+    public interface DetailGroup {
+    }
+    @NotBlank(message = "事件id不能为空", groups = {ReplyListGroup.class,RemoveRedGroup.class,DetailGroup.class})
     private String icEventId;
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -8,11 +8,9 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
-import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -346,6 +344,20 @@ public class IcEventController {
         return new Result<List<MyReportIcEvResDTO>>().ok(icEventService.myReport(formDTO).getList());
     }
 
+    /**
+     * 居民端我上报的事件， 消息列表跳转详情
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("myreport-detail")
+    public Result<MyReportIcEvResDTO> myReportDetail(@LoginUser TokenDto tokenDto, @RequestBody MyReportIcEvFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO, MyReportIcEvFormDTO.DetailGroup.class);
+        return new Result<MyReportIcEvResDTO>().ok(icEventService.myReportDetail(formDTO));
+    }
+
     /**
      * 居民端小程序我上报的事件详情页面-回复列表
      * http://yapi.elinkservice.cn/project/102/interface/api/7783

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java

@@ -208,4 +208,11 @@ public interface IcEventService extends BaseService<IcEventEntity> {
      * @param formDTO
      */
     void resiReply(ResiReplyIcEventFormDTO formDTO);
+
+    /**
+     * 居民端我上报的事件， 消息列表跳转详情
+     * @param formDTO
+     * @return
+     */
+    MyReportIcEvResDTO myReportDetail(MyReportIcEvFormDTO formDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -1454,6 +1454,56 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         icEventOperationLogService.insert(logEntity);
     }
 
+    /**
+     * 居民端我上报的事件， 消息列表跳转详情
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public MyReportIcEvResDTO myReportDetail(MyReportIcEvFormDTO formDTO) {
+        // 1.分页查询
+        List<MyReportIcEvResDTO> list=baseDao.selectMyReport(formDTO);
+        if (!CollectionUtils.isEmpty(list)) {
+            //封装数据
+            for (MyReportIcEvResDTO dto : list) {
+                //每个事件对应的图片数据
+                if (!CollectionUtils.isEmpty(dto.getAttachmentList())) {
+                    List<String> imageList = new ArrayList<>();
+                    List<IcEventAttachmentDTO> voiceList = new ArrayList<>();
+                    for (IcEventAttachmentDTO file : dto.getAttachmentList()) {
+                        if ("image".equals(file.getAttachmentType())) {
+                            imageList.add(file.getAttachmentUrl());
+                        } else if ("voice".equals(file.getAttachmentType())) {
+                            voiceList.add(file);
+                        }
+                    }
+                    dto.setImageList(imageList);
+                    dto.setVoiceList(voiceList);
+                }
+
+                //分类信息
+                if(StringUtils.isNotBlank(dto.getCategoryId())){
+                    List<String> categoryList = new ArrayList<>();
+                    categoryList.add(dto.getCategoryId());
+                    CategoryTagResultDTO category = queryCategory(formDTO.getCustomerId(), categoryList);
+                    for (IssueProjectCategoryDictDTO ca : category.getCategoryList()){
+                        if (ca.getId().equals(dto.getCategoryId())) {
+                            if(StringUtils.isNotBlank(ca.getParentCategoryName())){
+                                //大类-子类
+                                dto.setCategoryName(ca.getParentCategoryName().concat(StrConstant.HYPHEN).concat(ca.getCategoryName()));
+                            }else{
+                                dto.setCategoryName(ca.getCategoryName());
+                            }
+                        }
+                    }
+                }
+
+            }
+        }
+        return list.get(NumConstant.ZERO);
+    }
+
     private IcEventEntity checkReply(String icEventId) {
         //：0:已回复 1:已转项目  1:已转需求
         IcEventEntity entity = baseDao.selectById(icEventId);