档案管理接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java

@@ -1,16 +1,13 @@
 package com.elink.esua.epdc.controller;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.result.*;
-import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
 import com.elink.esua.epdc.service.CustomService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -50,4 +47,42 @@ public class ApiCustomInfoController {
     public Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO) {
         return customService.listDeptInfo(formDTO);
     }
+
+
+    /**
+     * @Description  获取有档案的归属部门列表
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     **/
+    @GetMapping("archive/depts")
+    public Result<List<ArchiveDeptResultDTO>> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO) {
+        return customService.listArchiveDeptInfo(formDTO);
+    }
+
+    /**
+     * @Description 获取档案列表
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     **/
+    @GetMapping("archive/list")
+    public Result<List<ArchiveResultDTO>> listArchivesInfo(ArchiveFormDTO formDTO) {
+        return customService.listArchivesInfo(formDTO);
+    }
+
+
+    /**
+     * @Description 获取档案详情
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     **/
+    @GetMapping("archive/detail/{id}")
+    public Result<ArchiveDetailResultDTO> getArchiveDetail(@PathVariable("id") String id) {
+        return customService.getArchiveDetail(id);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@@ -2,14 +2,16 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.result.*;
-import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
 import com.elink.esua.epdc.feign.fallback.CustomFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
@@ -51,4 +53,13 @@ public interface CustomFeignClient {
 	 **/
 	@GetMapping(value = "custom/epdc-app/deptinfo/list", consumes = MediaType.APPLICATION_JSON_VALUE)
 	Result<List<EpdcDeptInfoResultDTO>> selectListDeptInfo(EpdcDeptInfoFormDTO formDTO);
+
+    @GetMapping(value = "custom/archive/depts", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<ArchiveDeptResultDTO>> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO);
+
+    @GetMapping(value = "custom/archive/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<ArchiveResultDTO>> listArchivesInfo(ArchiveFormDTO formDTO);
+
+    @GetMapping(value = "custom/archive/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<ArchiveDetailResultDTO> getArchiveDetail(@PathVariable("id") String id);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java

@@ -3,10 +3,11 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.result.*;
-import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
 import com.elink.esua.epdc.feign.CustomFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -34,4 +35,19 @@ public class CustomFeignClientFallback implements CustomFeignClient {
 	public Result<List<EpdcDeptInfoResultDTO>> selectListDeptInfo(EpdcDeptInfoFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "selectListDeptInfo", formDTO);
 	}
+
+    @Override
+    public Result<List<ArchiveDeptResultDTO>> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "listArchiveDeptInfo", formDTO);
+    }
+
+    @Override
+    public Result<List<ArchiveResultDTO>> listArchivesInfo(ArchiveFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "listArchivesInfo", formDTO);
+    }
+
+    @Override
+    public Result<ArchiveDetailResultDTO> getArchiveDetail(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getArchiveDetail", id);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java

@@ -1,13 +1,12 @@
 package com.elink.esua.epdc.service;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.result.*;
-import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 
@@ -54,4 +53,29 @@ public interface CustomService {
 	 * @Date 13:41 2020-05-20
 	 **/
 	Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO);
+
+    /**
+     * @Description  获取有档案的归属部门列表
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     **/
+    Result<List<ArchiveDeptResultDTO>> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO);
+    /**
+     * @Description  获取档案列表
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     **/
+    Result<List<ArchiveResultDTO>> listArchivesInfo(ArchiveFormDTO formDTO);
+    /**
+     * @Description  获取档案详情
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [id]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.ArchiveDetailResultDTO>
+     **/
+    Result<ArchiveDetailResultDTO> getArchiveDetail(String id);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java

@@ -1,14 +1,14 @@
 package com.elink.esua.epdc.service.impl;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptOption;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.result.*;
-import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.CustomFeignClient;
 import com.elink.esua.epdc.redis.AppUserRedis;
@@ -93,4 +93,19 @@ public class CustomServiceImpl implements CustomService {
 	public Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO) {
 		return customFeignClient.selectListDeptInfo(formDTO);
 	}
+
+    @Override
+    public Result<List<ArchiveDeptResultDTO>> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO) {
+        return customFeignClient.listArchiveDeptInfo(formDTO);
+    }
+
+    @Override
+    public Result<List<ArchiveResultDTO>> listArchivesInfo(ArchiveFormDTO formDTO) {
+        return customFeignClient.listArchivesInfo(formDTO);
+    }
+
+    @Override
+    public Result<ArchiveDetailResultDTO> getArchiveDetail(String id) {
+        return customFeignClient.getArchiveDetail(id);
+    }
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/ArchiveDeptFormDTO.java

@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+/**
+ * 档案管理 归属部门
+ *
+ * @author songyunpeng
+ * @since v1.0.0 2020-05-20
+ */
+@Data
+public class ArchiveDeptFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/ArchiveFormDTO.java

