Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
8875d2fa by 荆蔚杰
Options

档案信息列表（查找） 

案卷封皮展示
档案基本信息展示
案卷基本信息修改
1 parent 9878f474
Inline Side-by-side
Showing 18 changed files with 426 additions and 107 deletions
1 package com.pashanhoo.archive.controller; 1 package com.pashanhoo.archive.controller;
2 2
3 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest; 3 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.pashanhoo.archive.entity.vo.*;
4 import com.pashanhoo.archive.service.DgArchivesService; 5 import com.pashanhoo.archive.service.DgArchivesService;
5 import com.pashanhoo.common.Result; 6 import com.pashanhoo.common.Result;
6 import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
7 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
8 import org.springframework.web.bind.annotation.RestController; 7 import org.springframework.web.bind.annotation.RestController;
9 import org.springframework.web.bind.annotation.*; 8 import org.springframework.web.bind.annotation.*;
10 import io.swagger.annotations.Api; 9 import io.swagger.annotations.Api;
...@@ -48,26 +47,32 @@ public class DgArchivesController { ...@@ -48,26 +47,32 @@ public class DgArchivesController {
48 } 47 }
49 48
50 @PutMapping("updateDgArchives") 49 @PutMapping("updateDgArchives")
51 @ApiOperation("修改案卷基本信息") 50 @ApiOperation("修改案卷基本信息,业务信息,不动产信息")
52 public Result updateDgArchives(@RequestBody UpdateDgArchivesRequest request){ 51 public Result updateDgArchives(@RequestBody UpdateArchiveAndOtherInfoRequest request){
53 if(dgarchivesService.updateDgArchives(request)) { 52 if(dgarchivesService.updateDgArchivesReplenish(request)) {
54 return Result.ok("修改成功"); 53 return Result.ok("修改成功");
55 } 54 }
56 return Result.error("修改失败"); 55 return Result.error("修改失败");
57 } 56 }
58 57
59 @GetMapping("getDgArchivesDetailById") 58 @GetMapping("getDgArchivesDetailById")
60 @ApiOperation(value = "读取明细") 59 @ApiOperation(value = "案卷基本信息")
61 public Result getDgArchivesDetailById(@ApiParam("案卷基本信息ID") @RequestParam String id){ 60 public Result getDgArchivesDetailById(@ApiParam("案卷标识码") @RequestParam String bsmArchive){
62 return Result.ok(dgarchivesService.getDgArchivesDetailById(id)); 61 return Result.ok(dgarchivesService.getDgArchivesDetailById(bsmArchive));
63 } 62 }
64 63
65 @PostMapping("search") 64 @PostMapping("searchArchives")
66 @ApiOperation(value = "根据条件进行列表查询") 65 @ApiOperation(value = "档案查找")
67 public Result searchDgArchivesList(@RequestBody DgArchivesSearchRequest request) { 66 public Result<IPage<SearchArchiveVO>> searchArchives(@RequestBody SearchArchiveRequest request) {
68 //TODO 默认排序条件设置 67
69 request.defaultFillPageProp("",""); 68 return Result.ok(dgarchivesService.searchArchive(request));
70 return Result.ok(dgarchivesService.searchDgArchivesList(request)); 69 }
70
71 @GetMapping("searchArchivesCover")
72 @ApiOperation(value = "案卷封皮信息查找")
73 public Result<ArchiveDetailAndCoverVO> searchArchivesCover(@ApiParam("档案标识码") @RequestParam String bsmArchive) {
74
75 return Result.ok(dgarchivesService.searchArchivesCover(bsmArchive));
71 } 76 }
72 77
73 /** 78 /**
......
1 package com.pashanhoo.archive.entity.vo;
2
3 import com.pashanhoo.bdcdy.entity.vo.DgBdcdyDetailVO;
4 import com.pashanhoo.business.entity.vo.DgBusinessDetailVO;
5 import io.swagger.annotations.ApiModel;
6 import lombok.Data;
7 import lombok.EqualsAndHashCode;
8
9 import java.io.Serializable;
10 import java.util.List;
11
12 /**
13 * 档案封皮返回实体
14 */
15 @Data
16 @EqualsAndHashCode(callSuper = false)
17 @ApiModel(value = "档案封皮和案卷信息返回实体")
18 public class ArchiveDetailAndCoverVO implements Serializable {
19
20 private static final long serialVersionUID = 1L;
21
22 /**
23 * 案卷基本信息实体
24 */
25 private DgArchivesDetailVO dgArchivesDetailVO;
26
27 /**
28 * 不动产信息实体集合
29 */
30 private List<DgBdcdyDetailVO> dgBdcdyDetailVOList;
31
32 /**
33 * 业务信息实体
34 */
35 private DgBusinessDetailVO dgBusinessDetailVO;
36 }
1 package com.pashanhoo.archive.entity.vo;
2
3 import com.pashanhoo.common.PageInfo;
4 import io.swagger.annotations.ApiModel;
5 import io.swagger.annotations.ApiModelProperty;
6 import lombok.Data;
7 import lombok.EqualsAndHashCode;
8
9 import java.io.Serializable;
10
11 /**
12 * 档案查找请求实体
13 */
14 @Data
15 @EqualsAndHashCode(callSuper = false)
16 @ApiModel(value="档案查找请求实体")
17 public class SearchArchiveRequest extends PageInfo implements Serializable {
18
19 private static final long serialVersionUID = 1L;
20
21 /**
22 * 档案号
23 */
24 @ApiModelProperty(name = "ajh", value = "档案号")
25 private String ajh;
26
27 /**
28 * 目录号
29 */
30 @ApiModelProperty(name = "mlh", value = "目录号")
31 private String mlh;
32
33 /**
34 * 盒号
35 */
36 @ApiModelProperty(name = "hh", value = "盒号")
37 private String hh;
38
39 /**
40 * 档案状态
41 * (1：正在接收；2：正在补录；3：正在修改；4：在库；5：正在销毁；6：已销毁；7：正在借阅；8：已借阅)
42 */
43 @ApiModelProperty(name = "dazt", value = "档案状态.1：正在接收；2：正在补录；3：正在修改；4：在库；5：正在销毁；6：已销毁；7：正在借阅；8：已借阅")
44 private String dazt;
45
46 /**
47 * 业务号
48 */
49 @ApiModelProperty(name = "ywh", value = "业务号")
50 private String ywh;
51
52 /**
53 * 不动产权证号
54 */
55 @ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
56 private String bdcqzh;
57
58 /**
59 * 不动产单元号
60 */
61 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
62 private String bdcdyh;
63
64 /**
65 * 权利类型
66 */
67 @ApiModelProperty(name = "qllx", value = "权利类型")
68 private String qllx;
69 }
1 package com.pashanhoo.archive.entity.vo;
2
3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty;
5 import lombok.Data;
6 import lombok.EqualsAndHashCode;
7
8 import java.io.Serializable;
9
10 /**
11 * 档案查找返回实体
12 */
13 @Data
14 @EqualsAndHashCode(callSuper = false)
15 @ApiModel(value="档案查找返回实体")
16 public class SearchArchiveVO implements Serializable {
17
18 private static final long serialVersionUID = 1L;
19
20 /**
21 * 序号
22 */
23 @ApiModelProperty(name = "xh", value = "序号")
24 private String xh;
25
26 /**
27 * 档案标识码
28 */
29 @ApiModelProperty(name = "bsmArchive", value = "档案标识码")
30 private String bsmArchive;
31
32 /**
33 * 档案状态
34 * (1：正在接收；2：正在补录；3：正在修改；4：在库；5：正在销毁；6：已销毁；7：正在借阅；8：已借阅)
35 */
36 @ApiModelProperty(name = "dazt", value = "档案状态.1：正在接收；2：正在补录；3：正在修改；4：在库；5：正在销毁；6：已销毁；7：正在借阅；8：已借阅")
37 private String dazt;
38
39 /**
40 * 档案来源
41 * 1:不动产归档.2:存量档案补录
42 */
43 @ApiModelProperty(name = "daly", value = "档案来源")
44 private String daly;
45
46 /**
47 * 档案号
48 */
49 @ApiModelProperty(name = "ajh", value = "档案号")
50 private String ajh;
51
52 /**
53 * 存放位置
54 */
55 @ApiModelProperty(name = "cfwz", value = "存放位置")
56 private String cfwz;
57
58 /**
59 * 盒号
60 */
61 @ApiModelProperty(name = "hh", value = "盒号")
62 private String hh;
63
64 /**
65 * 不动产权证号
66 */
67 @ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
68 private String bdcqzh;
69
70 /**
71 * 权利人
72 */
73 @ApiModelProperty(name = "qlr", value = "权利人")
74 private String qlr;
75
76 /**
77 * 义务人
78 */
79 @ApiModelProperty(name = "ywr", value = "义务人")
80 private String ywr;
81
82 /**
83 * 业务号
84 */
85 @ApiModelProperty(name = "ywh", value = "业务号")
86 private String ywh;
87
88 /**
89 * 不动产单元号
90 */
91 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
92 private String bdcdyh;
93
94 /**
95 * 权利类型
96 */
97 @ApiModelProperty(name = "qllx", value = "权利类型")
98 private String qllx;
99 }
1 package com.pashanhoo.replenish.entity.vo; 1 package com.pashanhoo.archive.entity.vo;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.List; 4 import java.util.List;
5 5
6 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
7 import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
8 import com.pashanhoo.bdcdy.entity.vo.AddDgBdcdyRequest;
9 import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest; 6 import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest;
10 import com.pashanhoo.business.entity.vo.AddDgBusinessRequest;
11 import com.pashanhoo.business.entity.vo.UpdateDgBusinessRequest; 7 import com.pashanhoo.business.entity.vo.UpdateDgBusinessRequest;
12 import io.swagger.annotations.ApiModel; 8 import io.swagger.annotations.ApiModel;
13 import io.swagger.annotations.ApiModelProperty; 9 import io.swagger.annotations.ApiModelProperty;
...@@ -16,7 +12,7 @@ import lombok.EqualsAndHashCode; ...@@ -16,7 +12,7 @@ import lombok.EqualsAndHashCode;
16 12
17 /** 13 /**
18 * <p> 14 * <p>
19 * 档案补录信息修改请求实体 15 * 档案信息,业务信息,不动产单元修改请求实体
20 * </p> 16 * </p>
21 * 17 *
22 * @author 18 * @author
...@@ -24,8 +20,8 @@ import lombok.EqualsAndHashCode; ...@@ -24,8 +20,8 @@ import lombok.EqualsAndHashCode;
24 */ 20 */
25 @Data 21 @Data
26 @EqualsAndHashCode(callSuper = false) 22 @EqualsAndHashCode(callSuper = false)
27 @ApiModel(value = "档案补录信息修改请求实体") 23 @ApiModel(value = "档案信息,业务信息,不动产单元修改请求实体")
28 public class UpdateDgArchivesReplenishRequest implements Serializable { 24 public class UpdateArchiveAndOtherInfoRequest implements Serializable {
29 25
30 private static final long serialVersionUID = 1L; 26 private static final long serialVersionUID = 1L;
31 27
......
...@@ -2,10 +2,13 @@ package com.pashanhoo.archive.entity.vo; ...@@ -2,10 +2,13 @@ package com.pashanhoo.archive.entity.vo;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 import java.io.Serializable; 4 import java.io.Serializable;
5
6 import com.fasterxml.jackson.annotation.JsonFormat;
5 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 9 import lombok.Data;
8 import lombok.EqualsAndHashCode; 10 import lombok.EqualsAndHashCode;
11 import org.springframework.format.annotation.DateTimeFormat;
9 12
10 /** 13 /**
11 * <p> 14 * <p>
...@@ -86,12 +89,16 @@ public class UpdateDgArchivesRequest implements Serializable { ...@@ -86,12 +89,16 @@ public class UpdateDgArchivesRequest implements Serializable {
86 * 起始日期 89 * 起始日期
87 */ 90 */
88 @ApiModelProperty(name = "qsrq", value = "起始日期") 91 @ApiModelProperty(name = "qsrq", value = "起始日期")
92 @DateTimeFormat(pattern = "yyyy-MM-dd")
93 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
89 private Date qsrq; 94 private Date qsrq;
90 95
91 /** 96 /**
92 * 终止日期 97 * 终止日期
93 */ 98 */
94 @ApiModelProperty(name = "zzrq", value = "终止日期") 99 @ApiModelProperty(name = "zzrq", value = "终止日期")
100 @DateTimeFormat(pattern = "yyyy-MM-dd")
101 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
95 private Date zzrq; 102 private Date zzrq;
96 103
97 /** 104 /**
...@@ -122,6 +129,8 @@ public class UpdateDgArchivesRequest implements Serializable { ...@@ -122,6 +129,8 @@ public class UpdateDgArchivesRequest implements Serializable {
122 * 创建日期 129 * 创建日期
123 */ 130 */
124 @ApiModelProperty(name = "cjrq", value = "创建日期") 131 @ApiModelProperty(name = "cjrq", value = "创建日期")
132 @DateTimeFormat(pattern = "yyyy-MM-dd")
133 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
125 private Date cjrq; 134 private Date cjrq;
126 135
127 /** 136 /**
......
...@@ -2,7 +2,10 @@ package com.pashanhoo.archive.mapper; ...@@ -2,7 +2,10 @@ package com.pashanhoo.archive.mapper;
2 2
3 3
4 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 4 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 import com.baomidou.mybatisplus.core.metadata.IPage;
5 import com.pashanhoo.archive.entity.DgArchivesDO; 6 import com.pashanhoo.archive.entity.DgArchivesDO;
7 import com.pashanhoo.archive.entity.vo.SearchArchiveRequest;
8 import com.pashanhoo.archive.entity.vo.SearchArchiveVO;
6 import org.apache.ibatis.annotations.Param; 9 import org.apache.ibatis.annotations.Param;
7 10
8 import java.util.List; 11 import java.util.List;
...@@ -19,4 +22,6 @@ public interface DgArchivesMapper extends BaseMapper<DgArchivesDO> { ...@@ -19,4 +22,6 @@ public interface DgArchivesMapper extends BaseMapper<DgArchivesDO> {
19 22
20 boolean updateArchivesInfoByReceiveIdList(@Param("idList") List<String> idList,@Param("dazt") String dazt); 23 boolean updateArchivesInfoByReceiveIdList(@Param("idList") List<String> idList,@Param("dazt") String dazt);
21 24
25 IPage<SearchArchiveVO> searchArchive(@Param("pageParam") IPage<SearchArchiveVO> pageParam, @Param("request") SearchArchiveRequest request);
26
22 } 27 }
......
1 package com.pashanhoo.archive.service; 1 package com.pashanhoo.archive.service;
2 2
3 import com.baomidou.mybatisplus.core.metadata.IPage;
3 import com.baomidou.mybatisplus.extension.service.IService; 4 import com.baomidou.mybatisplus.extension.service.IService;
4 import com.pashanhoo.archive.entity.DgArchivesDO; 5 import com.pashanhoo.archive.entity.DgArchivesDO;
5 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest; 6 import com.pashanhoo.archive.entity.vo.*;
6 import com.pashanhoo.archive.entity.vo.DgArchivesDetailVO;
7 import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
8 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
9 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 7 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
10 8
11 import java.util.List; 9 import java.util.List;
...@@ -27,18 +25,19 @@ public interface DgArchivesService extends IService<DgArchivesDO> { ...@@ -27,18 +25,19 @@ public interface DgArchivesService extends IService<DgArchivesDO> {
27 boolean insertDgArchives(AddDgArchivesRequest request); 25 boolean insertDgArchives(AddDgArchivesRequest request);
28 26
29 /** 27 /**
30 * 根据主键查询记录详情 28 * 查询案卷基本信息
31 * @param id 29 * @param bsmArchive
32 * @return 30 * @return
33 */ 31 */
34 DgArchivesDetailVO getDgArchivesDetailById(String id); 32 ArchiveDetailAndCoverVO getDgArchivesDetailById(String bsmArchive);
35 33
36 /** 34 /**
37 * 修改单条记录 35 * 修改案卷基本信息,业务信息,不动产信息
36 *
38 * @param request 37 * @param request
39 * @return 38 * @return
40 */ 39 */
41 boolean updateDgArchives(UpdateDgArchivesRequest request); 40 boolean updateDgArchivesReplenish(UpdateArchiveAndOtherInfoRequest request);
42 41
43 /** 42 /**
44 * 根据条件进行列表查询 43 * 根据条件进行列表查询
...@@ -53,4 +52,18 @@ public interface DgArchivesService extends IService<DgArchivesDO> { ...@@ -53,4 +52,18 @@ public interface DgArchivesService extends IService<DgArchivesDO> {
53 * @return 52 * @return
54 */ 53 */
55 List getArchiveLiftMenu(String bsmArchives); 54 List getArchiveLiftMenu(String bsmArchives);
55
56 /**
57 * 档案查找
58 * @param request
59 * @return
60 */
61 IPage<SearchArchiveVO> searchArchive(SearchArchiveRequest request);
62
63 /**
64 * 档案封皮查找
65 * @param bsmArchive
66 * @return
67 */
68 ArchiveDetailAndCoverVO searchArchivesCover(String bsmArchive);
56 } 69 }
......
1 package com.pashanhoo.archive.service.impl; 1 package com.pashanhoo.archive.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.metadata.IPage;
3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 import com.pashanhoo.archive.entity.DgArchivesConverter; 5 import com.pashanhoo.archive.entity.DgArchivesConverter;
5 import com.pashanhoo.archive.entity.DgArchivesDO; 6 import com.pashanhoo.archive.entity.DgArchivesDO;
6 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest; 7 import com.pashanhoo.archive.entity.vo.*;
7 import com.pashanhoo.archive.entity.vo.DgArchivesDetailVO;
8 import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
9 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
10 import com.pashanhoo.archive.mapper.DgArchivesMapper; 8 import com.pashanhoo.archive.mapper.DgArchivesMapper;
11 import com.pashanhoo.archive.service.DgArchivesService; 9 import com.pashanhoo.archive.service.DgArchivesService;
10 import com.pashanhoo.bdcdy.entity.DgBdcdyConverter;
12 import com.pashanhoo.bdcdy.entity.DgBdcdyDO; 11 import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
12 import com.pashanhoo.bdcdy.entity.vo.DgBdcdyDetailVO;
13 import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest;
13 import com.pashanhoo.bdcdy.mapper.DgBdcdyMapper; 14 import com.pashanhoo.bdcdy.mapper.DgBdcdyMapper;
14 import com.pashanhoo.bdcdy.service.DgBdcdyService; 15 import com.pashanhoo.bdcdy.service.DgBdcdyService;
16 import com.pashanhoo.business.entity.DgBusinessConverter;
17 import com.pashanhoo.business.entity.DgBusinessDO;
18 import com.pashanhoo.business.entity.vo.DgBusinessDetailVO;
19 import com.pashanhoo.business.entity.vo.UpdateDgBusinessRequest;
20 import com.pashanhoo.business.service.DgBusinessService;
15 import org.springframework.beans.factory.annotation.Autowired; 21 import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.stereotype.Service; 22 import org.springframework.stereotype.Service;
17 23
18 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 24 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
19 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 25 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
26 import org.springframework.transaction.annotation.Transactional;
20 27
21 import java.util.List; 28 import java.util.List;
22 29
...@@ -43,6 +50,15 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi ...@@ -43,6 +50,15 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
43 @Autowired 50 @Autowired
44 private DgBdcdyMapper dgBdcdyMapper; 51 private DgBdcdyMapper dgBdcdyMapper;
45 52
53 @Autowired
54 private DgBdcdyConverter dgBdcdyConverter;
55
56 @Autowired
57 private DgBusinessService dgBusinessService;
58
59 @Autowired
60 private DgBusinessConverter dgBusinessConverter;
61
46 /** 62 /**
47 * 新增记录 63 * 新增记录
48 * @param request 64 * @param request
...@@ -55,25 +71,55 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi ...@@ -55,25 +71,55 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
55 } 71 }
56 72
57 /** 73 /**
58 * 根据主键查询记录详情 74 * 查询案卷基本信息
59 * @param id 75 * @param bsmArchive
60 * @return 76 * @return
61 */ 77 */
62 @Override 78 @Override
63 public DgArchivesDetailVO getDgArchivesDetailById(String id) { 79 public ArchiveDetailAndCoverVO getDgArchivesDetailById(String bsmArchive) {
64 DgArchivesDO dgarchivesDO = this.getById(id); 80 ArchiveDetailAndCoverVO detailAndCoverVO = getCover(bsmArchive);
65 return dgarchivesConverter.do2DetailVO(dgarchivesDO); 81 //查询业务信息
82 QueryWrapper<DgBusinessDO> businessWrapper = new QueryWrapper<>();
83 businessWrapper.lambda().eq(DgBusinessDO::getBsmArchives, bsmArchive);
84 DgBusinessDO businessDO = dgBusinessService.getOne(businessWrapper);
85 DgBusinessDetailVO dgBusinessDetailVO = dgBusinessConverter.do2DetailVO(businessDO);
86 detailAndCoverVO.setDgBusinessDetailVO(dgBusinessDetailVO);
87 return detailAndCoverVO;
66 } 88 }
67 89
68 /** 90 /**
69 * 修改单条记录 91 * 修改案卷基本信息,业务信息,不动产信息
92 *
70 * @param request 93 * @param request
71 * @return 94 * @return
72 */ 95 */
73 @Override 96 @Override
74 public boolean updateDgArchives(UpdateDgArchivesRequest request) { 97 @Transactional(rollbackFor = Exception.class)
75 DgArchivesDO dgarchivesDO = dgarchivesConverter.updateRequest2DO(request); 98 public boolean updateDgArchivesReplenish(UpdateArchiveAndOtherInfoRequest request) {
76 return this.updateById(dgarchivesDO); 99
100 //修改案卷基本信息
101 UpdateDgArchivesRequest updateDgArchivesRequest = request.getUpdateDgArchivesRequest();
102 DgArchivesDO dgArchivesDO = dgarchivesConverter.updateRequest2DO(updateDgArchivesRequest);
103 String bsmArchives = dgArchivesDO.getBsmArchives();
104 this.updateById(dgArchivesDO);
105
106 //修改不动产信息,先删除.后插入
107 List<UpdateDgBdcdyRequest> updateDgBdcdyRequests = request.getUpdateDgBdcdyRequests();
108 List<DgBdcdyDO> dgBdcdyDOS = dgBdcdyConverter.voList2DoList(updateDgBdcdyRequests);
109 //删除
110 QueryWrapper<DgBdcdyDO> wrapper = new QueryWrapper<>();
111 wrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchives);
112 dgBdcdyService.remove(wrapper);
113 //插入
114 dgBdcdyService.saveBatch(dgBdcdyDOS);
115
116 //修改业务信息
117 UpdateDgBusinessRequest updateDgBusinessRequest = request.getUpdateDgBusinessRequest();
118 DgBusinessDO dgBusinessDO = dgBusinessConverter.updateRequest2DO(updateDgBusinessRequest);
119 QueryWrapper<DgBusinessDO> queryWrapper = new QueryWrapper<>();
120 queryWrapper.lambda().eq(DgBusinessDO::getBsmArchives, bsmArchives);
121 return dgBusinessService.update(dgBusinessDO, queryWrapper);
122
77 } 123 }
78 124
79 /** 125 /**
...@@ -136,4 +182,42 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi ...@@ -136,4 +182,42 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
136 } 182 }
137 return dgBdcdyDOS; 183 return dgBdcdyDOS;
138 } 184 }
185
186 /**
187 * 档案查找
188 * @param request
189 * @return
190 */
191 @Override
192 public IPage<SearchArchiveVO> searchArchive(SearchArchiveRequest request) {
193
194 IPage<SearchArchiveVO> pageParam = new Page<>(request.getCurrentPage(), request.getPageSize());
195 return dgarchivesMapper.searchArchive(pageParam, request);
196 }
197
198 /**
199 * 档案封皮查找
200 * @param bsmArchive
201 * @return
202 */
203 @Override
204 public ArchiveDetailAndCoverVO searchArchivesCover(String bsmArchive) {
205
206 return getCover(bsmArchive);
207 }
208
209 private ArchiveDetailAndCoverVO getCover(String bsmArchive) {
210 DgArchivesDO archivesDO = this.getById(bsmArchive);
211 DgArchivesDetailVO dgArchivesDetailVO = dgarchivesConverter.do2DetailVO(archivesDO);
212
213 QueryWrapper<DgBdcdyDO> bdcdyWrapper = new QueryWrapper<>();
214 bdcdyWrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchive);
215 List<DgBdcdyDO> bdcdyDOS = dgBdcdyService.list(bdcdyWrapper);
216 List<DgBdcdyDetailVO> bdcdyDetailVOList = dgBdcdyConverter.do2DetailVOList(bdcdyDOS);
217
218 ArchiveDetailAndCoverVO archiveDetailAndCoverVO = new ArchiveDetailAndCoverVO();
219 archiveDetailAndCoverVO.setDgArchivesDetailVO(dgArchivesDetailVO);
220 archiveDetailAndCoverVO.setDgBdcdyDetailVOList(bdcdyDetailVOList);
221 return archiveDetailAndCoverVO;
222 }
139 } 223 }
......
...@@ -27,4 +27,6 @@ public interface DgBdcdyConverter{ ...@@ -27,4 +27,6 @@ public interface DgBdcdyConverter{
27 List<DgBdcdyDO> addRequestListDO(List<AddDgBdcdyRequest> request); 27 List<DgBdcdyDO> addRequestListDO(List<AddDgBdcdyRequest> request);
28 28
29 List<DgBdcdyDO> voList2DoList(List<UpdateDgBdcdyRequest> requests); 29 List<DgBdcdyDO> voList2DoList(List<UpdateDgBdcdyRequest> requests);
30
31 List<DgBdcdyDetailVO> do2DetailVOList(List<DgBdcdyDO> bdcdyDOS);
30 } 32 }
......
...@@ -2,10 +2,13 @@ package com.pashanhoo.bdcdy.entity.vo; ...@@ -2,10 +2,13 @@ package com.pashanhoo.bdcdy.entity.vo;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 import java.io.Serializable; 4 import java.io.Serializable;
5
6 import com.fasterxml.jackson.annotation.JsonFormat;
5 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 9 import lombok.Data;
8 import lombok.EqualsAndHashCode; 10 import lombok.EqualsAndHashCode;
11 import org.springframework.format.annotation.DateTimeFormat;
9 12
10 /** 13 /**
11 * <p> 14 * <p>
...@@ -86,12 +89,16 @@ public class UpdateDgBdcdyRequest implements Serializable { ...@@ -86,12 +89,16 @@ public class UpdateDgBdcdyRequest implements Serializable {
86 * 登记时间 89 * 登记时间
87 */ 90 */
88 @ApiModelProperty(name = "djsj", value = "登记时间") 91 @ApiModelProperty(name = "djsj", value = "登记时间")
92 @DateTimeFormat(pattern = "yyyy-MM-dd")
93 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
89 private Date djsj; 94 private Date djsj;
90 95
91 /** 96 /**
92 * 注销时间 97 * 注销时间
93 */ 98 */
94 @ApiModelProperty(name = "zxsj", value = "注销时间") 99 @ApiModelProperty(name = "zxsj", value = "注销时间")
100 @DateTimeFormat(pattern = "yyyy-MM-dd")
101 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
95 private Date zxsj; 102 private Date zxsj;
96 103
97 104
......
...@@ -3,10 +3,12 @@ package com.pashanhoo.business.entity.vo; ...@@ -3,10 +3,12 @@ package com.pashanhoo.business.entity.vo;
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.Date; 4 import java.util.Date;
5 5
6 import com.fasterxml.jackson.annotation.JsonFormat;
6 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 9 import lombok.Data;
9 import lombok.EqualsAndHashCode; 10 import lombok.EqualsAndHashCode;
11 import org.springframework.format.annotation.DateTimeFormat;
10 12
11 /** 13 /**
12 * <p> 14 * <p>
...@@ -76,6 +78,8 @@ public class DgBusinessDetailVO implements Serializable { ...@@ -76,6 +78,8 @@ public class DgBusinessDetailVO implements Serializable {
76 * 收件时间 78 * 收件时间
77 */ 79 */
78 @ApiModelProperty(name = "sjsj", value = "收件时间") 80 @ApiModelProperty(name = "sjsj", value = "收件时间")
81 @DateTimeFormat(pattern = "yyyy-MM-dd")
82 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
79 private Date sjsj; 83 private Date sjsj;
80 84
81 /** 85 /**
......
...@@ -3,10 +3,12 @@ package com.pashanhoo.business.entity.vo; ...@@ -3,10 +3,12 @@ package com.pashanhoo.business.entity.vo;
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.Date; 4 import java.util.Date;
5 5
6 import com.fasterxml.jackson.annotation.JsonFormat;
6 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 9 import lombok.Data;
9 import lombok.EqualsAndHashCode; 10 import lombok.EqualsAndHashCode;
11 import org.springframework.format.annotation.DateTimeFormat;
10 12
11 /** 13 /**
12 * <p> 14 * <p>
...@@ -76,6 +78,8 @@ public class UpdateDgBusinessRequest implements Serializable { ...@@ -76,6 +78,8 @@ public class UpdateDgBusinessRequest implements Serializable {
76 * 收件时间 78 * 收件时间
77 */ 79 */
78 @ApiModelProperty(name = "sjsj", value = "收件时间") 80 @ApiModelProperty(name = "sjsj", value = "收件时间")
81 @DateTimeFormat(pattern = "yyyy-MM-dd")
82 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
79 private Date sjsj; 83 private Date sjsj;
80 84
81 /** 85 /**
......
...@@ -5,7 +5,6 @@ import com.pashanhoo.common.Result; ...@@ -5,7 +5,6 @@ import com.pashanhoo.common.Result;
5 import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest; 5 import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest;
6 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO; 6 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO;
7 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest; 7 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest;
8 import com.pashanhoo.replenish.entity.vo.UpdateDgArchivesReplenishRequest;
9 import com.pashanhoo.replenish.service.DgArchivesReplenishService; 8 import com.pashanhoo.replenish.service.DgArchivesReplenishService;
10 import org.springframework.web.bind.annotation.RestController; 9 import org.springframework.web.bind.annotation.RestController;
11 import org.springframework.web.bind.annotation.*; 10 import org.springframework.web.bind.annotation.*;
...@@ -53,15 +52,6 @@ public class DgArchivesReplenishController { ...@@ -53,15 +52,6 @@ public class DgArchivesReplenishController {
53 return Result.ok("删除失败"); 52 return Result.ok("删除失败");
54 } 53 }
55 54
56 @PutMapping("updateDgArchivesReplenish")
57 @ApiOperation("修改档案补录信息")
58 public Result updateDgArchivesReplenish(@RequestBody UpdateDgArchivesReplenishRequest request){
59 if(dgarchivesreplenishService.updateDgArchivesReplenish(request)) {
60 return Result.ok("修改成功");
61 }
62 return Result.error("修改失败");
63 }
64
65 @GetMapping("getDgArchivesReplenishDetailById") 55 @GetMapping("getDgArchivesReplenishDetailById")
66 @ApiOperation(value = "读取明细") 56 @ApiOperation(value = "读取明细")
67 public Result getDgArchivesReplenishDetailById(@ApiParam("档案补录信息ID") @RequestParam String id){ 57 public Result getDgArchivesReplenishDetailById(@ApiParam("档案补录信息ID") @RequestParam String id){
...@@ -77,7 +67,7 @@ public class DgArchivesReplenishController { ...@@ -77,7 +67,7 @@ public class DgArchivesReplenishController {
77 67
78 @GetMapping("doReplenishArchive") 68 @GetMapping("doReplenishArchive")
79 @ApiOperation(value = "归档") 69 @ApiOperation(value = "归档")
80 public Result doReplenishArchive(@ApiParam("归档id") @RequestParam String bsmModify,@ApiParam("档案标识码") @RequestParam String bsmArchive){ 70 public Result doReplenishArchive(@ApiParam("档案补录标识码") @RequestParam String bsmModify,@ApiParam("档案标识码") @RequestParam String bsmArchive){
81 return Result.ok(dgarchivesreplenishService.doReplenishArchive(bsmModify,bsmArchive)); 71 return Result.ok(dgarchivesreplenishService.doReplenishArchive(bsmModify,bsmArchive));
82 } 72 }
83 } 73 }
......
...@@ -2,10 +2,10 @@ package com.pashanhoo.replenish.entity; ...@@ -2,10 +2,10 @@ package com.pashanhoo.replenish.entity;
2 2
3 import java.util.List; 3 import java.util.List;
4 4
5 import com.pashanhoo.archive.entity.vo.UpdateArchiveAndOtherInfoRequest;
5 import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest; 6 import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest;
6 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishDetailVO; 7 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishDetailVO;
7 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO; 8 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO;
8 import com.pashanhoo.replenish.entity.vo.UpdateDgArchivesReplenishRequest;
9 import org.mapstruct.Mapper; 9 import org.mapstruct.Mapper;
10 10
11 /** 11 /**
...@@ -18,7 +18,7 @@ public interface DgArchivesReplenishConverter{ ...@@ -18,7 +18,7 @@ public interface DgArchivesReplenishConverter{
18 18
19 DgArchivesReplenishDetailVO do2DetailVO(DgArchivesReplenishDO dgarchivesreplenishDO); 19 DgArchivesReplenishDetailVO do2DetailVO(DgArchivesReplenishDO dgarchivesreplenishDO);
20 20
21 DgArchivesReplenishDO updateRequest2DO(UpdateDgArchivesReplenishRequest request); 21 DgArchivesReplenishDO updateRequest2DO(UpdateArchiveAndOtherInfoRequest request);
22 22
23 DgArchivesReplenishListVO do2ListVO(DgArchivesReplenishDO dgarchivesreplenishDO); 23 DgArchivesReplenishListVO do2ListVO(DgArchivesReplenishDO dgarchivesreplenishDO);
24 24
......
1 package com.pashanhoo.replenish.service; 1 package com.pashanhoo.replenish.service;
2 2
3
4 import com.baomidou.mybatisplus.core.metadata.IPage; 3 import com.baomidou.mybatisplus.core.metadata.IPage;
5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 import com.baomidou.mybatisplus.extension.service.IService; 4 import com.baomidou.mybatisplus.extension.service.IService;
7 import com.pashanhoo.common.Result;
8 import com.pashanhoo.replenish.entity.*; 5 import com.pashanhoo.replenish.entity.*;
9 import com.pashanhoo.replenish.entity.vo.*; 6 import com.pashanhoo.replenish.entity.vo.*;
10 7
...@@ -36,14 +33,6 @@ public interface DgArchivesReplenishService extends IService<DgArchivesReplenish ...@@ -36,14 +33,6 @@ public interface DgArchivesReplenishService extends IService<DgArchivesReplenish
36 DgArchivesReplenishDetailVO getDgArchivesReplenishDetailById(String id); 33 DgArchivesReplenishDetailVO getDgArchivesReplenishDetailById(String id);
37 34
38 /** 35 /**
39 * 修改单条记录
40 *
41 * @param request
42 * @return
43 */
44 boolean updateDgArchivesReplenish(UpdateDgArchivesReplenishRequest request);
45
46 /**
47 * 根据条件进行列表查询 36 * 根据条件进行列表查询
48 * 37 *
49 * @param request 38 * @param request
......
...@@ -12,17 +12,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -12,17 +12,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
12 import com.pashanhoo.archive.entity.DgArchivesConverter; 12 import com.pashanhoo.archive.entity.DgArchivesConverter;
13 import com.pashanhoo.archive.entity.DgArchivesDO; 13 import com.pashanhoo.archive.entity.DgArchivesDO;
14 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest; 14 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
15 import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
16 import com.pashanhoo.archive.service.DgArchivesService; 15 import com.pashanhoo.archive.service.DgArchivesService;
17 import com.pashanhoo.bdcdy.entity.DgBdcdyConverter; 16 import com.pashanhoo.bdcdy.entity.DgBdcdyConverter;
18 import com.pashanhoo.bdcdy.entity.DgBdcdyDO; 17 import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
19 import com.pashanhoo.bdcdy.entity.vo.AddDgBdcdyRequest; 18 import com.pashanhoo.bdcdy.entity.vo.AddDgBdcdyRequest;
20 import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest;
21 import com.pashanhoo.bdcdy.service.DgBdcdyService; 19 import com.pashanhoo.bdcdy.service.DgBdcdyService;
22 import com.pashanhoo.business.entity.DgBusinessConverter; 20 import com.pashanhoo.business.entity.DgBusinessConverter;
23 import com.pashanhoo.business.entity.DgBusinessDO; 21 import com.pashanhoo.business.entity.DgBusinessDO;
24 import com.pashanhoo.business.entity.vo.AddDgBusinessRequest; 22 import com.pashanhoo.business.entity.vo.AddDgBusinessRequest;
25 import com.pashanhoo.business.entity.vo.UpdateDgBusinessRequest;
26 import com.pashanhoo.business.service.DgBusinessService; 23 import com.pashanhoo.business.service.DgBusinessService;
27 import com.pashanhoo.catalog.entity.DgArchivesCatalogDO; 24 import com.pashanhoo.catalog.entity.DgArchivesCatalogDO;
28 import com.pashanhoo.catalog.service.DgArchivesCatalogService; 25 import com.pashanhoo.catalog.service.DgArchivesCatalogService;
...@@ -164,41 +161,6 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen ...@@ -164,41 +161,6 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
164 } 161 }
165 162
166 /** 163 /**
167 * 修改单条记录
168 *
169 * @param request
170 * @return
171 */
172 @Override
173 @Transactional(rollbackFor = Exception.class)
174 public boolean updateDgArchivesReplenish(UpdateDgArchivesReplenishRequest request) {
175
176 //修改案卷基本信息
177 UpdateDgArchivesRequest updateDgArchivesRequest = request.getUpdateDgArchivesRequest();
178 DgArchivesDO dgArchivesDO = dgArchivesConverter.updateRequest2DO(updateDgArchivesRequest);
179 String bsmArchives = dgArchivesDO.getBsmArchives();
180 dgArchivesService.updateById(dgArchivesDO);
181
182 //修改不动产信息,先删除.后插入
183 List<UpdateDgBdcdyRequest> updateDgBdcdyRequests = request.getUpdateDgBdcdyRequests();
184 List<DgBdcdyDO> dgBdcdyDOS = dgBdcdyConverter.voList2DoList(updateDgBdcdyRequests);
185 //删除
186 QueryWrapper<DgBdcdyDO> wrapper = new QueryWrapper<>();
187 wrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchives);
188 dgBdcdyService.remove(wrapper);
189 //插入
190 dgBdcdyService.saveBatch(dgBdcdyDOS);
191
192 //修改业务信息
193 UpdateDgBusinessRequest updateDgBusinessRequest = request.getUpdateDgBusinessRequest();
194 DgBusinessDO dgBusinessDO = dgBusinessConverter.updateRequest2DO(updateDgBusinessRequest);
195 QueryWrapper<DgBusinessDO> queryWrapper = new QueryWrapper<>();
196 queryWrapper.lambda().eq(DgBusinessDO::getBsmArchives, bsmArchives);
197 return dgBusinessService.update(dgBusinessDO, queryWrapper);
198
199 }
200
201 /**
202 * 根据条件进行列表查询 164 * 根据条件进行列表查询
203 * 165 *
204 * @param request 166 * @param request
......
...@@ -44,4 +44,49 @@ ...@@ -44,4 +44,49 @@
44 ) 44 )
45 </update> 45 </update>
46 46
47 <select id="searchArchive" resultType="com.pashanhoo.archive.entity.vo.SearchArchiveVO">
48 select rownum as xh,
49 DA.BSM_ARCHIVES,
50 DA.DAZT,
51 DA.DALY,
52 DA.AJH,
53 DA.CFWZ,
54 DA.HH,
55 D.BDCQZH,
56 D.QLR,
57 D.YWR,
58 DB.YWH,
59 D.BDCDYH,
60 DB.QLLX
61 from DG_ARCHIVES DA
62 join DG_BUSINESS DB on DA.BSM_ARCHIVES = DB.BSM_ARCHIVES
63 join DG_BDCDY D on DA.BSM_ARCHIVES = D.BSM_ARCHIVES
64 <where>
65 <if test="request.ajh != null and request.ajh != ''">
66 AJH = #{request.ajh,jdbcType=VARCHAR}
67 </if>
68 <if test="request.mlh != null and request.mlh != ''">
69 and MLH = #{request.mlh,jdbcType=VARCHAR}
70 </if>
71 <if test="request.hh != null and request.hh != ''">
72 and HH = #{request.hh,jdbcType=VARCHAR}
73 </if>
74 <if test="request.dazt != null and request.dazt != ''">
75 and DAZT = #{request.dazt,jdbcType=VARCHAR}
76 </if>
77 <if test="request.ywh != null and request.ywh != ''">
78 and YWH = #{request.ywh,jdbcType=VARCHAR}
79 </if>
80 <if test="request.bdcqzh != null and request.bdcqzh != ''">
81 and BDCQZH = #{request.bdcqzh,jdbcType=VARCHAR}
82 </if>
83 <if test="request.bdcdyh != null and request.bdcdyh != ''">
84 and BDCDYH = #{request.bdcdyh,jdbcType=VARCHAR}
85 </if>
86 <if test="request.qllx != null and request.qllx != ''">
87 and QLLX = #{request.qllx,jdbcType=VARCHAR}
88 </if>
89 </where>
90 </select>
91
47 </mapper> 92 </mapper>
......