Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
306f03ca by 荆蔚杰
Options

左侧菜单列表接口.卷内目录对应不动产查询接口.

1 parent 9b908a35
Inline Side-by-side
Showing 17 changed files with 200 additions and 57 deletions
1 package com.pashanhoo.archive.controller; 1 package com.pashanhoo.archive.controller;
2 2
3
4 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest; 3 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
5 import com.pashanhoo.archive.service.DgArchivesService; 4 import com.pashanhoo.archive.service.DgArchivesService;
6 import com.pashanhoo.common.Result; 5 import com.pashanhoo.common.Result;
...@@ -70,4 +69,15 @@ public class DgArchivesController { ...@@ -70,4 +69,15 @@ public class DgArchivesController {
70 request.defaultFillPageProp("",""); 69 request.defaultFillPageProp("","");
71 return Result.ok(dgarchivesService.searchDgArchivesList(request)); 70 return Result.ok(dgarchivesService.searchDgArchivesList(request));
72 } 71 }
72
73 /**
74 * 通过案卷标识码加载左菜单目录
75 * @param bsmArchives 案卷标识码
76 * @return
77 */
78 @GetMapping("getLifeMenu")
79 @ApiOperation(value = "通过案卷标识码加载左菜单目录")
80 public Result getArchiveLiftMenu(@ApiParam("案卷标识码") @RequestParam String bsmArchives) {
81 return Result.ok(dgarchivesService.getArchiveLiftMenu(bsmArchives));
82 }
73 } 83 }
......
...@@ -8,6 +8,8 @@ import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest; ...@@ -8,6 +8,8 @@ import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
8 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest; 8 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
9 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 9 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
10 10
11 import java.util.List;
12
11 /** 13 /**
12 * <p> 14 * <p>
13 * 案卷基本信息 服务类 15 * 案卷基本信息 服务类
...@@ -44,4 +46,11 @@ public interface DgArchivesService extends IService<DgArchivesDO> { ...@@ -44,4 +46,11 @@ public interface DgArchivesService extends IService<DgArchivesDO> {
44 * @return 46 * @return
45 */ 47 */
46 Page searchDgArchivesList(DgArchivesSearchRequest request); 48 Page searchDgArchivesList(DgArchivesSearchRequest request);
49
50 /**
51 * 根据档案标识码加载左侧菜单
52 * @param bsmArchives 档案标识码
53 * @return
54 */
55 List getArchiveLiftMenu(String bsmArchives);
47 } 56 }
......
1 package com.pashanhoo.archive.service.impl; 1 package com.pashanhoo.archive.service.impl;
2 2
3
4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 import com.pashanhoo.archive.entity.DgArchivesConverter; 4 import com.pashanhoo.archive.entity.DgArchivesConverter;
6 import com.pashanhoo.archive.entity.DgArchivesDO; 5 import com.pashanhoo.archive.entity.DgArchivesDO;
...@@ -10,12 +9,17 @@ import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest; ...@@ -10,12 +9,17 @@ import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
10 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest; 9 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
11 import com.pashanhoo.archive.mapper.DgArchivesMapper; 10 import com.pashanhoo.archive.mapper.DgArchivesMapper;
12 import com.pashanhoo.archive.service.DgArchivesService; 11 import com.pashanhoo.archive.service.DgArchivesService;
12 import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
13 import com.pashanhoo.bdcdy.mapper.DgBdcdyMapper;
14 import com.pashanhoo.bdcdy.service.DgBdcdyService;
13 import org.springframework.beans.factory.annotation.Autowired; 15 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Service; 16 import org.springframework.stereotype.Service;
15 17
16 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 18 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
17 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 19 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
18 20
21 import java.util.List;
22
19 /** 23 /**
20 * <p> 24 * <p>
21 * 案卷基本信息 服务实现类 25 * 案卷基本信息 服务实现类
...@@ -33,6 +37,12 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi ...@@ -33,6 +37,12 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
33 @Autowired 37 @Autowired
34 private DgArchivesMapper dgarchivesMapper; 38 private DgArchivesMapper dgarchivesMapper;
35 39
40 @Autowired
41 private DgBdcdyService dgBdcdyService;
42
43 @Autowired
44 private DgBdcdyMapper dgBdcdyMapper;
45
36 /** 46 /**
37 * 新增记录 47 * 新增记录
38 * @param request 48 * @param request
...@@ -103,4 +113,27 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi ...@@ -103,4 +113,27 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
103 return page.setRecords(dgarchivesConverter.doList2ListVOList(page.getRecords())); 113 return page.setRecords(dgarchivesConverter.doList2ListVOList(page.getRecords()));
104 } 114 }
105 115
116 /**
117 * 根据档案标识码加载左侧菜单
118 *
119 * @param bsmArchives 档案标识码
120 * @return
121 */
122 @Override
123 public List getArchiveLiftMenu(String bsmArchives) {
124 DgArchivesDO archivesDO = this.getById(bsmArchives);
125 Integer status = archivesDO.getDazt().intValue();
126
127 /*状态判断.如果状态为:1,2,3显示为不动产单元号
128 如果状态为:4,5,6,7,8显示为档案号
129 */
130 List<DgBdcdyDO> dgBdcdyDOS = null;
131 if (status.equals(1)||status.equals(2)||status.equals(3)){
132 QueryWrapper<DgBdcdyDO> bdcdyWrapper = new QueryWrapper<>();
133 bdcdyWrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchives);
134 dgBdcdyDOS = dgBdcdyMapper.selectList(bdcdyWrapper);
135 return dgBdcdyDOS;
136 }
137 return dgBdcdyDOS;
138 }
106 } 139 }
......
1 package com.pashanhoo.catalog.controller; 1 package com.pashanhoo.catalog.controller;
2 2
3
4
5 import com.pashanhoo.catalog.entity.vo.AddDgArchivesCatalogRequest; 3 import com.pashanhoo.catalog.entity.vo.AddDgArchivesCatalogRequest;
6 import com.pashanhoo.catalog.entity.vo.DgArchivesCatalogSearchRequest; 4 import com.pashanhoo.catalog.entity.vo.DgArchivesCatalogListVO;
7 import com.pashanhoo.catalog.entity.vo.UpdateDgArchivesCatalogRequest; 5 import com.pashanhoo.catalog.entity.vo.UpdateDgArchivesCatalogRequest;
8 import com.pashanhoo.catalog.service.DgArchivesCatalogService; 6 import com.pashanhoo.catalog.service.DgArchivesCatalogService;
9 import com.pashanhoo.common.Result; 7 import com.pashanhoo.common.Result;
...@@ -66,9 +64,7 @@ public class DgArchivesCatalogController { ...@@ -66,9 +64,7 @@ public class DgArchivesCatalogController {
66 64
67 @PostMapping("search") 65 @PostMapping("search")
68 @ApiOperation(value = "根据条件进行列表查询") 66 @ApiOperation(value = "根据条件进行列表查询")
69 public Result searchDgArchivesCatalogList(@RequestBody DgArchivesCatalogSearchRequest request) { 67 public Result<List<DgArchivesCatalogListVO>> searchDgArchivesCatalogList(@ApiParam("档案标识码集合") @RequestParam List<String> bsmArchives) {
70 //TODO 默认排序条件设置 68 return Result.ok(dgarchivescatalogService.searchDgArchivesCatalogList(bsmArchives));
71 request.defaultFillPageProp("","");
72 return Result.ok(dgarchivescatalogService.searchDgArchivesCatalogList(request));
73 } 69 }
74 } 70 }
......
1 package com.pashanhoo.catalog.entity.vo; 1 package com.pashanhoo.catalog.entity.vo;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
4 import io.swagger.annotations.ApiModel; 5 import io.swagger.annotations.ApiModel;
5 import io.swagger.annotations.ApiModelProperty; 6 import io.swagger.annotations.ApiModelProperty;
6 import lombok.Data; 7 import lombok.Data;
...@@ -17,7 +18,6 @@ import lombok.EqualsAndHashCode; ...@@ -17,7 +18,6 @@ import lombok.EqualsAndHashCode;
17 @Data 18 @Data
18 @EqualsAndHashCode(callSuper = false) 19 @EqualsAndHashCode(callSuper = false)
19 @ApiModel(value="档案目录信息列表VO") 20 @ApiModel(value="档案目录信息列表VO")
20 //TODO 该类属性暂时是完整的全部属性，需进行个性化的增删
21 public class DgArchivesCatalogListVO implements Serializable { 21 public class DgArchivesCatalogListVO implements Serializable {
22 22
23 private static final long serialVersionUID = 1L; 23 private static final long serialVersionUID = 1L;
...@@ -94,5 +94,9 @@ public class DgArchivesCatalogListVO implements Serializable { ...@@ -94,5 +94,9 @@ public class DgArchivesCatalogListVO implements Serializable {
94 @ApiModelProperty(name = "bz", value = "备注") 94 @ApiModelProperty(name = "bz", value = "备注")
95 private String bz; 95 private String bz;
96 96
97 97 /**
98 * 不动产单元
99 */
100 @ApiModelProperty(name = "bdcdyDO",value = "不动产单元")
101 private DgBdcdyDO bdcdyDO;
98 } 102 }
......
1 package com.pashanhoo.catalog.mapper; 1 package com.pashanhoo.catalog.mapper;
2 2
3
4 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 import com.pashanhoo.catalog.entity.DgArchivesCatalogDO; 4 import com.pashanhoo.catalog.entity.DgArchivesCatalogDO;
5 import com.pashanhoo.catalog.entity.vo.DgArchivesCatalogListVO;
6 import org.apache.ibatis.annotations.Param;
7
8 import java.util.List;
6 9
7 /** 10 /**
8 * <p> 11 * <p>
...@@ -14,4 +17,11 @@ import com.pashanhoo.catalog.entity.DgArchivesCatalogDO; ...@@ -14,4 +17,11 @@ import com.pashanhoo.catalog.entity.DgArchivesCatalogDO;
14 */ 17 */
15 public interface DgArchivesCatalogMapper extends BaseMapper<DgArchivesCatalogDO> { 18 public interface DgArchivesCatalogMapper extends BaseMapper<DgArchivesCatalogDO> {
16 19
20 /**
21 * 获取目录和不动产信息
22 *
23 * @param bsmArchives 档案标识码集合
24 * @return
25 */
26 List<DgArchivesCatalogListVO> getCatalog(@Param("bsmArchives") List<String> bsmArchives);
17 } 27 }
......
1 package com.pashanhoo.catalog.service; 1 package com.pashanhoo.catalog.service;
2 2
3
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import com.baomidou.mybatisplus.extension.service.IService; 3 import com.baomidou.mybatisplus.extension.service.IService;
6 import com.pashanhoo.catalog.entity.*; 4 import com.pashanhoo.catalog.entity.*;
7 import com.pashanhoo.catalog.entity.vo.AddDgArchivesCatalogRequest; 5 import com.pashanhoo.catalog.entity.vo.*;
8 import com.pashanhoo.catalog.entity.vo.DgArchivesCatalogDetailVO; 6
9 import com.pashanhoo.catalog.entity.vo.DgArchivesCatalogSearchRequest; 7 import java.util.List;
10 import com.pashanhoo.catalog.entity.vo.UpdateDgArchivesCatalogRequest;
11 8
12 /** 9 /**
13 * <p> 10 * <p>
...@@ -41,8 +38,8 @@ public interface DgArchivesCatalogService extends IService<DgArchivesCatalogDO> ...@@ -41,8 +38,8 @@ public interface DgArchivesCatalogService extends IService<DgArchivesCatalogDO>
41 38
42 /** 39 /**
43 * 根据条件进行列表查询 40 * 根据条件进行列表查询
44 * @param request 41 * @param bsmArchives 档案标识码
45 * @return 42 * @return
46 */ 43 */
47 Page searchDgArchivesCatalogList(DgArchivesCatalogSearchRequest request); 44 List<DgArchivesCatalogListVO> searchDgArchivesCatalogList(List<String> bsmArchives);
48 } 45 }
......
1 package com.pashanhoo.catalog.service.impl; 1 package com.pashanhoo.catalog.service.impl;
2 2
3
4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 import com.pashanhoo.catalog.entity.*; 4 import com.pashanhoo.catalog.entity.*;
6 import com.pashanhoo.catalog.entity.vo.AddDgArchivesCatalogRequest; 5 import com.pashanhoo.catalog.entity.vo.*;
7 import com.pashanhoo.catalog.entity.vo.DgArchivesCatalogDetailVO;
8 import com.pashanhoo.catalog.entity.vo.DgArchivesCatalogSearchRequest;
9 import com.pashanhoo.catalog.entity.vo.UpdateDgArchivesCatalogRequest;
10 import com.pashanhoo.catalog.mapper.DgArchivesCatalogMapper; 6 import com.pashanhoo.catalog.mapper.DgArchivesCatalogMapper;
11 import com.pashanhoo.catalog.service.DgArchivesCatalogService; 7 import com.pashanhoo.catalog.service.DgArchivesCatalogService;
12 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
14 10
15 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 11 import java.util.List;
16 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
17 12
18 /** 13 /**
19 * <p> 14 * <p>
...@@ -67,21 +62,13 @@ public class DgArchivesCatalogServiceImpl extends ServiceImpl<DgArchivesCatalogM ...@@ -67,21 +62,13 @@ public class DgArchivesCatalogServiceImpl extends ServiceImpl<DgArchivesCatalogM
67 62
68 /** 63 /**
69 * 根据条件进行列表查询 64 * 根据条件进行列表查询
70 * @param request 65 * @param bsmArchives 档案标识码集合
71 * @return 66 * @return
72 */ 67 */
73 @Override 68 @Override
74 public Page searchDgArchivesCatalogList(DgArchivesCatalogSearchRequest request) { 69 public List<DgArchivesCatalogListVO> searchDgArchivesCatalogList(List<String> bsmArchives) {
75 Page<DgArchivesCatalogDO> pageParam = new Page<DgArchivesCatalogDO>(request.getCurrentPage(), request.getPageSize());
76 QueryWrapper<DgArchivesCatalogDO> wrapper = new QueryWrapper<>();
77 //设置默认排序
78 wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) : wrapper.orderByAsc(request.getSortField());
79
80 //TODO 根据当前情况设置wrapper条件
81 70
82 Page page = this.page(pageParam, wrapper); 71 return dgarchivescatalogMapper.getCatalog(bsmArchives);
83 //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象
84 return page.setRecords(dgarchivescatalogConverter.doList2ListVOList(page.getRecords()));
85 } 72 }
86 73
87 } 74 }
......
...@@ -71,7 +71,7 @@ public class CodeGenerator { ...@@ -71,7 +71,7 @@ public class CodeGenerator {
71 //4、策略配置 71 //4、策略配置
72 StrategyConfig strategy = new StrategyConfig(); 72 StrategyConfig strategy = new StrategyConfig();
73 // 设置要映射的表名 73 // 设置要映射的表名
74 strategy.setInclude("DG_STAFF"); 74 strategy.setInclude("DG_LEND_FILE");
75 strategy.setNaming(NamingStrategy.underline_to_camel); 75 strategy.setNaming(NamingStrategy.underline_to_camel);
76 strategy.setColumnNaming(NamingStrategy.underline_to_camel); 76 strategy.setColumnNaming(NamingStrategy.underline_to_camel);
77 // 自动lombok； 77 // 自动lombok；
......
...@@ -3,6 +3,7 @@ package com.pashanhoo.common.util.fileupload; ...@@ -3,6 +3,7 @@ package com.pashanhoo.common.util.fileupload;
3 import com.pashanhoo.common.Result; 3 import com.pashanhoo.common.Result;
4 import io.swagger.annotations.Api; 4 import io.swagger.annotations.Api;
5 import io.swagger.annotations.ApiOperation; 5 import io.swagger.annotations.ApiOperation;
6 import io.swagger.annotations.ApiParam;
6 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
7 import org.springframework.web.bind.annotation.*; 8 import org.springframework.web.bind.annotation.*;
8 import org.springframework.web.multipart.MultipartFile; 9 import org.springframework.web.multipart.MultipartFile;
...@@ -48,7 +49,7 @@ public class FileController { ...@@ -48,7 +49,7 @@ public class FileController {
48 49
49 @DeleteMapping("/deleteFile") 50 @DeleteMapping("/deleteFile")
50 @ApiOperation("删除文件") 51 @ApiOperation("删除文件")
51 public Result deleteFile(@RequestParam("saveUrl") String saveUrl){ 52 public Result deleteFile(@ApiParam("存储url") @RequestParam("saveUrl") String saveUrl){
52 try { 53 try {
53 minioUtil.removeObject(minioConfig.getBucket(), saveUrl); 54 minioUtil.removeObject(minioConfig.getBucket(), saveUrl);
54 return Result.ok(); 55 return Result.ok();
......
1 package com.pashanhoo.destroy.controller; 1 package com.pashanhoo.destroy.controller;
2 2
3
4 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest; 3 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
5 import com.pashanhoo.common.Result; 4 import com.pashanhoo.common.Result;
6 import com.pashanhoo.destroy.entity.vo.AddDgArchivesDestructionRequest; 5 import com.pashanhoo.destroy.entity.vo.AddDgArchivesDestructionRequest;
...@@ -102,4 +101,10 @@ public class DgArchivesDestructionController { ...@@ -102,4 +101,10 @@ public class DgArchivesDestructionController {
102 public Result updateArchivesStateByDestruction(@ApiParam("档案销毁记录ID") @RequestParam(value = "bsm_destruction") String bsm_destruction) { 101 public Result updateArchivesStateByDestruction(@ApiParam("档案销毁记录ID") @RequestParam(value = "bsm_destruction") String bsm_destruction) {
103 return dgarchivesdestructionService.updateArchivesStateByDestruction(bsm_destruction); 102 return dgarchivesdestructionService.updateArchivesStateByDestruction(bsm_destruction);
104 } 103 }
104
105 @GetMapping("getDestroyLeftMenu")
106 @ApiOperation(value = "根据销毁清册编号获取左侧档案号菜单")
107 public Result getDestroyLeftMenu(@ApiParam("销毁清册编号") @RequestParam String xhqcbh) {
108 return Result.ok(dgarchivesdestructionService.getDestroyLeftMenu(xhqcbh));
109 }
105 } 110 }
......
1 package com.pashanhoo.destroy.mapper; 1 package com.pashanhoo.destroy.mapper;
2 2
3
4 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 import com.pashanhoo.archive.entity.DgArchivesDO;
5 import com.pashanhoo.archive.entity.vo.DgArchivesListVO; 5 import com.pashanhoo.archive.entity.vo.DgArchivesListVO;
6 import com.pashanhoo.destroy.entity.DgArchivesDestructionDO; 6 import com.pashanhoo.destroy.entity.DgArchivesDestructionDO;
7 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionListVO;
8 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionSearchRequest;
9 import org.apache.ibatis.annotations.Param; 7 import org.apache.ibatis.annotations.Param;
10 8
11 import java.util.List; 9 import java.util.List;
10 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionListVO;
11 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionSearchRequest;
12 12
13 /** 13 /**
14 * <p> 14 * <p>
...@@ -20,6 +20,14 @@ import java.util.List; ...@@ -20,6 +20,14 @@ import java.util.List;
20 */ 20 */
21 public interface DgArchivesDestructionMapper extends BaseMapper<DgArchivesDestructionDO> { 21 public interface DgArchivesDestructionMapper extends BaseMapper<DgArchivesDestructionDO> {
22 22
23 /**
24 * 根据销毁清册编号获取左侧档案号菜单
25 *
26 * @param xhqcbh 销毁清册编号
27 * @return
28 */
29 List<DgArchivesDO> getDestroyLeftMenu(@Param("xhqcbh") String xhqcbh);
30
23 List<DgArchivesDestructionListVO> selectXhResult(DgArchivesDestructionSearchRequest request); 31 List<DgArchivesDestructionListVO> selectXhResult(DgArchivesDestructionSearchRequest request);
24 32
25 boolean updateArchivesStatus(@Param("bsm_destruction") String bsm_destruction,@Param("dazt") String dazt); 33 boolean updateArchivesStatus(@Param("bsm_destruction") String bsm_destruction,@Param("dazt") String dazt);
......
...@@ -67,7 +67,9 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc ...@@ -67,7 +67,9 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc
67 Result updateStateByArchives(List<String> idList); 67 Result updateStateByArchives(List<String> idList);
68 68
69 /** 69 /**
70 /**
70 * 新增记录 71 * 新增记录
72 *
71 * @param request 73 * @param request
72 * @return 74 * @return
73 */ 75 */
...@@ -80,6 +82,7 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc ...@@ -80,6 +82,7 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc
80 Result showArchivesForDestruction( DgArchivesSearchRequest request); 82 Result showArchivesForDestruction( DgArchivesSearchRequest request);
81 /** 83 /**
82 * 根据主键查询记录详情 84 * 根据主键查询记录详情
85 *
83 * @param id 86 * @param id
84 * @return 87 * @return
85 */ 88 */
...@@ -87,10 +90,19 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc ...@@ -87,10 +90,19 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc
87 90
88 /** 91 /**
89 * 修改单条记录 92 * 修改单条记录
93 *
90 * @param request 94 * @param request
91 * @return 95 * @return
92 */ 96 */
93 boolean updateDgArchivesDestruction(UpdateDgArchivesDestructionRequest request); 97 boolean updateDgArchivesDestruction(UpdateDgArchivesDestructionRequest request);
94 98
95 99
100
101 /**
102 * 根据销毁清册编号获取左侧档案号菜单
103 *
104 * @param xhqcbh 销毁清册编号
105 * @return
106 */
107 List getDestroyLeftMenu(String xhqcbh);
96 } 108 }
......
1 package com.pashanhoo.destroy.service.impl; 1 package com.pashanhoo.destroy.service.impl;
2 2
3
4 import com.baomidou.mybatisplus.core.toolkit.IdWorker; 3 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 import com.github.pagehelper.PageHelper; 5 import com.github.pagehelper.PageHelper;
...@@ -11,6 +10,11 @@ import com.pashanhoo.common.Result; ...@@ -11,6 +10,11 @@ import com.pashanhoo.common.Result;
11 import com.pashanhoo.destroy.entity.DgArchivesDestructionConverter; 10 import com.pashanhoo.destroy.entity.DgArchivesDestructionConverter;
12 import com.pashanhoo.destroy.entity.DgArchivesDestructionDO; 11 import com.pashanhoo.destroy.entity.DgArchivesDestructionDO;
13 import com.pashanhoo.destroy.entity.vo.*; 12 import com.pashanhoo.destroy.entity.vo.*;
13 import com.pashanhoo.archive.entity.DgArchivesDO;
14 import com.pashanhoo.destroy.entity.vo.AddDgArchivesDestructionRequest;
15 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionDetailVO;
16 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionSearchRequest;
17 import com.pashanhoo.destroy.entity.vo.UpdateDgArchivesDestructionRequest;
14 import com.pashanhoo.destroy.mapper.DgArchivesDestructionMapper; 18 import com.pashanhoo.destroy.mapper.DgArchivesDestructionMapper;
15 import com.pashanhoo.destroy.service.DgArchivesDestructionService; 19 import com.pashanhoo.destroy.service.DgArchivesDestructionService;
16 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogConverter; 20 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogConverter;
...@@ -150,4 +154,16 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest ...@@ -150,4 +154,16 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest
150 154
151 155
152 156
157 /**
158 * 根据销毁清册编号获取左侧档案号菜单
159 *
160 * @param xhqcbh 销毁清册编号
161 * @return
162 */
163 @Override
164 public List getDestroyLeftMenu(String xhqcbh) {
165
166 List<DgArchivesDO> dgArchivesDestructionDOS = dgarchivesdestructionMapper.getDestroyLeftMenu(xhqcbh);
167 return dgArchivesDestructionDOS;
168 }
153 } 169 }
......
...@@ -75,8 +75,6 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple ...@@ -75,8 +75,6 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
75 @Override 75 @Override
76 public List<DgFileListVO> searchDgFileList(DgFileSearchRequest request) { 76 public List<DgFileListVO> searchDgFileList(DgFileSearchRequest request) {
77 77
78 QueryWrapper<DgFileDO> wrapper = new QueryWrapper<>();
79
80 List<DgFileListVO> fileListVOS = dgfileMapper.selectFileWithNameAndSort(request); 78 List<DgFileListVO> fileListVOS = dgfileMapper.selectFileWithNameAndSort(request);
81 79
82 for (DgFileListVO fileListVO : fileListVOS) { 80 for (DgFileListVO fileListVO : fileListVOS) {
......
...@@ -22,4 +22,45 @@ ...@@ -22,4 +22,45 @@
22 <sql id="Base_Column_List"> 22 <sql id="Base_Column_List">
23 BSM_CATALOG, BSM_ARCHIVES, XH, WJBM, WJMC, CLLXBM, CLLXMC, YS, YH, FS, WH, BZ 23 BSM_CATALOG, BSM_ARCHIVES, XH, WJBM, WJMC, CLLXBM, CLLXMC, YS, YH, FS, WH, BZ
24 </sql> 24 </sql>
25
26 <resultMap id="getCatalogAndBDCDY" type="com.pashanhoo.catalog.entity.vo.DgArchivesCatalogListVO">
27 <result column="bsm_catalog" property="bsmCatalog"/>
28 <result column="bsm_archives" property="bsmArchives"/>
29 <result column="xh" property="xh"/>
30 <result column="wjbm" property="wjbm"/>
31 <result column="wjmc" property="wjmc"/>
32 <result column="cllxbm" property="cllxbm"/>
33 <result column="cllxmc" property="cllxmc"/>
34 <result column="ys" property="ys"/>
35 <result column="yh" property="yh"/>
36 <result column="fs" property="fs"/>
37 <result column="wh" property="wh"/>
38 <result column="bz" property="bz"/>
39 <association property="bdcdyDO" javaType="com.pashanhoo.bdcdy.entity.DgBdcdyDO">
40 <result column="BSM_BDCDY" property="bsmBdcdy"/>
41 <result column="BSM_ARCHIVES" property="bsmArchives"/>
42 <result column="BSM_QL" property="bsmQl"/>
43 <result column="bdcdyid" property="bdcdyid"/>
44 <result column="bdcdyh" property="bdcdyh"/>
45 <result column="zl" property="zl"/>
46 <result column="qlr" property="qlr"/>
47 <result column="zjhm" property="zjhm"/>
48 <result column="ywr" property="ywr"/>
49 <result column="bdcqzh" property="bdcqzh"/>
50 <result column="djsj" property="djsj"/>
51 <result column="zxsj" property="zxsj"/>
52 </association>
53 </resultMap>
54
55 <select id="getCatalog" resultMap="getCatalogAndBDCDY">
56 select DAC.*,db.* from DG_ARCHIVES_CATALOG DAC join DG_BDCDY DB on DAC.BSM_ARCHIVES = DB.BSM_ARCHIVES
57 <where>
58 <if test="bsmArchives != null and bsmArchives.size() != 0">
59 DAC.BSM_ARCHIVES in
60 <foreach collection="bsmArchives" item="bsmArchive" separator="," open="(" close=")">
61 #{bsmArchive,jdbcType=VARCHAR}
62 </foreach>
63 </if>
64 </where>
65 </select>
25 </mapper> 66 </mapper>
......
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
3 <mapper namespace="com.pashanhoo.destroy.mapper.DgArchivesDestructionMapper"> 3 <mapper namespace="com.pashanhoo.destroy.mapper.DgArchivesDestructionMapper">
4 <!-- 通用查询映射结果 --> 4 <!-- 通用查询映射结果 -->
5 <resultMap id="BaseResultMap" type="com.pashanhoo.destroy.entity.DgArchivesDestructionDO"> 5 <resultMap id="BaseResultMap" type="com.pashanhoo.destroy.entity.DgArchivesDestructionDO">
6 <id column="BSM_DESTRUCTION" property="bsmDestruction" /> 6 <id column="BSM_DESTRUCTION" property="bsmDestruction"/>
7 <result column="XHQCBH" property="xhqcbh" /> 7 <result column="XHQCBH" property="xhqcbh"/>
8 <result column="FQR" property="fqr" /> 8 <result column="FQR" property="fqr"/>
9 <result column="FQRQ" property="fqrq" /> 9 <result column="FQRQ" property="fqrq"/>
10 <result column="XHYY" property="xhyy" /> 10 <result column="XHYY" property="xhyy"/>
11 <result column="SHRY" property="shry" /> 11 <result column="SHRY" property="shry"/>
12 <result column="SHYJ" property="shyj" /> 12 <result column="SHYJ" property="shyj"/>
13 <result column="XHR" property="xhr" /> 13 <result column="XHR" property="xhr"/>
14 <result column="XHRQ" property="xhrq" /> 14 <result column="XHRQ" property="xhrq"/>
15 </resultMap> 15 </resultMap>
16 <!-- 销毁页面记录查询 --> 16 <!-- 销毁页面记录查询 -->
17 <resultMap id="ShowDestructionResultMap" type="com.pashanhoo.destroy.entity.vo.DgArchivesDestructionListVO"> 17 <resultMap id="ShowDestructionResultMap" type="com.pashanhoo.destroy.entity.vo.DgArchivesDestructionListVO">
...@@ -54,7 +54,15 @@ ...@@ -54,7 +54,15 @@
54 </resultMap> 54 </resultMap>
55 <!-- 通用查询结果列 --> 55 <!-- 通用查询结果列 -->
56 <sql id="Base_Column_List"> 56 <sql id="Base_Column_List">
57 BSM_DESTRUCTION, XHQCBH, FQR, FQRQ, XHYY, SHRY, SHYJ, XHR, XHRQ 57 BSM_DESTRUCTION,
58 XHQCBH,
59 FQR,
60 FQRQ,
61 XHYY,
62 SHRY,
63 SHYJ,
64 XHR,
65 XHRQ
58 </sql> 66 </sql>
59 <update id="updateArchivesStatus" parameterType="java.lang.String"> 67 <update id="updateArchivesStatus" parameterType="java.lang.String">
60 update dg_archives b 68 update dg_archives b
...@@ -106,4 +114,12 @@ ...@@ -106,4 +114,12 @@
106 where a.bsm_destruction = #{bsm_destruction,jdbcType=VARCHAR} 114 where a.bsm_destruction = #{bsm_destruction,jdbcType=VARCHAR}
107 and b.bsm_archives = a.bsm_archives) 115 and b.bsm_archives = a.bsm_archives)
108 </select> 116 </select>
117
118 <select id="getDestroyLeftMenu" resultType="com.pashanhoo.archive.entity.DgArchivesDO">
119 select DA.*
120 from DG_ARCHIVES DA
121 join DG_DESTRUCTION_CATALOG DDC on DA.BSM_ARCHIVES = DDC.BSM_ARCHIVES
122 join DG_ARCHIVES_DESTRUCTION DAD on DDC.BSM_DESTRUCTION = DAD.BSM_DESTRUCTION
123 where DAD.XHQCBH = #{xhqcbh,jdbcType=VARCHAR}
124 </select>
109 </mapper> 125 </mapper>
......