@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+/**
+ * 档案列表
+ *
+ * @author songyunpeng
+ * @since v1.0.0 2020-05-20
+ */
+@Data
+public class ArchiveFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 搜索内容
+     */
+    private String searchContent;
+
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ArchiveDeptResultDTO.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 档案管理 归属部门
+ *
+ * @author songyunpeng
+ * @since v1.0.0 2020-05-20
+ */
+@Data
+public class ArchiveDeptResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 部门名称
+     */
+    private String dept;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ArchiveDetailResultDTO.java

@@ -0,0 +1,60 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 档案详情
+ *
+ * @author songyunpeng
+ * @since v1.0.0 2020-05-20
+ */
+@Data
+public class ArchiveDetailResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 档号
+     */
+    private String archivesNum;
+
+    /**
+     * 文号
+     */
+    private String docNum;
+
+    /**
+     * 题名
+     */
+    private String title;
+
+    /**
+     * 归档日期
+     */
+    private Date archiveTime;
+
+    /**
+     * 页数
+     */
+    private Integer pageSize;
+
+    /**
+     * 责任人
+     */
+    private String responsible;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ArchiveResultDTO.java

@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 档案列表
+ *
+ * @author songyunpeng
+ * @since v1.0.0 2020-05-20
+ */
+@Data
+public class ArchiveResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 档案ID
+     */
+    private String id;
+
+    /**
+     * 档号
+     */
+    private String archivesNum;
+
+    /**
+     * 题名
+     */
+    private String title;
+
+    /**
+     * 归档时间
+     */
+    private String archiveTime;
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/controller/EpdcAppArchivesController.java

@@ -0,0 +1,66 @@
+package com.elink.esua.epdc.modules.archives.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
+import com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO;
+import com.elink.esua.epdc.dto.result.ArchiveDetailResultDTO;
+import com.elink.esua.epdc.dto.result.ArchiveResultDTO;
+import com.elink.esua.epdc.modules.archives.service.ArchivesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author songyunpeng
+ * @Description 小程序端接口
+ * @create 2020-07-07
+ */
+@RestController
+@RequestMapping("archive")
+public class EpdcAppArchivesController {
+
+    @Autowired
+    private ArchivesService archivesService;
+
+
+    /**
+     * @Description  获取有档案的归属部门列表 
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     **/
+    @GetMapping("depts")
+    public Result<List<ArchiveDeptResultDTO>> listArchiveDeptInfo(@RequestBody ArchiveDeptFormDTO formDTO) {
+        return archivesService.listArchiveDeptInfo(formDTO);
+    }
+
+    /**
+     * @Description 获取档案列表
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     **/
+    @GetMapping("list")
+    public Result<List<ArchiveResultDTO>> listArchivesInfo(@RequestBody ArchiveFormDTO formDTO) {
+        return archivesService.listArchivesInfo(formDTO);
+    }
+
+
+    /**
+     * @Description 获取档案详情
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     **/
+    @GetMapping("detail/{id}")
+    public Result<ArchiveDetailResultDTO> getArchiveDetail(@PathVariable("id") String id) {
+        return archivesService.getArchiveDetail(id);
+    }
+
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/dao/ArchivesDao.java

@@ -19,6 +19,11 @@ package com.elink.esua.epdc.modules.archives.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.ArchivesDTO;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
+import com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO;
+import com.elink.esua.epdc.dto.result.ArchiveDetailResultDTO;
+import com.elink.esua.epdc.dto.result.ArchiveResultDTO;
 import com.elink.esua.epdc.modules.archives.entity.ArchivesEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -49,4 +54,29 @@ public interface ArchivesDao extends BaseDao<ArchivesEntity> {
      * @return boolean
      **/
     boolean getArchivesDTOByArchivesNum(String id, String archivesNum);
+    /**
+     * @Description  获取有档案的归属部门列表
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>
+     **/
+    List<ArchiveDeptResultDTO> selectListArchiveDeptInfo(ArchiveDeptFormDTO formDTO);
+    /**
+     * @Description  根据部门和搜索内容获取 档案列表
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return java.util.List<com.elink.esua.epdc.dto.result.ArchiveResultDTO>
+     **/
+    List<ArchiveResultDTO> selectListArchiveInfo(ArchiveFormDTO formDTO);
+
+    /**
+     * @Description  获取详情
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return java.util.List<com.elink.esua.epdc.dto.result.ArchiveResultDTO>
+     **/
+    ArchiveDetailResultDTO selectArchiveDetailInfo(String id);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/ArchivesService.java

@@ -21,6 +21,11 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ArchivesDTO;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
+import com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO;
+import com.elink.esua.epdc.dto.result.ArchiveDetailResultDTO;
+import com.elink.esua.epdc.dto.result.ArchiveResultDTO;
 import com.elink.esua.epdc.modules.archives.entity.ArchivesEntity;
 import com.elink.esua.epdc.modules.archives.excel.ArchivesExcel;
 import org.springframework.web.multipart.MultipartFile;
@@ -119,4 +124,28 @@ public interface ArchivesService extends BaseService<ArchivesEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result insertArchivesList(MultipartFile file, String deptId);
+    /**
+     * @Description  获取有档案的归属部门列表 
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     **/
+    Result<List<ArchiveDeptResultDTO>> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO);
+    /**
+     * @Description  获取档案列表 
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     **/
+    Result<List<ArchiveResultDTO>> listArchivesInfo(ArchiveFormDTO formDTO);
+    /**
+     * @Description  获取档案详情 
+     * @Author songyunpeng
+     * @Date  2020/7/7
+     * @Param [id]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.ArchiveDetailResultDTO>
+     **/
+    Result<ArchiveDetailResultDTO> getArchiveDetail(String id);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/impl/ArchivesServiceImpl.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@@ -32,6 +33,11 @@ import com.elink.esua.epdc.config.StreamUtils;
 import com.elink.esua.epdc.dto.ArchivesDTO;
 import com.elink.esua.epdc.dto.EpdcArchivesErroyResultDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
+import com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO;
+import com.elink.esua.epdc.dto.result.ArchiveDetailResultDTO;
+import com.elink.esua.epdc.dto.result.ArchiveResultDTO;
 import com.elink.esua.epdc.modules.archives.dao.ArchivesDao;
 import com.elink.esua.epdc.modules.archives.entity.ArchivesEntity;
 import com.elink.esua.epdc.modules.archives.excel.ArchivesExcel;
@@ -208,8 +214,33 @@ public class ArchivesServiceImpl extends BaseServiceImpl<ArchivesDao, ArchivesEn
         }
         return new Result();
     }
