Skip to content

荆蔚杰 / java.archive

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

档案修改列表查询 

档案修改=》修改完毕
档案对应修改列表
1 parent 32f7d044
Inline Side-by-side
Showing 24 changed files with 415 additions and 170 deletions
...@@ -12,6 +12,8 @@ import io.swagger.annotations.Api; ...@@ -12,6 +12,8 @@ import io.swagger.annotations.Api;
12 import io.swagger.annotations.ApiOperation; 12 import io.swagger.annotations.ApiOperation;
13 import io.swagger.annotations.ApiParam; 13 import io.swagger.annotations.ApiParam;
14 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
15
16 import java.io.IOException;
15 import java.util.List; 17 import java.util.List;
16 18
17 /** 19 /**
...@@ -39,10 +41,14 @@ public class DgFileController { ...@@ -39,10 +41,14 @@ public class DgFileController {
39 } 41 }
40 42
41 @DeleteMapping("deleteDgFileByIds") 43 @DeleteMapping("deleteDgFileByIds")
42 @ApiOperation(value = "批量删除档案文件信息") 44 @ApiOperation(value = "批量删除档案文件信息和附件")
43 public Result deleteDgFileByIds(@ApiParam("档案文件信息ID列表") @RequestParam(value = "idList") List<String> idList) { 45 public Result deleteDgFileByIds(@ApiParam("档案文件信息ID列表") @RequestParam(value = "bsmFileList") List<String> bsmFileList) {
44 if(dgfileService.removeByIds(idList)) { 46 try {
45 return Result.ok("删除成功"); 47 if(dgfileService.delete(bsmFileList)) {
48 return Result.ok("删除成功");
49 }
50 } catch (Exception e) {
51 return Result.exception(e.getMessage());
46 } 52 }
47 return Result.error("删除失败"); 53 return Result.error("删除失败");
48 } 54 }
...@@ -62,12 +68,12 @@ public class DgFileController { ...@@ -62,12 +68,12 @@ public class DgFileController {
62 return Result.ok(dgfileService.getFileList(bsmArchive)); 68 return Result.ok(dgfileService.getFileList(bsmArchive));
63 } 69 }
64 70
65 // @PutMapping("updateFileSort") 71 @PutMapping("updateFileSort")
66 // @ApiOperation("附件排序") 72 @ApiOperation("附件排序")
67 // public Result updateFileSort(@RequestBody UpdateDgFileRequest request){ 73 public Result updateFileSort(@RequestBody List<UpdateDgFileRequest> requests){
68 // if(dgfileService.updateFileSort(request)) { 74 if(dgfileService.updateFileSort(requests)) {
69 // return Result.ok("修改成功"); 75 return Result.ok("修改成功");
70 // } 76 }
71 // return Result.error("修改失败"); 77 return Result.error("修改失败");
72 // } 78 }
73 } 79 }
......
...@@ -25,4 +25,6 @@ public interface DgFileConverter{ ...@@ -25,4 +25,6 @@ public interface DgFileConverter{
25 List<DgFileListVO> doList2ListVOList(List<DgFileDO> dgfileDOList); 25 List<DgFileListVO> doList2ListVOList(List<DgFileDO> dgfileDOList);
26 26
27 List<DgFileDO> voList2ListDO(List<AddDgFileRequest> addDgFileRequestList); 27 List<DgFileDO> voList2ListDO(List<AddDgFileRequest> addDgFileRequestList);
28
29 List<DgFileDO> updateList2DOList(List<UpdateDgFileRequest> requests);
28 } 30 }
......
...@@ -71,5 +71,9 @@ public class DgFileDO implements Serializable { ...@@ -71,5 +71,9 @@ public class DgFileDO implements Serializable {
71 @TableField("FJLY") 71 @TableField("FJLY")
72 private String fjly; 72 private String fjly;
73 73
74 74 /**
75 * 序号
76 */
77 @TableField("XH")
78 private Integer xh;
75 } 79 }
......
...@@ -2,6 +2,8 @@ package com.pashanhoo.file.entity.vo; ...@@ -2,6 +2,8 @@ package com.pashanhoo.file.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.baomidou.mybatisplus.annotation.TableField;
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;
...@@ -64,4 +66,9 @@ public class AddDgFileRequest implements Serializable { ...@@ -64,4 +66,9 @@ public class AddDgFileRequest implements Serializable {
64 @ApiModelProperty(name = "fjly", value = "附件来源（1：业务附件，2：补录附件）") 66 @ApiModelProperty(name = "fjly", value = "附件来源（1：业务附件，2：补录附件）")
65 private String fjly; 67 private String fjly;
66 68
69 /**
70 * 序号
71 */
72 @ApiModelProperty(name = "xh", value = "序号")
73 private Integer xh;
67 } 74 }
......
...@@ -64,5 +64,9 @@ public class DgFileDetailVO implements Serializable { ...@@ -64,5 +64,9 @@ public class DgFileDetailVO implements Serializable {
64 @ApiModelProperty(name = "fjsize", value = "附件大小") 64 @ApiModelProperty(name = "fjsize", value = "附件大小")
65 private String fjsize; 65 private String fjsize;
66 66
67 67 /**
68 * 序号
69 */
70 @ApiModelProperty(name = "xh", value = "序号")
71 private Integer xh;
68 } 72 }
......
...@@ -69,4 +69,9 @@ public class DgFileListVO implements Serializable { ...@@ -69,4 +69,9 @@ public class DgFileListVO implements Serializable {
69 @ApiModelProperty(name = "fjsize", value = "附件大小") 69 @ApiModelProperty(name = "fjsize", value = "附件大小")
70 private String fjsize; 70 private String fjsize;
71 71
72 /**
73 * 序号
74 */
75 @ApiModelProperty(name = "xh", value = "序号")
76 private Integer xh;
72 } 77 }
......
...@@ -66,6 +66,12 @@ public class DgFileSearchRequest extends PageInfo implements Serializable { ...@@ -66,6 +66,12 @@ public class DgFileSearchRequest extends PageInfo implements Serializable {
66 private String fjsize; 66 private String fjsize;
67 67
68 /** 68 /**
69 * 序号
70 */
71 @ApiModelProperty(name = "xh", value = "序号")
72 private Integer xh;
73
74 /**
69 * 档案标识码 75 * 档案标识码
70 */ 76 */
71 @ApiModelProperty(name = "bsmArchives", value = "档案标识码") 77 @ApiModelProperty(name = "bsmArchives", value = "档案标识码")
......
...@@ -64,5 +64,9 @@ public class UpdateDgFileRequest implements Serializable { ...@@ -64,5 +64,9 @@ public class UpdateDgFileRequest implements Serializable {
64 @ApiModelProperty(name = "fjsize", value = "附件大小") 64 @ApiModelProperty(name = "fjsize", value = "附件大小")
65 private String fjsize; 65 private String fjsize;
66 66
67 67 /**
68 * 序号
69 */
70 @ApiModelProperty(name = "xh", value = "序号")
71 private Integer xh;
68 } 72 }
......
...@@ -4,6 +4,7 @@ package com.pashanhoo.file.mapper; ...@@ -4,6 +4,7 @@ package com.pashanhoo.file.mapper;
4 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 4 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5 import com.pashanhoo.file.entity.DgFileDO; 5 import com.pashanhoo.file.entity.DgFileDO;
6 import com.pashanhoo.file.entity.vo.DgCatalogWithFileVO; 6 import com.pashanhoo.file.entity.vo.DgCatalogWithFileVO;
7 import com.pashanhoo.file.entity.vo.UpdateDgFileRequest;
7 import org.apache.ibatis.annotations.Param; 8 import org.apache.ibatis.annotations.Param;
8 9
9 import java.util.List; 10 import java.util.List;
...@@ -26,4 +27,11 @@ public interface DgFileMapper extends BaseMapper<DgFileDO> { ...@@ -26,4 +27,11 @@ public interface DgFileMapper extends BaseMapper<DgFileDO> {
26 * @return 27 * @return
27 */ 28 */
28 List<DgCatalogWithFileVO> getFileList(@Param("bsmArchive") String bsmArchive); 29 List<DgCatalogWithFileVO> getFileList(@Param("bsmArchive") String bsmArchive);
30
31 /**
32 * 更新排序
33 * @param requests
34 * @return
35 */
36 int updateFileSort(@Param("requests") List<UpdateDgFileRequest> requests);
29 } 37 }
......
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
4 import com.pashanhoo.file.entity.DgFileDO; 4 import com.pashanhoo.file.entity.DgFileDO;
5 import com.pashanhoo.file.entity.vo.*; 5 import com.pashanhoo.file.entity.vo.*;
6 6
7 import java.io.IOException;
7 import java.util.List; 8 import java.util.List;
8 9
9 /** 10 /**
...@@ -42,4 +43,18 @@ public interface DgFileService extends IService<DgFileDO> { ...@@ -42,4 +43,18 @@ public interface DgFileService extends IService<DgFileDO> {
42 * @return 43 * @return
43 */ 44 */
44 List<DgCatalogWithFileVO> getFileList(String bsmArchive); 45 List<DgCatalogWithFileVO> getFileList(String bsmArchive);
46
47 /**
48 * 修改文件排序
49 * @param requests
50 * @return
51 */
52 boolean updateFileSort(List<UpdateDgFileRequest> requests);
53
54 /**
55 * 批量删除档案文件信息
56 * @param bsmFileList
57 * @return
58 */
59 boolean delete(List<String> bsmFileList) throws Exception;
45 } 60 }
......
1 package com.pashanhoo.file.service.impl; 1 package com.pashanhoo.file.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 import com.pashanhoo.common.util.fileupload.MinioConfig;
4 import com.pashanhoo.common.util.fileupload.MinioUtil; 6 import com.pashanhoo.common.util.fileupload.MinioUtil;
5 import com.pashanhoo.file.entity.DgFileConverter; 7 import com.pashanhoo.file.entity.DgFileConverter;
6 import com.pashanhoo.file.entity.DgFileDO; 8 import com.pashanhoo.file.entity.DgFileDO;
...@@ -11,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -11,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
12 14
13 15
16 import java.io.IOException;
14 import java.util.List; 17 import java.util.List;
15 import java.util.stream.Collectors;
16 18
17 /** 19 /**
18 * <p> 20 * <p>
...@@ -34,6 +36,9 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple ...@@ -34,6 +36,9 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
34 @Autowired 36 @Autowired
35 MinioUtil minioUtil; 37 MinioUtil minioUtil;
36 38
39 @Autowired
40 MinioConfig minioConfig;
41
37 /** 42 /**
38 * 新增记录 43 * 新增记录
39 * @param request 44 * @param request
...@@ -82,4 +87,35 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple ...@@ -82,4 +87,35 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
82 return fileList; 87 return fileList;
83 } 88 }
84 89
90 /**
91 * 修改文件排序
92 *
93 * @param requests
94 * @return
95 */
96 @Override
97 public boolean updateFileSort(List<UpdateDgFileRequest> requests) {
98 List<DgFileDO> fileList = dgfileConverter.updateList2DOList(requests);
99 return this.updateBatchById(fileList);
100 }
101
102 /**
103 * 批量删除档案文件信息
104 * @param bsmFileList
105 * @return
106 */
107 @Override
108 public boolean delete(List<String> bsmFileList) throws Exception {
109 boolean flag = this.removeByIds(bsmFileList);
110
111 QueryWrapper<DgFileDO> fileWrapper = new QueryWrapper<>();
112 fileWrapper.lambda().in(DgFileDO::getBsmFile, bsmFileList);
113 List<DgFileDO> fileDOList = this.list(fileWrapper);
114 for (DgFileDO fileDO : fileDOList) {
115 minioUtil.removeObject(minioConfig.getBucket(),fileDO.getFjurl());
116 }
117 return flag;
118 }
119
120
85 } 121 }
......
1 package com.pashanhoo.modify.controller; 1 package com.pashanhoo.modify.controller;
2 2
3 import com.baomidou.mybatisplus.core.metadata.IPage;
3 import com.pashanhoo.common.Result; 4 import com.pashanhoo.common.Result;
4 import com.pashanhoo.modify.entity.vo.AddDgArchivesModifyRequest; 5 import com.pashanhoo.modify.entity.vo.*;
5 import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
6 import com.pashanhoo.modify.entity.vo.UpdateDgArchivesModifyRequest;
7 import com.pashanhoo.modify.service.DgArchivesModifyService; 6 import com.pashanhoo.modify.service.DgArchivesModifyService;
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.*;
...@@ -48,7 +47,7 @@ public class DgArchivesModifyController { ...@@ -48,7 +47,7 @@ public class DgArchivesModifyController {
48 } 47 }
49 48
50 @PutMapping("updateDgArchivesModify") 49 @PutMapping("updateDgArchivesModify")
51 @ApiOperation("修改档案修改信息") 50 @ApiOperation("修改档案修改状态")
52 public Result updateDgArchivesModify(@RequestBody UpdateDgArchivesModifyRequest request){ 51 public Result updateDgArchivesModify(@RequestBody UpdateDgArchivesModifyRequest request){
53 if(dgarchivesmodifyService.updateDgArchivesModify(request)) { 52 if(dgarchivesmodifyService.updateDgArchivesModify(request)) {
54 return Result.ok("修改成功"); 53 return Result.ok("修改成功");
...@@ -62,9 +61,15 @@ public class DgArchivesModifyController { ...@@ -62,9 +61,15 @@ public class DgArchivesModifyController {
62 return Result.ok(dgarchivesmodifyService.getDgArchivesModifyDetailById(id)); 61 return Result.ok(dgarchivesmodifyService.getDgArchivesModifyDetailById(id));
63 } 62 }
64 63
65 @PostMapping("search") 64 @PostMapping("searchDgArchivesModifyList")
66 @ApiOperation(value = "根据条件进行列表查询") 65 @ApiOperation(value = "修改列表查询")
67 public Result searchDgArchivesModifyList(@RequestBody DgArchivesModifySearchRequest request) { 66 public Result<IPage<DgArchivesModifyListVO>> searchDgArchivesModifyList(@RequestBody DgArchivesModifySearchRequest request) {
68 return dgarchivesmodifyService.searchDgArchivesModifyList(request); 67 return Result.ok(dgarchivesmodifyService.searchDgArchivesModifyList(request));
68 }
69
70 @GetMapping("getArchiveWithModify")
71 @ApiOperation(value = "一个档案对应的修改列表查询")
72 public Result<List<DgArchivesModifyDetailVO>> getArchiveWithModify(@ApiParam("档案标识码") @RequestParam String bsmArchive) {
73 return Result.ok(dgarchivesmodifyService.getArchiveWithModify(bsmArchive));
69 } 74 }
70 } 75 }
......
...@@ -23,4 +23,6 @@ public interface DgArchivesModifyConverter{ ...@@ -23,4 +23,6 @@ public interface DgArchivesModifyConverter{
23 DgArchivesModifyListVO do2ListVO(DgArchivesModifyDO dgarchivesmodifyDO); 23 DgArchivesModifyListVO do2ListVO(DgArchivesModifyDO dgarchivesmodifyDO);
24 24
25 List<DgArchivesModifyListVO> doList2ListVOList(List<DgArchivesModifyDO> dgarchivesmodifyDOList); 25 List<DgArchivesModifyListVO> doList2ListVOList(List<DgArchivesModifyDO> dgarchivesmodifyDOList);
26
27 List<DgArchivesModifyDetailVO> doList2DetailVOList(List<DgArchivesModifyDO> dgarchivesmodifyDOList);
26 } 28 }
......
...@@ -6,8 +6,11 @@ import java.util.Date; ...@@ -6,8 +6,11 @@ import java.util.Date;
6 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableField; 7 import com.baomidou.mybatisplus.annotation.TableField;
8 import java.io.Serializable; 8 import java.io.Serializable;
9
10 import com.fasterxml.jackson.annotation.JsonFormat;
9 import lombok.Data; 11 import lombok.Data;
10 import lombok.EqualsAndHashCode; 12 import lombok.EqualsAndHashCode;
13 import org.springframework.format.annotation.DateTimeFormat;
11 14
12 /** 15 /**
13 * <p> 16 * <p>
...@@ -49,28 +52,24 @@ public class DgArchivesModifyDO implements Serializable { ...@@ -49,28 +52,24 @@ public class DgArchivesModifyDO implements Serializable {
49 private String ydaxx; 52 private String ydaxx;
50 53
51 /** 54 /**
52 * 现档案信息
53 */
54 @TableField("XDAXX")
55 private String xdaxx;
56
57 /**
58 * 修改内容 55 * 修改内容
59 */ 56 */
60 @TableField("XGNR") 57 @TableField("XGNR")
61 private String xgnr; 58 private String xgnr;
62 59
63 /** 60 /**
64 * 修改时间 61 * 创建时间
65 */ 62 */
66 @TableField("XGSJ") 63 @TableField("createTime")
67 private Date xgsj; 64 @DateTimeFormat(pattern = "yyyy-MM-dd")
65 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
66 private Date createTime;
68 67
69 /** 68 /**
70 * 修改人 69 * 修改人
71 */ 70 */
72 @TableField("XGR") 71 @TableField("CREATER")
73 private String xgr; 72 private String creater;
74 73
75 /** 74 /**
76 * 备注 75 * 备注
...@@ -78,5 +77,17 @@ public class DgArchivesModifyDO implements Serializable { ...@@ -78,5 +77,17 @@ public class DgArchivesModifyDO implements Serializable {
78 @TableField("BZ") 77 @TableField("BZ")
79 private String bz; 78 private String bz;
80 79
80 /**
81 * 状态1:修改中,2:已归档
82 */
83 @TableField("STATE")
84 private String state;
81 85
86 /**
87 * 归档时间
88 */
89 @TableField("GDSJ")
90 @DateTimeFormat(pattern = "yyyy-MM-dd")
91 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
92 private Date gdsj;
82 } 93 }
......
...@@ -2,10 +2,14 @@ package com.pashanhoo.modify.entity.vo; ...@@ -2,10 +2,14 @@ package com.pashanhoo.modify.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.baomidou.mybatisplus.annotation.TableField;
7 import com.fasterxml.jackson.annotation.JsonFormat;
5 import io.swagger.annotations.ApiModel; 8 import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 9 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 10 import lombok.Data;
8 import lombok.EqualsAndHashCode; 11 import lombok.EqualsAndHashCode;
12 import org.springframework.format.annotation.DateTimeFormat;
9 13
10 /** 14 /**
11 * <p> 15 * <p>
...@@ -42,28 +46,24 @@ public class AddDgArchivesModifyRequest implements Serializable { ...@@ -42,28 +46,24 @@ public class AddDgArchivesModifyRequest implements Serializable {
42 private String ydaxx; 46 private String ydaxx;
43 47
44 /** 48 /**
45 * 现档案信息
46 */
47 @ApiModelProperty(name = "xdaxx", value = "现档案信息")
48 private String xdaxx;
49
50 /**
51 * 修改内容 49 * 修改内容
52 */ 50 */
53 @ApiModelProperty(name = "xgnr", value = "修改内容") 51 @ApiModelProperty(name = "xgnr", value = "修改内容")
54 private String xgnr; 52 private String xgnr;
55 53
56 /** 54 /**
57 * 修改时间 55 * 创建时间
58 */ 56 */
59 @ApiModelProperty(name = "xgsj", value = "修改时间") 57 @ApiModelProperty(name="createTime" ,value = "创建时间")
60 private Date xgsj; 58 @DateTimeFormat(pattern = "yyyy-MM-dd")
59 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
60 private Date createTime;
61 61
62 /** 62 /**
63 * 修改人 63 * 修改人
64 */ 64 */
65 @ApiModelProperty(name = "xgr", value = "修改人") 65 @ApiModelProperty(name = "CREATER",value = "创建人")
66 private String xgr; 66 private String creater;
67 67
68 /** 68 /**
69 * 备注 69 * 备注
...@@ -71,5 +71,17 @@ public class AddDgArchivesModifyRequest implements Serializable { ...@@ -71,5 +71,17 @@ public class AddDgArchivesModifyRequest implements Serializable {
71 @ApiModelProperty(name = "bz", value = "备注") 71 @ApiModelProperty(name = "bz", value = "备注")
72 private String bz; 72 private String bz;
73 73
74 /**
75 * 状态1:修改中,2:已归档
76 */
77 @ApiModelProperty(name = "state", value = "状态1:修改中,2:已归档")
78 private String state;
74 79
80 /**
81 * 归档时间
82 */
83 @ApiModelProperty(name = "gdsj", value = "归档时间")
84 @DateTimeFormat(pattern = "yyyy-MM-dd")
85 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
86 private Date gdsj;
75 } 87 }
......
...@@ -2,10 +2,13 @@ package com.pashanhoo.modify.entity.vo; ...@@ -2,10 +2,13 @@ package com.pashanhoo.modify.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>
...@@ -47,28 +50,24 @@ public class DgArchivesModifyDetailVO implements Serializable { ...@@ -47,28 +50,24 @@ public class DgArchivesModifyDetailVO implements Serializable {
47 private String ydaxx; 50 private String ydaxx;
48 51
49 /** 52 /**
50 * 现档案信息
51 */
52 @ApiModelProperty(name = "xdaxx", value = "现档案信息")
53 private String xdaxx;
54
55 /**
56 * 修改内容 53 * 修改内容
57 */ 54 */
58 @ApiModelProperty(name = "xgnr", value = "修改内容") 55 @ApiModelProperty(name = "xgnr", value = "修改内容")
59 private String xgnr; 56 private String xgnr;
60 57
61 /** 58 /**
62 * 修改时间 59 * 创建时间
63 */ 60 */
64 @ApiModelProperty(name = "xgsj", value = "修改时间") 61 @ApiModelProperty(name="createTime" ,value = "创建时间")
65 private Date xgsj; 62 @DateTimeFormat(pattern = "yyyy-MM-dd")
63 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
64 private Date createTime;
66 65
67 /** 66 /**
68 * 修改人 67 * 修改人
69 */ 68 */
70 @ApiModelProperty(name = "xgr", value = "修改人") 69 @ApiModelProperty(name = "CREATER",value = "创建人")
71 private String xgr; 70 private String creater;
72 71
73 /** 72 /**
74 * 备注 73 * 备注
...@@ -76,5 +75,17 @@ public class DgArchivesModifyDetailVO implements Serializable { ...@@ -76,5 +75,17 @@ public class DgArchivesModifyDetailVO implements Serializable {
76 @ApiModelProperty(name = "bz", value = "备注") 75 @ApiModelProperty(name = "bz", value = "备注")
77 private String bz; 76 private String bz;
78 77
78 /**
79 * 状态1:修改中,2:已归档
80 */
81 @ApiModelProperty(name = "state", value = "状态1:修改中,2:已归档")
82 private String state;
79 83
84 /**
85 * 归档时间
86 */
87 @ApiModelProperty(name = "gdsj", value = "归档时间")
88 @DateTimeFormat(pattern = "yyyy-MM-dd")
89 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
90 private Date gdsj;
80 } 91 }
......
...@@ -2,10 +2,13 @@ package com.pashanhoo.modify.entity.vo; ...@@ -2,10 +2,13 @@ package com.pashanhoo.modify.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>
...@@ -26,65 +29,74 @@ public class DgArchivesModifyListVO implements Serializable { ...@@ -26,65 +29,74 @@ public class DgArchivesModifyListVO implements Serializable {
26 /** 29 /**
27 * 案卷标识码 30 * 案卷标识码
28 */ 31 */
29 @ApiModelProperty(name = "bsm_archives", value = "案卷标识码") 32 @ApiModelProperty(name = "bsmArchives", value = "案卷标识码")
30 private String bsm_archives; 33 private String bsmArchives;
31
32 /**
33 * 修改时间
34 */
35 @ApiModelProperty(name = "xgsj", value = "修改时间")
36 private Date xgsj;
37 34
38 /** 35 /**
39 * 修改人
40 */
41 @ApiModelProperty(name = "xgr", value = "修改人")
42 private String xgr;
43 /**
44 * 业务类型名称 36 * 业务类型名称
45 */ 37 */
46 @ApiModelProperty(name = "djjgmc", value = "业务类型名称") 38 @ApiModelProperty(name = "djywmc", value = "业务类型名称")
47 private String djjgmc; 39 private String djywmc;
48 /** 40 /**
49 * 登记类型 41 * 登记类型
50 */ 42 */
51 @ApiModelProperty(name = "djlx", value = "登记类型") 43 @ApiModelProperty(name = "djlx", value = "登记类型")
52 private String djlx; 44 private String djlx;
45
53 /** 46 /**
54 * 档案号 47 * 档案号
55 */ 48 */
56 @ApiModelProperty(name = "ajh", value = "档案号") 49 @ApiModelProperty(name = "ajh", value = "档案号")
57 private String ajh; 50 private String ajh;
51
58 /** 52 /**
59 * 业务号 53 * 业务号
60 */ 54 */
61 @ApiModelProperty(name = "ywh", value = "业务号") 55 @ApiModelProperty(name = "ywh", value = "业务号")
62 private String ywh; 56 private String ywh;
57
63 /** 58 /**
64 * 不动产单元号 59 * 不动产单元号
65 */ 60 */
66 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号") 61 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
67 private String bdcdyh; 62 private String bdcdyh;
63
68 /** 64 /**
69 * 权利人 65 * 权利人
70 */ 66 */
71 @ApiModelProperty(name = "qlr", value = "权利人") 67 @ApiModelProperty(name = "qlr", value = "权利人")
72 private String qlr; 68 private String qlr;
69
73 /** 70 /**
74 * 义务人 71 * 义务人
75 */ 72 */
76 @ApiModelProperty(name = "ywr", value = "义务人") 73 @ApiModelProperty(name = "ywr", value = "义务人")
77 private String ywr; 74 private String ywr;
75
78 /** 76 /**
79 * 不动产证件号码 77 * 不动产证件号码
80 */ 78 */
81 @ApiModelProperty(name = "bdcqzh", value = "不动产证件号码") 79 @ApiModelProperty(name = "bdcqzh", value = "不动产证件号码")
82 private String bdcqzh; 80 private String bdcqzh;
81
83 /** 82 /**
84 * 不动产单元号数量 83 * 修改时间
84 */
85 @ApiModelProperty(name = "xgsj", value = "修改时间")
86 @DateTimeFormat(pattern = "yyyy-MM-dd")
87 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
88 private Date xgsj;
89
90 /**
91 * 修改人
85 */ 92 */
86 @ApiModelProperty(name = "bdcdy_num", value = "不动产单元号数量") 93 @ApiModelProperty(name = "creater", value = "修改人")
87 private String bdcdy_num; 94 private String creater;
88 95
96 /**
97 * 不动产单元号数量
98 */
99 @ApiModelProperty(name = "bdcdyNum", value = "不动产单元号数量")
100 private String bdcdyNum;
89 101
90 } 102 }
......
...@@ -2,11 +2,14 @@ package com.pashanhoo.modify.entity.vo; ...@@ -2,11 +2,14 @@ package com.pashanhoo.modify.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;
9 import com.pashanhoo.common.PageInfo; 11 import com.pashanhoo.common.PageInfo;
12 import org.springframework.format.annotation.DateTimeFormat;
10 13
11 /** 14 /**
12 * <p> 15 * <p>
...@@ -19,7 +22,6 @@ import com.pashanhoo.common.PageInfo; ...@@ -19,7 +22,6 @@ import com.pashanhoo.common.PageInfo;
19 @Data 22 @Data
20 @EqualsAndHashCode(callSuper = false) 23 @EqualsAndHashCode(callSuper = false)
21 @ApiModel(value="档案修改信息列表查询请求实体") 24 @ApiModel(value="档案修改信息列表查询请求实体")
22 //TODO 初始查询条件是全部，需要根据情况自行删减
23 public class DgArchivesModifySearchRequest extends PageInfo implements Serializable { 25 public class DgArchivesModifySearchRequest extends PageInfo implements Serializable {
24 26
25 private static final long serialVersionUID = 1L; 27 private static final long serialVersionUID = 1L;
...@@ -36,17 +38,21 @@ public class DgArchivesModifySearchRequest extends PageInfo implements Serializa ...@@ -36,17 +38,21 @@ public class DgArchivesModifySearchRequest extends PageInfo implements Serializa
36 /** 38 /**
37 * 修改人 39 * 修改人
38 */ 40 */
39 @ApiModelProperty(name = "xgr", value = "修改人") 41 @ApiModelProperty(name = "creater", value = "修改人")
40 private String xgr; 42 private String creater;
41 /** 43 /**
42 * 修改起始时间 44 * 修改起始时间
43 */ 45 */
44 @ApiModelProperty(name = "xgqssj", value = "修改起始时间") 46 @ApiModelProperty(name = "xgqssj", value = "修改起始时间")
47 @DateTimeFormat(pattern = "yyyy-MM-dd")
48 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
45 private Date xgqssj; 49 private Date xgqssj;
46 /** 50 /**
47 * 修改截止时间 51 * 修改截止时间
48 */ 52 */
49 @ApiModelProperty(name = "xgjzsj", value = "修改截止时间") 53 @ApiModelProperty(name = "xgjzsj", value = "修改截止时间")
54 @DateTimeFormat(pattern = "yyyy-MM-dd")
55 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
50 private Date xgjzsj; 56 private Date xgjzsj;
51 /** 57 /**
52 * 档案号 58 * 档案号
...@@ -69,7 +75,4 @@ public class DgArchivesModifySearchRequest extends PageInfo implements Serializa ...@@ -69,7 +75,4 @@ public class DgArchivesModifySearchRequest extends PageInfo implements Serializa
69 @ApiModelProperty(name = "bdcqzh", value = "不动产权证号") 75 @ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
70 private String bdcqzh; 76 private String bdcqzh;
71 77
72
73
74
75 } 78 }
......
...@@ -2,10 +2,13 @@ package com.pashanhoo.modify.entity.vo; ...@@ -2,10 +2,13 @@ package com.pashanhoo.modify.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>
...@@ -47,22 +50,18 @@ public class UpdateDgArchivesModifyRequest implements Serializable { ...@@ -47,22 +50,18 @@ public class UpdateDgArchivesModifyRequest implements Serializable {
47 private String ydaxx; 50 private String ydaxx;
48 51
49 /** 52 /**
50 * 现档案信息 53 * 创建时间
51 */ 54 */
52 @ApiModelProperty(name = "xdaxx", value = "现档案信息") 55 @ApiModelProperty(name="createTime" ,value = "创建时间")
53 private String xdaxx; 56 @DateTimeFormat(pattern = "yyyy-MM-dd")
57 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
58 private Date createTime;
54 59
55 /** 60 /**
56 * 修改内容 61 * 修改人
57 */
58 @ApiModelProperty(name = "xgnr", value = "修改内容")
59 private String xgnr;
60
61 /**
62 * 修改时间
63 */ 62 */
64 @ApiModelProperty(name = "xgsj", value = "修改时间") 63 @ApiModelProperty(name = "CREATER",value = "创建人")
65 private Date xgsj; 64 private String creater;
66 65
67 /** 66 /**
68 * 修改人 67 * 修改人
...@@ -76,5 +75,17 @@ public class UpdateDgArchivesModifyRequest implements Serializable { ...@@ -76,5 +75,17 @@ public class UpdateDgArchivesModifyRequest implements Serializable {
76 @ApiModelProperty(name = "bz", value = "备注") 75 @ApiModelProperty(name = "bz", value = "备注")
77 private String bz; 76 private String bz;
78 77
78 /**
79 * 状态1:修改中,2:已归档
80 */
81 @ApiModelProperty(name = "state", value = "状态1:修改中,2:已归档")
82 private String state;
79 83
84 /**
85 * 归档时间
86 */
87 @ApiModelProperty(name = "gdsj", value = "归档时间")
88 @DateTimeFormat(pattern = "yyyy-MM-dd")
89 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
90 private Date gdsj;
80 } 91 }
......
...@@ -2,9 +2,11 @@ package com.pashanhoo.modify.mapper; ...@@ -2,9 +2,11 @@ package com.pashanhoo.modify.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.modify.entity.DgArchivesModifyDO; 6 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
6 import com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO; 7 import com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO;
7 import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest; 8 import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
9 import org.apache.ibatis.annotations.Param;
8 10
9 import java.util.List; 11 import java.util.List;
10 12
...@@ -18,7 +20,11 @@ import java.util.List; ...@@ -18,7 +20,11 @@ import java.util.List;
18 */ 20 */
19 public interface DgArchivesModifyMapper extends BaseMapper<DgArchivesModifyDO> { 21 public interface DgArchivesModifyMapper extends BaseMapper<DgArchivesModifyDO> {
20 22
21 23 /**
22 List<DgArchivesModifyListVO> searchDgArchivesModifyList(DgArchivesModifySearchRequest request); 24 * 修改列表查询
23 25 * @param pageParam
26 * @param request
27 * @return
28 */
29 IPage<DgArchivesModifyListVO> searchDgArchivesModifyList(@Param("pageParam") IPage<DgArchivesModifyListVO> pageParam, @Param("request") DgArchivesModifySearchRequest request);
24 } 30 }
......
1 package com.pashanhoo.modify.service; 1 package com.pashanhoo.modify.service;
2 2
3 3
4 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import com.baomidou.mybatisplus.extension.service.IService; 6 import com.baomidou.mybatisplus.extension.service.IService;
6 import com.pashanhoo.common.Result; 7 import com.pashanhoo.common.Result;
7 import com.pashanhoo.modify.entity.DgArchivesModifyDO; 8 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
8 import com.pashanhoo.modify.entity.vo.AddDgArchivesModifyRequest; 9 import com.pashanhoo.modify.entity.vo.*;
9 import com.pashanhoo.modify.entity.vo.DgArchivesModifyDetailVO; 10
10 import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest; 11 import java.util.List;
11 import com.pashanhoo.modify.entity.vo.UpdateDgArchivesModifyRequest;
12 12
13 /** 13 /**
14 * <p> 14 * <p>
...@@ -19,8 +19,9 @@ import com.pashanhoo.modify.entity.vo.UpdateDgArchivesModifyRequest; ...@@ -19,8 +19,9 @@ import com.pashanhoo.modify.entity.vo.UpdateDgArchivesModifyRequest;
19 * @since 2021-11-05 19 * @since 2021-11-05
20 */ 20 */
21 public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> { 21 public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> {
22 /** 22 /**
23 * 新增记录 23 * 新增记录
24 *
24 * @param request 25 * @param request
25 * @return 26 * @return
26 */ 27 */
...@@ -28,22 +29,33 @@ public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> { ...@@ -28,22 +29,33 @@ public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> {
28 29
29 /** 30 /**
30 * 根据主键查询记录详情 31 * 根据主键查询记录详情
32 *
31 * @param id 33 * @param id
32 * @return 34 * @return
33 */ 35 */
34 DgArchivesModifyDetailVO getDgArchivesModifyDetailById(String id); 36 DgArchivesModifyDetailVO getDgArchivesModifyDetailById(String id);
35 37
36 /** 38 /**
37 * 修改单条记录 39 * 修改记录状态为已归档和归档日期，一并修改档案记录的状态为在库
40 *
38 * @param request 41 * @param request
39 * @return 42 * @return
40 */ 43 */
41 boolean updateDgArchivesModify(UpdateDgArchivesModifyRequest request); 44 boolean updateDgArchivesModify(UpdateDgArchivesModifyRequest request);
42 45
43 /** 46 /**
44 * 根据条件进行列表查询 47 * 修改列表查询
48 *
45 * @param request 49 * @param request
46 * @return 50 * @return
47 */ 51 */
48 Result searchDgArchivesModifyList(DgArchivesModifySearchRequest request); 52 IPage<DgArchivesModifyListVO> searchDgArchivesModifyList(DgArchivesModifySearchRequest request);
53
54 /**
55 * 一个档案对应的修改列表查询
56 *
57 * @param bsmArchive
58 * @return
59 */
60 List<DgArchivesModifyDetailVO> getArchiveWithModify(String bsmArchive);
49 } 61 }
......
1 package com.pashanhoo.modify.service.impl; 1 package com.pashanhoo.modify.service.impl;
2 2
3 import cn.hutool.core.date.DateTime;
4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
6 import com.baomidou.mybatisplus.core.metadata.IPage;
3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 7 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 import com.github.pagehelper.PageHelper; 8 import com.pashanhoo.archive.entity.ArchiveStatus;
5 import com.github.pagehelper.PageInfo; 9 import com.pashanhoo.archive.entity.DgArchivesDO;
6 import com.pashanhoo.common.Result; 10 import com.pashanhoo.archive.service.DgArchivesService;
7 import com.pashanhoo.modify.entity.DgArchivesModifyConverter; 11 import com.pashanhoo.modify.entity.DgArchivesModifyConverter;
8 import com.pashanhoo.modify.entity.DgArchivesModifyDO; 12 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
9 import com.pashanhoo.modify.entity.vo.*; 13 import com.pashanhoo.modify.entity.vo.*;
10 import com.pashanhoo.modify.mapper.DgArchivesModifyMapper; 14 import com.pashanhoo.modify.mapper.DgArchivesModifyMapper;
11 import com.pashanhoo.modify.service.DgArchivesModifyService; 15 import com.pashanhoo.modify.service.DgArchivesModifyService;
12 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO;
13 import org.springframework.beans.factory.annotation.Autowired; 16 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Service; 17 import org.springframework.stereotype.Service;
15 18
16 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 19 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
17 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 20 import org.springframework.transaction.annotation.Transactional;
18 21
19 import java.util.List; 22 import java.util.List;
20 23
...@@ -35,6 +38,9 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap ...@@ -35,6 +38,9 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
35 @Autowired 38 @Autowired
36 private DgArchivesModifyMapper dgarchivesmodifyMapper; 39 private DgArchivesModifyMapper dgarchivesmodifyMapper;
37 40
41 @Autowired
42 DgArchivesService archivesService;
43
38 /** 44 /**
39 * 新增记录 45 * 新增记录
40 * 46 *
...@@ -60,15 +66,22 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap ...@@ -60,15 +66,22 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
60 } 66 }
61 67
62 /** 68 /**
63 * 修改单条记录 69 * 修改记录状态为已归档和归档日期，一并修改档案记录的状态为在库
64 * 70 *
65 * @param request 71 * @param request
66 * @return 72 * @return
67 */ 73 */
68 @Override 74 @Override
75 @Transactional(rollbackFor = Exception.class)
69 public boolean updateDgArchivesModify(UpdateDgArchivesModifyRequest request) { 76 public boolean updateDgArchivesModify(UpdateDgArchivesModifyRequest request) {
70 DgArchivesModifyDO dgarchivesmodifyDO = dgarchivesmodifyConverter.updateRequest2DO(request); 77 DgArchivesModifyDO dgarchivesmodifyDO = dgarchivesmodifyConverter.updateRequest2DO(request);
71 return this.updateById(dgarchivesmodifyDO); 78 UpdateWrapper<DgArchivesModifyDO> modifyWrapper = new UpdateWrapper<>();
79 modifyWrapper.lambda().set(DgArchivesModifyDO::getState, "2").set(DgArchivesModifyDO::getGdsj, DateTime.now());
80 this.update(dgarchivesmodifyDO, modifyWrapper);
81 //修改档案记录状态
82 UpdateWrapper<DgArchivesDO> archivesWrapper = new UpdateWrapper<>();
83 archivesWrapper.lambda().set(DgArchivesDO::getDazt, ArchiveStatus.STORED.getCode()).eq(DgArchivesDO::getBsmArchives, request.getBsmArchives());
84 return archivesService.update(archivesWrapper);
72 } 85 }
73 86
74 /** 87 /**
...@@ -78,11 +91,23 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap ...@@ -78,11 +91,23 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
78 * @return 91 * @return
79 */ 92 */
80 @Override 93 @Override
81 public Result searchDgArchivesModifyList(DgArchivesModifySearchRequest request) { 94 public IPage<DgArchivesModifyListVO> searchDgArchivesModifyList(DgArchivesModifySearchRequest request) {
82 PageHelper.startPage(request.getCurrentPage(), request.getPageSize()); 95 IPage<DgArchivesModifyListVO> pageParam = new Page<>(request.getCurrentPage(), request.getPageSize());
83 List<DgArchivesModifyListVO> list= dgarchivesmodifyMapper.searchDgArchivesModifyList(request); 96 IPage<DgArchivesModifyListVO> list = dgarchivesmodifyMapper.searchDgArchivesModifyList(pageParam, request);
84 PageInfo<DgArchivesModifyListVO> pageInfo = new PageInfo<DgArchivesModifyListVO>(list); 97 return list;
85 return Result.ok(pageInfo);
86 } 98 }
87 99
100 /**
101 * 一个档案对应的修改列表查询
102 *
103 * @param bsmArchive
104 * @return
105 */
106 @Override
107 public List<DgArchivesModifyDetailVO> getArchiveWithModify(String bsmArchive) {
108 QueryWrapper<DgArchivesModifyDO> modifyWrapper = new QueryWrapper<>();
109 modifyWrapper.lambda().eq(DgArchivesModifyDO::getBsmArchives, bsmArchive);
110 List<DgArchivesModifyDO> modifyDOS = this.list(modifyWrapper);
111 return dgarchivesmodifyConverter.doList2DetailVOList(modifyDOS);
112 }
88 } 113 }
......
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.modify.mapper.DgArchivesModifyMapper"> 3 <mapper namespace="com.pashanhoo.modify.mapper.DgArchivesModifyMapper">
4
5 <!-- 通用查询映射结果 --> 4 <!-- 通用查询映射结果 -->
6 <resultMap id="BaseResultMap" type="com.pashanhoo.modify.entity.DgArchivesModifyDO"> 5 <resultMap id="BaseResultMap" type="com.pashanhoo.modify.entity.DgArchivesModifyDO">
7 <id column="BSM_MODIFY" property="bsmModify" /> 6 <id column="BSM_MODIFY" property="bsmModify"/>
8 <result column="BSM_ARCHIVES" property="bsmArchives" /> 7 <result column="BSM_ARCHIVES" property="bsmArchives"/>
9 <result column="XGBH" property="xgbh" /> 8 <result column="XGBH" property="xgbh"/>
10 <result column="YDAXX" property="ydaxx" /> 9 <result column="YDAXX" property="ydaxx"/>
11 <result column="XDAXX" property="xdaxx" /> 10 <result column="XDAXX" property="xdaxx"/>
12 <result column="XGNR" property="xgnr" /> 11 <result column="XGNR" property="xgnr"/>
13 <result column="XGSJ" property="xgsj" /> 12 <result column="XGSJ" property="xgsj"/>
14 <result column="XGR" property="xgr" /> 13 <result column="XGR" property="xgr"/>
15 <result column="BZ" property="bz" /> 14 <result column="BZ" property="bz"/>
16 </resultMap>
17 <!-- 通用查询映射结果 -->
18 <resultMap id="SearchResultMap" type="com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO">
19 <id column="BSM_ARCHIVES" property="bsm_archives" />
20 <result column="XGSJ" property="xgsj" />
21 <result column="XGR" property="xgr" />
22 <result column="DJLX" property="djlx" />
23 <result column="DJJGMC" property="djjgmc" />
24 <result column="AJH" property="ajh" />
25 <result column="YWH" property="ywh" />
26 <result column="BDCDYH" property="bdcdyh" />
27 <result column="QLR" property="qlr" />
28 <result column="YWR" property="ywr" />
29 <result column="BDCQZH" property="bdcqzh" />
30 <result column="BDCDY_NUM" property="bdcdy_num" />
31 </resultMap> 15 </resultMap>
16 <!--&lt;!&ndash; 通用查询映射结果 &ndash;&gt;-->
17 <!--<resultMap id="SearchResultMap" type="com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO">-->
18 <!-- <id column="BSM_ARCHIVES" property="bsmArchives" />-->
19 <!-- <result column="XGSJ" property="xgsj" />-->
20 <!-- <result column="CREATER" property="creater" />-->
21 <!-- <result column="DJLX" property="djlx" />-->
22 <!-- <result column="DJJGMC" property="djjgmc" />-->
23 <!-- <result column="AJH" property="ajh" />-->
24 <!-- <result column="YWH" property="ywh" />-->
25 <!-- <result column="BDCDYH" property="bdcdyh" />-->
26 <!-- <result column="QLR" property="qlr" />-->
27 <!-- <result column="YWR" property="ywr" />-->
28 <!-- <result column="BDCQZH" property="bdcqzh" />-->
29 <!-- <result column="BDCDY_NUM" property="bdcdyNum" />-->
30 <!--</resultMap>-->
32 <!-- 通用查询结果列 --> 31 <!-- 通用查询结果列 -->
33 <sql id="Base_Column_List"> 32 <sql id="Base_Column_List">
34 BSM_MODIFY, BSM_ARCHIVES, XGBH, YDAXX, XDAXX, XGNR, XGSJ, XGR, BZ 33 BSM_MODIFY,
34 BSM_ARCHIVES,
35 XGBH,
36 YDAXX,
37 XDAXX,
38 XGNR,
39 XGSJ,
40 XGR,
41 BZ
35 </sql> 42 </sql>
36 <select id="searchDgArchivesModifyList" resultMap="SearchResultMap"> 43 <select id="searchDgArchivesModifyList" resultType="com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO">
37 select a.bsm_archives,a.xgsj,a.xgr,b.djlx,b.djjgmc,d.ajh,b.ywh,c.bdcdyh,c.qlr,c.ywr,c.BDCQZH,count(1) over(partition by c.bdcdyh) bdcdy_num 44 select DA.BSM_ARCHIVES,
38 from dg_archives_modify a, dg_business b, dg_bdcdy c,dg_archives d 45 DB.DJYWMC,
39 where a.bsm_archives = d.bsm_archives 46 DB.DJLX,
40 and a.bsm_archives=d.bsm_archives 47 DA.AJH,
41 and c.bsm_archives=d.bsm_archives 48 DB.YWH,
42 <if test="ywh != null and ywh!='' "> 49 BDCDY.BDCDYH,
43 and b.ywh=#{ywh,jdbcType=VARCHAR} 50 BDCDY.QLR,
44 </if> 51 BDCDY.YWR,
45 <if test="djjgbm != null and djjgbm!='' "> 52 BDCDY.BDCQZH,
46 and b.djjgbm=#{djjgbm,jdbcType=VARCHAR} 53 DM.CREATETIME,
47 </if> 54 DM.CREATER,
48 <if test="djlx != null and djlx!='' "> 55 count(*) over (partition by BDCDY.bdcdyh) as bdcdyNum
49 and b.djlx=#{djlx,jdbcType=VARCHAR} 56 from DG_MODIFY DM
50 </if> 57 join DG_BUSINESS DB on DM.BSM_ARCHIVES = DB.BSM_ARCHIVES
51 <if test="xgr != null and xgr!='' "> 58 join DG_BDCDY BDCDY on DM.BSM_ARCHIVES = BDCDY.BSM_ARCHIVES
52 and a.xgr=#{xgr,jdbcType=VARCHAR} 59 join DG_ARCHIVES DA on DM.BSM_ARCHIVES = DA.BSM_ARCHIVES
53 </if> 60 <where>
54 <if test="xgsj != null and xgsj!='' "> 61 <if test="request.djywmc != null and request.djywmc != ''">
55 and a.xgsj=#{xgsj,jdbcType=VARCHAR} 62 DB.DJYWMC = #{request.djywmc,jdbcType=VARCHAR}
56 </if> 63 </if>
57 64 <if test="request.djlx != null and request.djlx != ''">
58 65 and DB.DJLX = #{request.djlx,jdbcType=VARCHAR}
66 </if>
67 <if test="request.creater != null and request.creater != ''">
68 and DM.CREATER = #{request.creater,jdbcType=VARCHAR}
69 </if>
70 <if test="request.xgqssj != null">
71 <![CDATA[
72 and DM.CREATETIME >= #{request.xgqssj,jdbcType=TIMESTAMP}
73 ]]>
74 </if>
75 <if test="request.xgjzsj != null">
76 <![CDATA[
77 and DM.CREATETIME <= #{request.xgjzsj,jdbcType=TIMESTAMP}
78 ]]>
79 </if>
80 <if test="request.ajh != null and request.ajh != ''">
81 and DA.AJH = #{request.ajh,jdbcType=VARCHAR}
82 </if>
83 <if test="request.ywh != null and request.ywh != ''">
84 and DB.YWH = #{request.ywh,jdbcType=VARCHAR}
85 </if>
86 <if test="request.bdcdyh != null and request.bdcdyh != ''">
87 and BDCDY.BDCDYH = #{request.bdcdyh,jdbcType=VARCHAR}
88 </if>
89 <if test="request.bdcqzh != null and request.bdcqzh != ''">
90 and BDCDY.BDCQZH = #{request.bdcqzh,jdbcType=VARCHAR}
91 </if>
92 </where>
59 </select> 93 </select>
60 </mapper> 94 </mapper>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 </collection> 38 </collection>
39 </resultMap> 39 </resultMap>
40 40
41 <select id="getFileList" resultType="com.pashanhoo.file.entity.vo.DgFileListVO"> 41 <select id="getFileList" resultMap="result">
42 select DF.*, DAC.XH, DAC.WJMC,DAC.BSM_CATALOG 42 select DF.*, DAC.XH, DAC.WJMC,DAC.BSM_CATALOG
43 from DG_FILE DF 43 from DG_FILE DF
44 join DG_ARCHIVES_CATALOG DAC on DAC.BSM_CATALOG = DF.BSM_CATALOG 44 join DG_ARCHIVES_CATALOG DAC on DAC.BSM_CATALOG = DF.BSM_CATALOG
...@@ -49,4 +49,8 @@ ...@@ -49,4 +49,8 @@
49 </where> 49 </where>
50 order by DAC.XH 50 order by DAC.XH
51 </select> 51 </select>
52
53 <update id="updateFileSort">
54 update DG_FILE set
55 </update>
52 </mapper> 56 </mapper>
......