隐患管理

platform-rest/src/main/java/com/platform/rest/controller/hidden/HiddenDangerController.java

@@ -1,25 +1,26 @@
 package com.platform.rest.controller.hidden;
 
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.R;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.hidden.HiddenDangerDTO;
 import com.platform.dao.dto.upms.SysUserDTO;
 import com.platform.dao.entity.hidden.HiddenDanger;
-import com.platform.service.hidden.HiddenDangerService;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.hidden.ExportHiddenDangerVO;
 import com.platform.dao.vo.query.hidden.HiddenDangerVO;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
+import com.platform.rest.log.annotation.SysLog;
+import com.platform.service.hidden.HiddenDangerService;
 import com.platform.service.upms.SysUserService;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import lombok.AllArgsConstructor;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.rest.log.annotation.SysLog;
-import java.util.List;
+
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * @Description 隐患管理表 控制器
@@ -42,8 +43,8 @@ public class HiddenDangerController {
    * @return R
    */
   @GetMapping("/{id}")
-  public R<HiddenDanger> getById(@PathVariable("id") String id){
-      return new R<>(hiddenDangerService.getModelById(id));
+  public R<HiddenDangerVO> getById(@PathVariable("id") String id){
+      return new R<>(hiddenDangerService.getVOById(id));
   }
 
   /**

platform-service/src/main/java/com/platform/service/hidden/HiddenDangerService.java

@@ -40,4 +40,6 @@ public interface HiddenDangerService extends IBaseService<HiddenDanger, HiddenDa
      */
     void transferToRepair(HiddenDangerDTO model);
 
+    HiddenDangerVO getVOById(String id);
+
                                                                                                                                                                                                                                                     }

platform-service/src/main/java/com/platform/service/hidden/impl/HiddenDangerServiceImpl.java

@@ -106,6 +106,26 @@ public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper,
         mapper.updateByPrimaryKeySelective(updInfo);
     }
 
+    @Override
+    public HiddenDangerVO getVOById(String id) {
+        HiddenDangerVO vo = BeanConverterUtil.copyObjectProperties(mapper.selectByPrimaryKey(id),HiddenDangerVO.class);
+        // 获取整改前文件和图片
+        List<SysFile> sysFiles = sysFileService.getListByTargetAndType(id, null);
+        List<SysFile> beforeImageList = ListUtils.newArrayList();
+        List<SysFile> fileList = ListUtils.newArrayList();
+        sysFiles.forEach(item -> {
+            if (item.getType().equals(SysFileTypeEnum.HIDDEN_DANGER_BEFORE_IMGS.getValue())) {
+                beforeImageList.add(item);
+            }
+            if (item.getType().equals(SysFileTypeEnum.HIDDEN_DANGER_FILES.getValue())) {
+                fileList.add(item);
+            }
+        });
+        vo.setBeforeImageList(beforeImageList);
+        vo.setFileList(fileList);
+        return vo;
+    }
+
     @Override
     public AbstractPageResultBean<HiddenDanger> selectPageInfo(HiddenDangerDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);