diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java index c0f86814..1534ad1a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java +++ b/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.EpdcModuleResultDTO; +import com.elink.esua.epdc.dto.result.*; 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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -50,4 +47,42 @@ public class ApiCustomInfoController { public Result> 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> + **/ + @GetMapping("archive/depts") + public Result> 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> + **/ + @GetMapping("archive/list") + public Result> 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> + **/ + @GetMapping("archive/detail/{id}") + public Result getArchiveDetail(@PathVariable("id") String id) { + return customService.getArchiveDetail(id); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java index 9b870d54..20d1874f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java +++ b/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.EpdcModuleResultDTO; +import com.elink.esua.epdc.dto.result.*; 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> selectListDeptInfo(EpdcDeptInfoFormDTO formDTO); + + @GetMapping(value = "custom/archive/depts", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO); + + @GetMapping(value = "custom/archive/list", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listArchivesInfo(ArchiveFormDTO formDTO); + + @GetMapping(value = "custom/archive/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getArchiveDetail(@PathVariable("id") String id); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java index 453ea944..0f2aaaec 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java +++ b/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.EpdcModuleResultDTO; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.feign.CustomFeignClient; import org.springframework.stereotype.Component; @@ -34,4 +35,19 @@ public class CustomFeignClientFallback implements CustomFeignClient { public Result> selectListDeptInfo(EpdcDeptInfoFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "selectListDeptInfo", formDTO); } + + @Override + public Result> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "listArchiveDeptInfo", formDTO); + } + + @Override + public Result> listArchivesInfo(ArchiveFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "listArchivesInfo", formDTO); + } + + @Override + public Result getArchiveDetail(String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getArchiveDetail", id); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java index c5946663..4cc26e20 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java +++ b/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.EpdcModuleResultDTO; -import org.apache.poi.ss.formula.functions.T; +import com.elink.esua.epdc.dto.result.*; import java.util.List; @@ -54,4 +53,29 @@ public interface CustomService { * @Date 13:41 2020-05-20 **/ Result> listDeptInfo(EpdcDeptInfoFormDTO formDTO); + + /** + * @Description 获取有档案的归属部门列表 + * @Author songyunpeng + * @Date 2020/7/7 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO); + /** + * @Description 获取档案列表 + * @Author songyunpeng + * @Date 2020/7/7 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> listArchivesInfo(ArchiveFormDTO formDTO); + /** + * @Description 获取档案详情 + * @Author songyunpeng + * @Date 2020/7/7 + * @Param [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result getArchiveDetail(String id); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java index fc6fbfbf..db1fc38c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java +++ b/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.EpdcModuleResultDTO; +import com.elink.esua.epdc.dto.result.*; 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> listDeptInfo(EpdcDeptInfoFormDTO formDTO) { return customFeignClient.selectListDeptInfo(formDTO); } + + @Override + public Result> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO) { + return customFeignClient.listArchiveDeptInfo(formDTO); + } + + @Override + public Result> listArchivesInfo(ArchiveFormDTO formDTO) { + return customFeignClient.listArchivesInfo(formDTO); + } + + @Override + public Result getArchiveDetail(String id) { + return customFeignClient.getArchiveDetail(id); + } } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/ArchiveDeptFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/ArchiveDeptFormDTO.java new file mode 100644 index 00000000..a16e9218 --- /dev/null +++ b/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; + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/ArchiveFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/ArchiveFormDTO.java new file mode 100644 index 00000000..3cb49725 --- /dev/null +++ b/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; + + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ArchiveDeptResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ArchiveDeptResultDTO.java new file mode 100644 index 00000000..8d9b85b6 --- /dev/null +++ b/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; + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ArchiveDetailResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ArchiveDetailResultDTO.java new file mode 100644 index 00000000..464051c4 --- /dev/null +++ b/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; + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ArchiveResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ArchiveResultDTO.java new file mode 100644 index 00000000..4e3d9f3b --- /dev/null +++ b/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; + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/controller/EpdcAppArchivesController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/controller/EpdcAppArchivesController.java new file mode 100644 index 00000000..cb1245a8 --- /dev/null +++ b/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> + **/ + @GetMapping("depts") + public Result> 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> + **/ + @GetMapping("list") + public Result> 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> + **/ + @GetMapping("detail/{id}") + public Result getArchiveDetail(@PathVariable("id") String id) { + return archivesService.getArchiveDetail(id); + } + + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/dao/ArchivesDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/dao/ArchivesDao.java index 5180e003..e2ddf686 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/dao/ArchivesDao.java +++ b/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 { * @return boolean **/ boolean getArchivesDTOByArchivesNum(String id, String archivesNum); + /** + * @Description 获取有档案的归属部门列表 + * @Author songyunpeng + * @Date 2020/7/7 + * @Param [formDTO] + * @return java.util.List + **/ + List selectListArchiveDeptInfo(ArchiveDeptFormDTO formDTO); + /** + * @Description 根据部门和搜索内容获取 档案列表 + * @Author songyunpeng + * @Date 2020/7/7 + * @Param [formDTO] + * @return java.util.List + **/ + List selectListArchiveInfo(ArchiveFormDTO formDTO); + + /** + * @Description 获取详情 + * @Author songyunpeng + * @Date 2020/7/7 + * @Param [formDTO] + * @return java.util.List + **/ + ArchiveDetailResultDTO selectArchiveDetailInfo(String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/ArchivesService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/ArchivesService.java index 879ded4f..d15f9584 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/ArchivesService.java +++ b/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 { * @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> + **/ + Result> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO); + /** + * @Description 获取档案列表 + * @Author songyunpeng + * @Date 2020/7/7 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> listArchivesInfo(ArchiveFormDTO formDTO); + /** + * @Description 获取档案详情 + * @Author songyunpeng + * @Date 2020/7/7 + * @Param [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result getArchiveDetail(String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/impl/ArchivesServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/impl/ArchivesServiceImpl.java index d3d0a517..dedfed74 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/archives/service/impl/ArchivesServiceImpl.java +++ b/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> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO) { + int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageIndex(pageIndex); + + List listArchiveDeptInfo = this.baseDao.selectListArchiveDeptInfo(formDTO); + return new Result().ok(listArchiveDeptInfo); + } + + @Override + public Result> listArchivesInfo(ArchiveFormDTO formDTO) { + int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageIndex(pageIndex); + + List listArchiveInfo = this.baseDao.selectListArchiveInfo(formDTO); + return new Result().ok(listArchiveInfo); + } + + @Override + public Result getArchiveDetail(String id) { + ArchiveDetailResultDTO archiveDetailResultDTO = this.baseDao.selectArchiveDetailInfo(id); + return new Result().ok(archiveDetailResultDTO); + } + /*** - * 批量添加大档案 + * 批量添加档案 * @return java.lang.String * @author songyunpeng * @date 2020/7/6 10:25 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml index 97e11f0b..90222b10 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/archives/ArchivesDao.xml @@ -64,6 +64,8 @@ order by CREATED_TIME desc,ARCHIVE_TIME desc + + + + + + + + \ No newline at end of file