Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
27ffacca by 夏齐
Options

档案销毁相关操作接口新增

1 parent 084a502b
Inline Side-by-side
Showing 16 changed files with 401 additions and 102 deletions
...@@ -3,6 +3,9 @@ package com.pashanhoo.archive.mapper; ...@@ -3,6 +3,9 @@ package com.pashanhoo.archive.mapper;
3 3
4 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 4 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 import com.pashanhoo.archive.entity.DgArchivesDO; 5 import com.pashanhoo.archive.entity.DgArchivesDO;
6 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
7
8 import java.util.List;
6 9
7 /** 10 /**
8 * <p> 11 * <p>
...@@ -14,4 +17,5 @@ import com.pashanhoo.archive.entity.DgArchivesDO; ...@@ -14,4 +17,5 @@ import com.pashanhoo.archive.entity.DgArchivesDO;
14 */ 17 */
15 public interface DgArchivesMapper extends BaseMapper<DgArchivesDO> { 18 public interface DgArchivesMapper extends BaseMapper<DgArchivesDO> {
16 19
20
17 } 21 }
......
...@@ -78,8 +78,26 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi ...@@ -78,8 +78,26 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
78 //设置默认排序 78 //设置默认排序
79 wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) : wrapper.orderByAsc(request.getSortField()); 79 wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) : wrapper.orderByAsc(request.getSortField());
80 80
81 //TODO 根据当前情况设置wrapper条件 81 //增加条件
82 82 // lt：less than 小于
83 // le：less than or equal to 小于等于
84 // eq：equal to 等于
85 // ne：not equal to 不等于
86 // ge：greater than or equal to 大于等于
87 // gt：greater than 大于
88 wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) : wrapper.orderByAsc(request.getSortField());
89 wrapper.eq(request.getAjbt()!=null,"AJBT",request.getAjbt());
90 wrapper.eq(request.getFlh()!=null,"FLH",request.getFlh());
91 wrapper.eq(request.getMlh()!=null,"MLH",request.getMlh());
92 wrapper.eq(request.getAjh()!=null,"AJH",request.getAjh());
93 wrapper.eq(request.getNd()!=null,"ND",request.getNd());
94 wrapper.eq(request.getDazt()!=null,"DAZT",request.getDazt());
95 wrapper.eq(request.getMj()!=null,"MJ",request.getMj());
96 wrapper.ge(request.getQsrq()!=null,"QSRQ",request.getQsrq());
97 wrapper.le(request.getZzrq()!=null,"ZZRQ",request.getZzrq());
98 wrapper.eq(request.getHh()!=null,"HH",request.getHh());
99 wrapper.eq(request.getCfwz()!=null,"CFWZ",request.getCfwz());
100 wrapper.eq(request.getZtc()!=null,"ZTC",request.getZtc());
83 Page page = this.page(pageParam, wrapper); 101 Page page = this.page(pageParam, wrapper);
84 //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象 102 //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象
85 return page.setRecords(dgarchivesConverter.doList2ListVOList(page.getRecords())); 103 return page.setRecords(dgarchivesConverter.doList2ListVOList(page.getRecords()));
......
1 package com.pashanhoo.destroy.controller; 1 package com.pashanhoo.destroy.controller;
2 2
3 3
4 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
4 import com.pashanhoo.common.Result; 5 import com.pashanhoo.common.Result;
5 import com.pashanhoo.destroy.entity.vo.AddDgArchivesDestructionRequest; 6 import com.pashanhoo.destroy.entity.vo.AddDgArchivesDestructionRequest;
6 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionSearchRequest; 7 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionSearchRequest;
7 import com.pashanhoo.destroy.entity.vo.UpdateDgArchivesDestructionRequest; 8 import com.pashanhoo.destroy.entity.vo.UpdateDgArchivesDestructionRequest;
8 import com.pashanhoo.destroy.service.DgArchivesDestructionService; 9 import com.pashanhoo.destroy.service.DgArchivesDestructionService;
10 import com.pashanhoo.destroycatalog.entity.vo.AddDgDestructionCatalogRequest;
9 import org.springframework.web.bind.annotation.RestController; 11 import org.springframework.web.bind.annotation.RestController;
10 import org.springframework.web.bind.annotation.*; 12 import org.springframework.web.bind.annotation.*;
11 import io.swagger.annotations.Api; 13 import io.swagger.annotations.Api;
...@@ -30,25 +32,44 @@ public class DgArchivesDestructionController { ...@@ -30,25 +32,44 @@ public class DgArchivesDestructionController {
30 @Autowired 32 @Autowired
31 private DgArchivesDestructionService dgarchivesdestructionService; 33 private DgArchivesDestructionService dgarchivesdestructionService;
32 34
35 @PostMapping("search")
36 @ApiOperation(value = "根据条件进行列表查询")
37 public Result searchDgArchivesDestructionList(@RequestBody DgArchivesDestructionSearchRequest request) {
38 return dgarchivesdestructionService.searchDgArchivesDestructionList(request);
39 }
40 @GetMapping("deleteDgArchivesDestructionByIds")
41 @ApiOperation(value = "根据销毁记录标识码删除档案销毁记录")
42 public Result deleteDgArchivesDestructionByIds(@ApiParam("档案销毁ID") @RequestParam(value = "bsm_destruction") String bsm_destruction) {
43 return dgarchivesdestructionService.deleteDgArchivesDestruction(bsm_destruction);
44 }
45
33 @PostMapping("insertDgArchivesDestruction") 46 @PostMapping("insertDgArchivesDestruction")
34 @ApiOperation("新增档案销毁") 47 @ApiOperation("新增档案销毁")
35 public Result insertDgArchivesDestruction(@RequestBody AddDgArchivesDestructionRequest request) { 48 public Result insertDgArchivesDestruction(@RequestBody AddDgArchivesDestructionRequest request) {
36 if (dgarchivesdestructionService.insertDgArchivesDestruction(request)) { 49 return dgarchivesdestructionService.insertDgArchivesDestruction(request);
37 return Result.ok();
38 }
39 return Result.error("新增失败");
40 } 50 }
41 51 @PostMapping("showArchivesForDestruction")
42 @DeleteMapping("deleteDgArchivesDestructionByIds") 52 @ApiOperation("展示可以选择销毁的列表")
43 @ApiOperation(value = "批量删除档案销毁") 53 public Result showArchivesForDestruction(@RequestBody DgArchivesSearchRequest request) {
44 public Result deleteDgArchivesDestructionByIds(@ApiParam("档案销毁ID列表") @RequestParam(value = "idList") List<String> idList) { 54 return dgarchivesdestructionService.showArchivesForDestruction(request);
45 if (dgarchivesdestructionService.removeByIds(idList)) {
46 return Result.ok("删除成功");
47 }
48 return Result.error("删除失败");
49 } 55 }
50 56
51 @PutMapping("updateDgArchivesDestruction") 57 @PostMapping("addDestructionArchivesInfo")
58 @ApiOperation(value = "选择销毁档案List")
59 public Result addDestructionArchivesInfo(@RequestBody List<AddDgDestructionCatalogRequest> archivesList) {
60 return dgarchivesdestructionService.addDestructionArchivesInfo(archivesList);
61 }
62 @PostMapping("queryArchivesInfo")
63 @ApiOperation(value = "档案列表信息展示")
64 public Result queryArchivesInfo(@ApiParam("档案销毁记录ID") @RequestParam(value = "bsm_destruction") String bsm_destruction) {
65 return dgarchivesdestructionService.queryArchivesInfo(bsm_destruction);
66 }
67 @GetMapping("deleteArchivesInfo")
68 @ApiOperation(value = "删除档案列表中的档案信息")
69 public Result deleteArchivesInfo(@ApiParam("档案销毁记录ID") @RequestParam(value = "bsm_destruction") String bsm_destruction) {
70 return dgarchivesdestructionService.deleteDestructionArchivescataLog(bsm_destruction);
71 }
72 @PostMapping("updateDgArchivesDestruction")
52 @ApiOperation("修改档案销毁") 73 @ApiOperation("修改档案销毁")
53 public Result updateDgArchivesDestruction(@RequestBody UpdateDgArchivesDestructionRequest request) { 74 public Result updateDgArchivesDestruction(@RequestBody UpdateDgArchivesDestructionRequest request) {
54 if (dgarchivesdestructionService.updateDgArchivesDestruction(request)) { 75 if (dgarchivesdestructionService.updateDgArchivesDestruction(request)) {
...@@ -56,18 +77,29 @@ public class DgArchivesDestructionController { ...@@ -56,18 +77,29 @@ public class DgArchivesDestructionController {
56 } 77 }
57 return Result.error("修改失败"); 78 return Result.error("修改失败");
58 } 79 }
59
60 @GetMapping("getDgArchivesDestructionDetailById") 80 @GetMapping("getDgArchivesDestructionDetailById")
61 @ApiOperation(value = "读取明细") 81 @ApiOperation(value = "查询档案销毁信息")
62 public Result getDgArchivesDestructionDetailById(@ApiParam("档案销毁ID") @RequestParam String id) { 82 public Result getDgArchivesDestructionDetailById(@ApiParam("档案销毁ID") @RequestParam String bsm_destruction) {
63 return Result.ok(dgarchivesdestructionService.getDgArchivesDestructionDetailById(id)); 83 return Result.ok(dgarchivesdestructionService.getDgArchivesDestructionDetailById(bsm_destruction));
64 } 84 }
65 85 @GetMapping("getDestructionArchivescataLog")
66 @PostMapping("search") 86 @ApiOperation(value = "查询档案销毁目录信息")
67 @ApiOperation(value = "根据条件进行列表查询") 87 public Result getDestructionArchivescataLog(@ApiParam("档案销毁ID") @RequestParam(value = "bsm_destruction") String bsm_destruction) {
68 public Result searchDgArchivesDestructionList(@RequestBody DgArchivesDestructionSearchRequest request) { 88 return dgarchivesdestructionService.queryArchivesInfo(bsm_destruction);
69 //TODO 默认排序条件设置 89 }
70 request.defaultFillPageProp("", ""); 90 @GetMapping("deleteDestructionArchivescataLog")
71 return Result.ok(dgarchivesdestructionService.searchDgArchivesDestructionList(request)); 91 @ApiOperation(value = "删除档案销毁目录信息")
92 public Result deleteDestructionArchivescataLog(@ApiParam("档案销毁ID") @RequestParam(value = "bsm_destruction") String bsm_destruction) {
93 return dgarchivesdestructionService.deleteDestructionArchivescataLog(bsm_destruction);
94 }
95 @PostMapping("updateStateByArchives")
96 @ApiOperation(value = "新增档案销毁列表中的档案销毁操作")
97 public Result updateStateByArchives(@ApiParam("档案业务信息ID列表") @RequestParam(value = "idList") List<String> idList) {
98 return dgarchivesdestructionService.updateStateByArchives(idList);
99 }
100 @GetMapping("updateArchivesStateByDestruction")
101 @ApiOperation(value = "编辑中的销毁操作")
102 public Result updateArchivesStateByDestruction(@ApiParam("档案销毁记录ID") @RequestParam(value = "bsm_destruction") String bsm_destruction) {
103 return dgarchivesdestructionService.updateArchivesStateByDestruction(bsm_destruction);
72 } 104 }
73 } 105 }
......
...@@ -18,7 +18,6 @@ import lombok.EqualsAndHashCode; ...@@ -18,7 +18,6 @@ import lombok.EqualsAndHashCode;
18 @Data 18 @Data
19 @EqualsAndHashCode(callSuper = false) 19 @EqualsAndHashCode(callSuper = false)
20 @ApiModel(value="档案销毁列表VO") 20 @ApiModel(value="档案销毁列表VO")
21 //TODO 该类属性暂时是完整的全部属性，需进行个性化的增删
22 public class DgArchivesDestructionListVO implements Serializable { 21 public class DgArchivesDestructionListVO implements Serializable {
23 22
24 private static final long serialVersionUID = 1L; 23 private static final long serialVersionUID = 1L;
...@@ -76,6 +75,10 @@ public class DgArchivesDestructionListVO implements Serializable { ...@@ -76,6 +75,10 @@ public class DgArchivesDestructionListVO implements Serializable {
76 */ 75 */
77 @ApiModelProperty(name = "xhrq", value = "销毁日期") 76 @ApiModelProperty(name = "xhrq", value = "销毁日期")
78 private Date xhrq; 77 private Date xhrq;
79 78 /**
79 * 数量（卷）
80 */
81 @ApiModelProperty(name = "ajNum", value = "数量（卷）")
82 private String ajNum;
80 83
81 } 84 }
......
...@@ -19,58 +19,21 @@ import com.pashanhoo.common.PageInfo; ...@@ -19,58 +19,21 @@ import com.pashanhoo.common.PageInfo;
19 @Data 19 @Data
20 @EqualsAndHashCode(callSuper = false) 20 @EqualsAndHashCode(callSuper = false)
21 @ApiModel(value="档案销毁列表查询请求实体") 21 @ApiModel(value="档案销毁列表查询请求实体")
22 //TODO 初始查询条件是全部，需要根据情况自行删减
23 public class DgArchivesDestructionSearchRequest extends PageInfo implements Serializable { 22 public class DgArchivesDestructionSearchRequest extends PageInfo implements Serializable {
24 23
25 private static final long serialVersionUID = 1L; 24 private static final long serialVersionUID = 1L;
26 25
27 /**
28 * 销毁标识码
29 */
30 @ApiModelProperty(name = "bsmDestruction", value = "销毁标识码")
31 private String bsmDestruction;
32 26
33 /** 27 /**
34 * 销毁清册编号 28 * 销毁清册编号
35 */ 29 */
36 @ApiModelProperty(name = "xhqcbh", value = "销毁清册编号") 30 @ApiModelProperty(name = "xhqcbh", value = "销毁清册编号")
37 private String xhqcbh; 31 private String xhqcbh;
38
39 /**
40 * 发起人
41 */
42 @ApiModelProperty(name = "fqr", value = "发起人")
43 private String fqr;
44
45 /**
46 * 发起日期
47 */
48 @ApiModelProperty(name = "fqrq", value = "发起日期")
49 private Date fqrq;
50
51 /**
52 * 销毁原因
53 */
54 @ApiModelProperty(name = "xhyy", value = "销毁原因")
55 private String xhyy;
56
57 /**
58 * 审核人
59 */
60 @ApiModelProperty(name = "shry", value = "审核人")
61 private String shry;
62
63 /**
64 * 审批意见
65 */
66 @ApiModelProperty(name = "shyj", value = "审批意见")
67 private String shyj;
68
69 /** 32 /**
70 * 监销人 33 * 档案号
71 */ 34 */
72 @ApiModelProperty(name = "xhr", value = "监销人") 35 @ApiModelProperty(name = "ajh", value = "档案号")
73 private String xhr; 36 private String ajh;
74 37
75 /** 38 /**
76 * 销毁日期 39 * 销毁日期
......
...@@ -2,7 +2,13 @@ package com.pashanhoo.destroy.mapper; ...@@ -2,7 +2,13 @@ package com.pashanhoo.destroy.mapper;
2 2
3 3
4 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 4 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 import com.pashanhoo.archive.entity.vo.DgArchivesListVO;
5 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;
10
11 import java.util.List;
6 12
7 /** 13 /**
8 * <p> 14 * <p>
...@@ -14,4 +20,11 @@ import com.pashanhoo.destroy.entity.DgArchivesDestructionDO; ...@@ -14,4 +20,11 @@ import com.pashanhoo.destroy.entity.DgArchivesDestructionDO;
14 */ 20 */
15 public interface DgArchivesDestructionMapper extends BaseMapper<DgArchivesDestructionDO> { 21 public interface DgArchivesDestructionMapper extends BaseMapper<DgArchivesDestructionDO> {
16 22
23 List<DgArchivesDestructionListVO> selectXhResult(DgArchivesDestructionSearchRequest request);
24
25 boolean updateArchivesStatus(@Param("bsm_destruction") String bsm_destruction,@Param("dazt") String dazt);
26
27 List<DgArchivesListVO> queryArchivesInfo(@Param("bsm_destruction") String bsm_destruction);
28
29 boolean updateArchivesStatusBatch(@Param("idList") List<String> idList,@Param("dazt") String dazt);
17 } 30 }
......
1 package com.pashanhoo.destroy.service; 1 package com.pashanhoo.destroy.service;
2 2
3 3
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import com.baomidou.mybatisplus.extension.service.IService; 4 import com.baomidou.mybatisplus.extension.service.IService;
6 import com.pashanhoo.destroy.entity.*; 5 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
6 import com.pashanhoo.common.Result;
7 import com.pashanhoo.destroy.entity.DgArchivesDestructionDO;
7 import com.pashanhoo.destroy.entity.vo.AddDgArchivesDestructionRequest; 8 import com.pashanhoo.destroy.entity.vo.AddDgArchivesDestructionRequest;
8 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionDetailVO; 9 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionDetailVO;
9 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionSearchRequest; 10 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionSearchRequest;
10 import com.pashanhoo.destroy.entity.vo.UpdateDgArchivesDestructionRequest; 11 import com.pashanhoo.destroy.entity.vo.UpdateDgArchivesDestructionRequest;
12 import com.pashanhoo.destroycatalog.entity.vo.AddDgDestructionCatalogRequest;
13
14 import java.util.List;
11 15
12 /** 16 /**
13 * <p> 17 * <p>
...@@ -18,13 +22,62 @@ import com.pashanhoo.destroy.entity.vo.UpdateDgArchivesDestructionRequest; ...@@ -18,13 +22,62 @@ import com.pashanhoo.destroy.entity.vo.UpdateDgArchivesDestructionRequest;
18 * @since 2021-11-05 22 * @since 2021-11-05
19 */ 23 */
20 public interface DgArchivesDestructionService extends IService<DgArchivesDestructionDO> { 24 public interface DgArchivesDestructionService extends IService<DgArchivesDestructionDO> {
25
26 /**
27 * 根据条件进行列表查询
28 * @param request
29 * @return
30 */
31 Result searchDgArchivesDestructionList(DgArchivesDestructionSearchRequest request);
32 /**
33 * 删除记录
34 * @param bsm_destruction
35 * @return
36 */
37 Result deleteDgArchivesDestruction(String bsm_destruction);
38 /**
39 * 根据条件进行列表查询
40 * @param bsm_destruction
41 * @return
42 */
43 Result queryArchivesInfo(String bsm_destruction);
44 /**
45 * 根据条件进行列表查询
46 * @param bsm_destruction
47 * @return
48 */
49 Result deleteDestructionArchivescataLog(String bsm_destruction);
50 /**
51 * 选择销毁档案List
52 * @param archivesList
53 * @return
54 */
55 Result addDestructionArchivesInfo(List<AddDgDestructionCatalogRequest> archivesList);
56 /**
57 * 销毁接口
58 * @param bsm_destruction
59 * @return
60 */
61 Result updateArchivesStateByDestruction(String bsm_destruction);
62 /**
63 * 新增档案销毁列表中的档案销毁操作
64 * @param idList
65 * @return
66 */
67 Result updateStateByArchives(List<String> idList);
68
21 /** 69 /**
22 * 新增记录 70 * 新增记录
23 * @param request 71 * @param request
24 * @return 72 * @return
25 */ 73 */
26 boolean insertDgArchivesDestruction(AddDgArchivesDestructionRequest request); 74 Result insertDgArchivesDestruction(AddDgArchivesDestructionRequest request);
27 75 /**
76 * 展示可以销毁的档案列表
77 * @param request
78 * @return
79 */
80 Result showArchivesForDestruction( DgArchivesSearchRequest request);
28 /** 81 /**
29 * 根据主键查询记录详情 82 * 根据主键查询记录详情
30 * @param id 83 * @param id
...@@ -39,10 +92,5 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc ...@@ -39,10 +92,5 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc
39 */ 92 */
40 boolean updateDgArchivesDestruction(UpdateDgArchivesDestructionRequest request); 93 boolean updateDgArchivesDestruction(UpdateDgArchivesDestructionRequest request);
41 94
42 /** 95
43 * 根据条件进行列表查询
44 * @param request
45 * @return
46 */
47 Page searchDgArchivesDestructionList(DgArchivesDestructionSearchRequest request);
48 } 96 }
......
1 package com.pashanhoo.destroy.service.impl; 1 package com.pashanhoo.destroy.service.impl;
2 2
3 3
4 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 import com.pashanhoo.destroy.entity.*; 6 import com.github.pagehelper.PageHelper;
6 import com.pashanhoo.destroy.entity.vo.AddDgArchivesDestructionRequest; 7 import com.github.pagehelper.PageInfo;
7 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionDetailVO; 8 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
8 import com.pashanhoo.destroy.entity.vo.DgArchivesDestructionSearchRequest; 9 import com.pashanhoo.archive.service.DgArchivesService;
9 import com.pashanhoo.destroy.entity.vo.UpdateDgArchivesDestructionRequest; 10 import com.pashanhoo.common.Result;
11 import com.pashanhoo.destroy.entity.DgArchivesDestructionConverter;
12 import com.pashanhoo.destroy.entity.DgArchivesDestructionDO;
13 import com.pashanhoo.destroy.entity.vo.*;
10 import com.pashanhoo.destroy.mapper.DgArchivesDestructionMapper; 14 import com.pashanhoo.destroy.mapper.DgArchivesDestructionMapper;
11 import com.pashanhoo.destroy.service.DgArchivesDestructionService; 15 import com.pashanhoo.destroy.service.DgArchivesDestructionService;
16 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogConverter;
17 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO;
18 import com.pashanhoo.destroycatalog.entity.vo.AddDgDestructionCatalogRequest;
19 import com.pashanhoo.destroycatalog.service.DgDestructionCatalogService;
12 import org.springframework.beans.factory.annotation.Autowired; 20 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Service; 21 import org.springframework.stereotype.Service;
22 import org.springframework.transaction.annotation.Transactional;
14 23
15 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 24 import java.math.BigDecimal;
16 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 25 import java.util.List;
17 26
18 /** 27 /**
19 * <p> 28 * <p>
...@@ -32,15 +41,32 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest ...@@ -32,15 +41,32 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest
32 @Autowired 41 @Autowired
33 private DgArchivesDestructionMapper dgarchivesdestructionMapper; 42 private DgArchivesDestructionMapper dgarchivesdestructionMapper;
34 43
44 @Autowired
45 private DgDestructionCatalogService catalogService;
46 @Autowired
47 private DgDestructionCatalogConverter catalogConverter;
48 @Autowired
49 private DgArchivesService archivesService;
50
51
35 /** 52 /**
36 * 新增记录 53 * 新增记录
37 * @param request 54 * @param request
38 * @return 55 * @return
39 */ 56 */
40 @Override 57 @Override
41 public boolean insertDgArchivesDestruction(AddDgArchivesDestructionRequest request) { 58 public Result insertDgArchivesDestruction(AddDgArchivesDestructionRequest request) {
42 DgArchivesDestructionDO dgarchivesdestructionDO = dgarchivesdestructionConverter.addRequest2DO(request); 59 DgArchivesDestructionDO dgarchivesdestructionDO = dgarchivesdestructionConverter.addRequest2DO(request);
43 return this.save(dgarchivesdestructionDO); 60 String id= IdWorker.get32UUID();
61 dgarchivesdestructionDO.setBsmDestruction(id);
62 this.save(dgarchivesdestructionDO);
63 return Result.ok(id);
64 }
65
66 @Override
67 public Result showArchivesForDestruction(DgArchivesSearchRequest request) {
68 request.setDazt(new BigDecimal("4"));
69 return Result.ok(archivesService.searchDgArchivesList(request));
44 } 70 }
45 71
46 /** 72 /**
...@@ -71,17 +97,57 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest ...@@ -71,17 +97,57 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest
71 * @return 97 * @return
72 */ 98 */
73 @Override 99 @Override
74 public Page searchDgArchivesDestructionList(DgArchivesDestructionSearchRequest request) { 100 public Result searchDgArchivesDestructionList(DgArchivesDestructionSearchRequest request) {
75 Page<DgArchivesDestructionDO> pageParam = new Page<DgArchivesDestructionDO>(request.getCurrentPage(), request.getPageSize()); 101 PageHelper.startPage(request.getCurrentPage(), request.getPageSize());
76 QueryWrapper<DgArchivesDestructionDO> wrapper = new QueryWrapper<>(); 102 List<DgArchivesDestructionListVO> jyListVOList = dgarchivesdestructionMapper.selectXhResult(request);
77 //设置默认排序 103 PageInfo<DgArchivesDestructionListVO> pageInfo = new PageInfo<DgArchivesDestructionListVO>(jyListVOList);
78 wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) : wrapper.orderByAsc(request.getSortField()); 104 return Result.ok(pageInfo);
79 105
80 //TODO 根据当前情况设置wrapper条件 106 }
81 107
82 Page page = this.page(pageParam, wrapper); 108 @Override
83 //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象 109 @Transactional(rollbackFor = Exception.class)
84 return page.setRecords(dgarchivesdestructionConverter.doList2ListVOList(page.getRecords())); 110 public Result deleteDgArchivesDestruction(String bsm_destruction) {
111 //删除销毁记录表数据
112 dgarchivesdestructionMapper.deleteById(bsm_destruction);
113 //删除档案销毁目录数据
114 catalogService.deleteDestructionCatalog(bsm_destruction);
115 //修改档案信息表状态
116 dgarchivesdestructionMapper.updateArchivesStatus(bsm_destruction,"4");
117 return Result.ok();
85 } 118 }
86 119
120 @Override
121 public Result queryArchivesInfo(String bsm_destruction) {
122 return Result.ok(dgarchivesdestructionMapper.queryArchivesInfo(bsm_destruction));
123 }
124
125 @Override
126 public Result deleteDestructionArchivescataLog(String bsm_destruction) {
127 catalogService.deleteDestructionCatalog(bsm_destruction);
128 return Result.ok();
129 }
130
131 @Override
132 public Result addDestructionArchivesInfo(List<AddDgDestructionCatalogRequest> archivesList) {
133 List<DgDestructionCatalogDO> list=catalogConverter.addRequestList2DO(archivesList);
134 catalogService.saveBatch(list);
135 return Result.ok();
136 }
137
138 @Override
139 public Result updateArchivesStateByDestruction(String bsm_destruction) {
140 //修改档案信息表状态
141 dgarchivesdestructionMapper.updateArchivesStatus(bsm_destruction,"6");
142 return Result.ok();
143 }
144
145 @Override
146 public Result updateStateByArchives(List<String> idList) {
147 dgarchivesdestructionMapper.updateArchivesStatusBatch(idList,"6");
148 return Result.ok();
149 }
150
151
152
87 } 153 }
......
...@@ -22,4 +22,6 @@ public interface DgDestructionCatalogConverter{ ...@@ -22,4 +22,6 @@ public interface DgDestructionCatalogConverter{
22 DgDestructionCatalogListVO do2ListVO(DgDestructionCatalogDO dgdestructioncatalogDO); 22 DgDestructionCatalogListVO do2ListVO(DgDestructionCatalogDO dgdestructioncatalogDO);
23 23
24 List<DgDestructionCatalogListVO> doList2ListVOList(List<DgDestructionCatalogDO> dgdestructioncatalogDOList); 24 List<DgDestructionCatalogListVO> doList2ListVOList(List<DgDestructionCatalogDO> dgdestructioncatalogDOList);
25
26 List<DgDestructionCatalogDO> addRequestList2DO(List<AddDgDestructionCatalogRequest> request);
25 } 27 }
......
...@@ -26,8 +26,8 @@ public class DgDestructionCatalogDO implements Serializable { ...@@ -26,8 +26,8 @@ public class DgDestructionCatalogDO implements Serializable {
26 /** 26 /**
27 * 销毁目录标识码 27 * 销毁目录标识码
28 */ 28 */
29 @TableId(value = "BSM_LENDCATALOG", type = IdType.UUID) 29 @TableId(value = "BSM_DESTRUCTIONCATALOG", type = IdType.UUID)
30 private String bsmLendcatalog; 30 private String bsmDestructioncatalog;
31 31
32 /** 32 /**
33 * 档案标识码 33 * 档案标识码
......
1 package com.pashanhoo.destroycatalog.mapper; 1 package com.pashanhoo.destroycatalog.mapper;
2 2
3 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 import com.pashanhoo.archive.entity.DgArchivesDO;
4 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO; 5 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO;
6 import org.apache.ibatis.annotations.Param;
7
8 import java.util.List;
5 9
6 /** 10 /**
7 * <p> 11 * <p>
...@@ -13,4 +17,7 @@ import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO; ...@@ -13,4 +17,7 @@ import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO;
13 */ 17 */
14 public interface DgDestructionCatalogMapper extends BaseMapper<DgDestructionCatalogDO> { 18 public interface DgDestructionCatalogMapper extends BaseMapper<DgDestructionCatalogDO> {
15 19
20 List<DgArchivesDO> getDestructionCatalog(@Param("bsmDestruction") String bsmDestruction);
21
22
16 } 23 }
......
1 package com.pashanhoo.destroycatalog.service; 1 package com.pashanhoo.destroycatalog.service;
2 2
3 import com.baomidou.mybatisplus.extension.service.IService; 3 import com.baomidou.mybatisplus.extension.service.IService;
4 import com.pashanhoo.common.Result;
4 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO; 5 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO;
5 import com.pashanhoo.destroycatalog.entity.vo.AddDgDestructionCatalogRequest; 6 import com.pashanhoo.destroycatalog.entity.vo.AddDgDestructionCatalogRequest;
6 import com.pashanhoo.destroycatalog.entity.vo.DgDestructionCatalogDetailVO; 7 import com.pashanhoo.destroycatalog.entity.vo.DgDestructionCatalogDetailVO;
...@@ -44,4 +45,18 @@ public interface DgDestructionCatalogService extends IService<DgDestructionCatal ...@@ -44,4 +45,18 @@ public interface DgDestructionCatalogService extends IService<DgDestructionCatal
44 * @return 45 * @return
45 */ 46 */
46 Page searchDgDestructionCatalogList(DgDestructionCatalogSearchRequest request); 47 Page searchDgDestructionCatalogList(DgDestructionCatalogSearchRequest request);
48 /**
49 * 通过销毁标识码删除档案销毁目录数据
50 */
51 Result deleteDestructionCatalog(String bsmDestruction);
52 /**
53 * 通过档案标识码删除档案销毁目录数据
54 */
55 Result deleteCatalogByarchiveId(String bsm_archives);
56
57 /**
58 * 通过档案标识码查询档案销毁目录数据
59 */
60 Result getDestructionCatalog(String bsm_archives);
61
47 } 62 }
......
1 package com.pashanhoo.destroycatalog.service.impl; 1 package com.pashanhoo.destroycatalog.service.impl;
2 2
3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 import com.pashanhoo.common.Result;
4 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogConverter; 5 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogConverter;
5 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO; 6 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO;
6 import com.pashanhoo.destroycatalog.entity.vo.AddDgDestructionCatalogRequest; 7 import com.pashanhoo.destroycatalog.entity.vo.AddDgDestructionCatalogRequest;
...@@ -84,4 +85,40 @@ public class DgDestructionCatalogServiceImpl extends ServiceImpl<DgDestructionCa ...@@ -84,4 +85,40 @@ public class DgDestructionCatalogServiceImpl extends ServiceImpl<DgDestructionCa
84 return page.setRecords(dgdestructioncatalogConverter.doList2ListVOList(page.getRecords())); 85 return page.setRecords(dgdestructioncatalogConverter.doList2ListVOList(page.getRecords()));
85 } 86 }
86 87
88 @Override
89 public Result deleteDestructionCatalog(String bsmDestruction) {
90 QueryWrapper<DgDestructionCatalogDO> wrapper = new QueryWrapper<>();
91 wrapper.eq(bsmDestruction!=null && !"".equals(bsmDestruction),"BSM_DESTRUCTION",bsmDestruction);
92 int result=dgdestructioncatalogMapper.delete(wrapper);
93 if(result!=0){
94 return Result.ok();
95 }else{
96 return Result.error("操作失败");
97 }
98
99 }
100
101 @Override
102 public Result deleteCatalogByarchiveId(String bsm_archives) {
103 QueryWrapper<DgDestructionCatalogDO> wrapper = new QueryWrapper<>();
104 wrapper.eq(bsm_archives!=null && !"".equals(bsm_archives),"BSM_ARCHIVES",bsm_archives);
105 int result=dgdestructioncatalogMapper.delete(wrapper);
106 if(result!=0){
107 return Result.ok();
108 }else{
109 return Result.error("操作失败");
110 }
111 }
112
113
114
115 @Override
116 public Result getDestructionCatalog(String bsm_archives) {
117 QueryWrapper<DgDestructionCatalogDO> wrapper = new QueryWrapper<>();
118 wrapper.eq(bsm_archives!=null && !"".equals(bsm_archives),"BSM_ARCHIVES",bsm_archives);
119 dgdestructioncatalogMapper.selectOne(wrapper);
120
121 return null;
122 }
123
87 } 124 }
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.pashanhoo.destroy.mapper.DgArchivesDestructionMapper"> 3 <mapper namespace="com.pashanhoo.destroy.mapper.DgArchivesDestructionMapper">
4
5 <!-- 通用查询映射结果 --> 4 <!-- 通用查询映射结果 -->
6 <resultMap id="BaseResultMap" type="com.pashanhoo.destroy.entity.DgArchivesDestructionDO"> 5 <resultMap id="BaseResultMap" type="com.pashanhoo.destroy.entity.DgArchivesDestructionDO">
7 <id column="BSM_DESTRUCTION" property="bsmDestruction" /> 6 <id column="BSM_DESTRUCTION" property="bsmDestruction" />
...@@ -14,9 +13,97 @@ ...@@ -14,9 +13,97 @@
14 <result column="XHR" property="xhr" /> 13 <result column="XHR" property="xhr" />
15 <result column="XHRQ" property="xhrq" /> 14 <result column="XHRQ" property="xhrq" />
16 </resultMap> 15 </resultMap>
17 16 <!-- 销毁页面记录查询 -->
17 <resultMap id="ShowDestructionResultMap" type="com.pashanhoo.destroy.entity.vo.DgArchivesDestructionListVO">
18 <id column="BSM_DESTRUCTION" property="bsmDestruction" />
19 <result column="XHQCBH" property="xhqcbh" />
20 <result column="FQR" property="fqr" />
21 <result column="FQRQ" property="fqrq" />
22 <result column="XHYY" property="xhyy" />
23 <result column="SHRY" property="shry" />
24 <result column="SHYJ" property="shyj" />
25 <result column="XHR" property="xhr" />
26 <result column="XHRQ" property="xhrq" />
27 <result column="AJ_NUM" property="ajNum" />
28 </resultMap>
29 <!-- 档案列表记录查询 -->
30 <resultMap id="ShowArchivesInfoResultMap" type="com.pashanhoo.archive.entity.vo.DgArchivesListVO">
31 <id column="BSM_ARCHIVES" property="bsmArchives" />
32 <result column="AJBT" property="ajbt" />
33 <result column="ZTC" property="ztc" />
34 <result column="FLH" property="flh" />
35 <result column="MLH" property="mlh" />
36 <result column="AJH" property="ajh" />
37 <result column="ND" property="nd" />
38 <result column="JS" property="js" />
39 <result column="YS" property="ys" />
40 <result column="BGQX" property="bgqx" />
41 <result column="QSRQ" property="qsrq" />
42 <result column="ZZRQ" property="zzrq" />
43 <result column="MJ" property="mj" />
44 <result column="HH" property="hh" />
45 <result column="CFWZ" property="cfwz" />
46 <result column="CJR" property="cjr" />
47 <result column="CJRQ" property="cjrq" />
48 <result column="HCR" property="hcr" />
49 <result column="BZ" property="bz" />
50 <result column="SMZT" property="smzt" />
51 <result column="DAZT" property="dazt" />
52 <result column="CDJGBM" property="cdjgbm" />
53 <result column="DALY" property="daly" />
54 </resultMap>
18 <!-- 通用查询结果列 --> 55 <!-- 通用查询结果列 -->
19 <sql id="Base_Column_List"> 56 <sql id="Base_Column_List">
20 BSM_DESTRUCTION, XHQCBH, FQR, FQRQ, XHYY, SHRY, SHYJ, XHR, XHRQ 57 BSM_DESTRUCTION, XHQCBH, FQR, FQRQ, XHYY, SHRY, SHYJ, XHR, XHRQ
21 </sql> 58 </sql>
59 <update id="updateArchivesStatus" parameterType="java.lang.String">
60 update dg_archives b
61 set b.dazt = #{dazt,jdbcType=VARCHAR}
62 where exists (select 1
63 from DG_DESTRUCTION_CATALOG a
64 where a.bsm_destruction = #{bsm_destruction,jdbcType=VARCHAR}
65 and b.bsm_archives = a.bsm_archives)
66 </update>
67 <update id="updateArchivesStatusBatch">
68 update dg_archives b
69 set b.dazt = #{dazt,jdbcType=VARCHAR} where bsm_archives in
70 <foreach collection="idList" index="index" item="item"
71 separator="," open="(" close=")">
72 #{item,jdbcType=VARCHAR}
73 </foreach>
74 </update>
75 <select id="selectXhResult" resultMap="ShowDestructionResultMap">
76 select a.BSM_DESTRUCTION,
77 a.XHQCBH,
78 a.FQR,
79 a.FQRQ,
80 a.XHYY,
81 a.SHRY,
82 a.SHYJ,
83 a.XHR,
84 a.XHRQ,
85 count(1) over(partition by b.bsm_destruction, b.bsm_archives) aj_num
86 from dg_archives_destruction a, dg_destruction_catalog b
87 where a.bsm_destruction = b.bsm_destruction
88 and exists
89 (select 1 from dg_archives c where c.bsm_archives = b.bsm_archives
90 <if test="ajh!=null and ajh!='' ">
91 and c.ajh=#{ajh,jdbcType=VARCHAR}
92 </if>
93 )
94 <if test="xhqcbh!=null and xhqcbh!='' ">
95 and a.xhqcbh=#{xhqcbh,jdbcType=VARCHAR}
96 </if>
97 <if test="xhrq!=null and xhrq!='' ">
98 and a.XHRQ=#{xhrq,jdbcType=TIMESTAMP}
99 </if>
100 order by a.XHRQ desc
101 </select>
102 <select id="queryArchivesInfo" resultMap="ShowArchivesInfoResultMap">
103 select * from dg_archives b
104 where exists (select 1
105 from DG_DESTRUCTION_CATALOG a
106 where a.bsm_destruction = #{bsm_destruction,jdbcType=VARCHAR}
107 and b.bsm_archives = a.bsm_archives)
108 </select>
22 </mapper> 109 </mapper>
......
...@@ -33,4 +33,5 @@ ...@@ -33,4 +33,5 @@
33 <sql id="Base_Column_List"> 33 <sql id="Base_Column_List">
34 BSM_ARCHIVES, AJBT, ZTC, FLH, MLH, AJH, ND, JS, YS, BGQX, QSRQ, ZZRQ, MJ, HH, CFWZ, CJR, CJRQ, HCR, BZ, SMZT, DAZT, CDJGBM, DALY 34 BSM_ARCHIVES, AJBT, ZTC, FLH, MLH, AJH, ND, JS, YS, BGQX, QSRQ, ZZRQ, MJ, HH, CFWZ, CJR, CJRQ, HCR, BZ, SMZT, DAZT, CDJGBM, DALY
35 </sql> 35 </sql>
36
36 </mapper> 37 </mapper>
......
...@@ -4,13 +4,16 @@ ...@@ -4,13 +4,16 @@
4 4
5 <!-- 通用查询映射结果 --> 5 <!-- 通用查询映射结果 -->
6 <resultMap id="BaseResultMap" type="com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO"> 6 <resultMap id="BaseResultMap" type="com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO">
7 <id column="BSM_LENDCATALOG" property="bsmLendcatalog" /> 7 <id column="BSM_DESTRUCTIONCATALOG" property="bsmDestructioncatalog" />
8 <result column="BSM_ARCHIVES" property="bsmArchives" /> 8 <result column="BSM_ARCHIVES" property="bsmArchives" />
9 <result column="BSM_DESTRUCTION" property="bsmDestruction" /> 9 <result column="BSM_DESTRUCTION" property="bsmDestruction" />
10 </resultMap> 10 </resultMap>
11 11
12 <!-- 通用查询结果列 --> 12 <!-- 通用查询结果列 -->
13 <sql id="Base_Column_List"> 13 <sql id="Base_Column_List">
14 BSM_LENDCATALOG, BSM_ARCHIVES, BSM_DESTRUCTION 14 BSM_DESTRUCTIONCATALOG, BSM_ARCHIVES, BSM_DESTRUCTION
15 </sql> 15 </sql>
16 <select id="getDestructionCatalog" resultType="com.pashanhoo.archive.entity.DgArchivesDO">
17
18 </select>
16 </mapper> 19 </mapper>
......