+
+    @Override
+    public Result<List<ArchiveDeptResultDTO>> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageIndex(pageIndex);
+
+        List<ArchiveDeptResultDTO> listArchiveDeptInfo  = this.baseDao.selectListArchiveDeptInfo(formDTO);
+        return new Result().ok(listArchiveDeptInfo);
+    }
+
+    @Override
+    public Result<List<ArchiveResultDTO>> listArchivesInfo(ArchiveFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageIndex(pageIndex);
+
+        List<ArchiveResultDTO> listArchiveInfo  = this.baseDao.selectListArchiveInfo(formDTO);
+        return new Result().ok(listArchiveInfo);
+    }
+
+    @Override
+    public Result<ArchiveDetailResultDTO> getArchiveDetail(String id) {
+        ArchiveDetailResultDTO archiveDetailResultDTO = this.baseDao.selectArchiveDetailInfo(id);
+        return new Result<ArchiveDetailResultDTO>().ok(archiveDetailResultDTO);
+    }
+
     /***
-     * 批量添加大档案
+     * 批量添加档案
      * @return java.lang.String
      * @author songyunpeng
      * @date 2020/7/6 10:25

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml

@@ -64,6 +64,8 @@
         </if>
         order by CREATED_TIME desc,ARCHIVE_TIME desc
     </select>
+
+
     <select id="getArchivesDTOByArchivesNum" resultType="java.lang.Boolean">
         select count(id) from epdc_archives where DEL_FLAG ='0'
         <if test="id!=null and id!=''">
@@ -73,4 +75,38 @@
     </select>
 
 
+    <select id="selectListArchiveDeptInfo" resultType="com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO">
+        select DEPT,DEPT_ID from epdc_archives where DEL_FLAG = '0' group by DEPT_ID LIMIT #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="selectListArchiveInfo" resultType="com.elink.esua.epdc.dto.result.ArchiveResultDTO">
+        select
+            ID,ARCHIVES_NUM,TITLE,ARCHIVE_TIME
+        from epdc_archives
+        where DEL_FLAG = '0'
+        <if test="searchContent != null and searchContent != ''">
+            AND title like concat('%', #{searchContent}, '%')
+        </if>
+        <if test="deptId != null and deptId != ''">
+            AND DEPT_ID = #{deptId}
+        </if>
+        order by ARCHIVE_TIME desc
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
+    <select id="selectArchiveDetailInfo" resultType="com.elink.esua.epdc.dto.result.ArchiveDetailResultDTO">
+        select
+            ID,
+           ARCHIVES_NUM,
+           DOC_NUM,
+           TITLE,
+           ARCHIVE_TIME,
+           PAGE_SIZE,
+           RESPONSIBLE,
+           REMARK
+        from epdc_archives
+        WHERE
+        DEL_FLAG = '0' and id = #{id}
+    </select>
+
+
 </mapper>