Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
ee87ffa5 by 夏齐
Options

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

1 parent 306f03ca
Inline Side-by-side
Showing 27 changed files with 774 additions and 230 deletions
...@@ -65,8 +65,8 @@ public class DgArchivesDestructionController { ...@@ -65,8 +65,8 @@ public class DgArchivesDestructionController {
65 } 65 }
66 @GetMapping("deleteArchivesInfo") 66 @GetMapping("deleteArchivesInfo")
67 @ApiOperation(value = "删除档案列表中的档案信息") 67 @ApiOperation(value = "删除档案列表中的档案信息")
68 public Result deleteArchivesInfo(@ApiParam("档案销毁记录ID") @RequestParam(value = "bsm_destruction") String bsm_destruction) { 68 public Result deleteArchivesInfo(@ApiParam("档案ID") @RequestParam(value = "bsmArchives") String bsmArchives) {
69 return dgarchivesdestructionService.deleteDestructionArchivescataLog(bsm_destruction); 69 return dgarchivesdestructionService.deleteDestructionArchivescataLog(bsmArchives);
70 } 70 }
71 @PostMapping("updateDgArchivesDestruction") 71 @PostMapping("updateDgArchivesDestruction")
72 @ApiOperation("修改档案销毁记录信息") 72 @ApiOperation("修改档案销毁记录信息")
......
...@@ -43,10 +43,10 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc ...@@ -43,10 +43,10 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc
43 Result queryArchivesInfo(String bsm_destruction); 43 Result queryArchivesInfo(String bsm_destruction);
44 /** 44 /**
45 * 根据条件进行列表查询 45 * 根据条件进行列表查询
46 * @param bsm_destruction 46 * @param bsmArchives
47 * @return 47 * @return
48 */ 48 */
49 Result deleteDestructionArchivescataLog(String bsm_destruction); 49 Result deleteDestructionArchivescataLog(String bsmArchives);
50 /** 50 /**
51 * 选择销毁档案List 51 * 选择销毁档案List
52 * @param archivesList 52 * @param archivesList
......
...@@ -127,8 +127,8 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest ...@@ -127,8 +127,8 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest
127 } 127 }
128 128
129 @Override 129 @Override
130 public Result deleteDestructionArchivescataLog(String bsm_destruction) { 130 public Result deleteDestructionArchivescataLog(String bsmArchives) {
131 catalogService.deleteDestructionCatalog(bsm_destruction); 131 catalogService.deleteDestructionCatalog(bsmArchives);
132 return Result.ok(); 132 return Result.ok();
133 } 133 }
134 134
......
...@@ -48,7 +48,7 @@ public interface DgDestructionCatalogService extends IService<DgDestructionCatal ...@@ -48,7 +48,7 @@ public interface DgDestructionCatalogService extends IService<DgDestructionCatal
48 /** 48 /**
49 * 通过销毁标识码删除档案销毁目录数据 49 * 通过销毁标识码删除档案销毁目录数据
50 */ 50 */
51 Result deleteDestructionCatalog(String bsmDestruction); 51 Result deleteDestructionCatalog(String bsmArchives);
52 /** 52 /**
53 * 通过档案标识码删除档案销毁目录数据 53 * 通过档案标识码删除档案销毁目录数据
54 */ 54 */
......
...@@ -86,9 +86,9 @@ public class DgDestructionCatalogServiceImpl extends ServiceImpl<DgDestructionCa ...@@ -86,9 +86,9 @@ public class DgDestructionCatalogServiceImpl extends ServiceImpl<DgDestructionCa
86 } 86 }
87 87
88 @Override 88 @Override
89 public Result deleteDestructionCatalog(String bsmDestruction) { 89 public Result deleteDestructionCatalog(String bsmArchives) {
90 QueryWrapper<DgDestructionCatalogDO> wrapper = new QueryWrapper<>(); 90 QueryWrapper<DgDestructionCatalogDO> wrapper = new QueryWrapper<>();
91 wrapper.eq(bsmDestruction!=null && !"".equals(bsmDestruction),"BSM_DESTRUCTION",bsmDestruction); 91 wrapper.eq(bsmArchives!=null && !"".equals(bsmArchives),"BSM_ARCHIVES",bsmArchives);
92 int result=dgdestructioncatalogMapper.delete(wrapper); 92 int result=dgdestructioncatalogMapper.delete(wrapper);
93 if(result!=0){ 93 if(result!=0){
94 return Result.ok(); 94 return Result.ok();
......
1 package com.pashanhoo.lend.controller; 1 package com.pashanhoo.lend.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.lend.entity.vo.AddDgLendRequest; 6 import com.pashanhoo.lend.entity.vo.AddDgLendRequest;
6 import com.pashanhoo.lend.entity.vo.UpdateDgLendRequest; 7 import com.pashanhoo.lend.entity.vo.ArchiveLendSearchRequest;
7 import com.pashanhoo.lend.entity.vo.DgLendSearchRequest; 8 import com.pashanhoo.lend.entity.vo.DgLendSearchRequest;
9 import com.pashanhoo.lend.entity.vo.UpdateDgLendRequest;
8 import com.pashanhoo.lend.service.DgLendService; 10 import com.pashanhoo.lend.service.DgLendService;
9 import org.springframework.web.bind.annotation.RestController; 11 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
10 import org.springframework.web.bind.annotation.*; 12 import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest;
11 import io.swagger.annotations.Api; 13 import io.swagger.annotations.Api;
12 import io.swagger.annotations.ApiOperation; 14 import io.swagger.annotations.ApiOperation;
13 import io.swagger.annotations.ApiParam; 15 import io.swagger.annotations.ApiParam;
14 import org.springframework.beans.factory.annotation.Autowired; 16 import org.springframework.beans.factory.annotation.Autowired;
17 import org.springframework.web.bind.annotation.*;
18
15 import java.util.List; 19 import java.util.List;
16 20
17 /** 21 /**
...@@ -29,6 +33,26 @@ public class DgLendController { ...@@ -29,6 +33,26 @@ public class DgLendController {
29 @Autowired 33 @Autowired
30 private DgLendService dglendService; 34 private DgLendService dglendService;
31 35
36 @PostMapping("search")
37 @ApiOperation(value = "根据条件进行列表查询")
38 public Result searchDgLendList(@RequestBody DgLendSearchRequest request) {
39 return dglendService.searchDgLendList(request);
40 }
41 @PostMapping("deleteDanganJyInfo")
42 @ApiOperation("通过借阅标识码删除借阅记录信息")
43 public Result deleteDanganJyInfo(@RequestParam String lendBsm){
44 return dglendService.deleteDanganJyInfo(lendBsm);
45 }
46 @PostMapping("danganGh")
47 @ApiOperation("档案归还")
48 public Result danganGh(@RequestBody UpdateDgLendRequest ghRequest){
49 return dglendService.danganGh(ghRequest);
50 }
51 @PostMapping("showArchivesForLend")
52 @ApiOperation("展示可以选择借阅的列表")
53 public Result showArchivesForLend(@RequestBody ArchiveLendSearchRequest request) {
54 return dglendService.showArchivesForLend(request);
55 }
32 @PostMapping("insertDgLend") 56 @PostMapping("insertDgLend")
33 @ApiOperation("新增档案借阅") 57 @ApiOperation("新增档案借阅")
34 public Result insertDgLend(@RequestBody AddDgLendRequest request){ 58 public Result insertDgLend(@RequestBody AddDgLendRequest request){
...@@ -37,17 +61,32 @@ public class DgLendController { ...@@ -37,17 +61,32 @@ public class DgLendController {
37 } 61 }
38 return Result.error("新增失败"); 62 return Result.error("新增失败");
39 } 63 }
40 64 @PostMapping("addLendArchivesInfo")
41 @DeleteMapping("deleteDgLendByIds") 65 @ApiOperation(value = "选择要借阅档案List")
42 @ApiOperation(value = "批量删除档案借阅") 66 public Result addLendArchivesInfo(@RequestBody List<AddDgLendCatalogRequest> archivesList) {
43 public Result deleteDgLendByIds(@ApiParam("档案借阅ID列表") @RequestParam(value = "idList") List<String> idList) { 67 return dglendService.addDestructionArchivesInfo(archivesList);
44 if(dglendService.removeByIds(idList)) {
45 return Result.ok("删除成功");
46 }
47 return Result.error("删除失败");
48 } 68 }
49 69 @PostMapping("insertDanganJyFile")
50 @PutMapping("updateDgLend") 70 @ApiOperation("批量借阅文件信息")
71 public Result insertDanganJyFile(@RequestBody List<AddDgLendFileRequest> request){
72 return dglendService.insertDanganJyFile(request);
73 }
74 @PostMapping("queryArchivesInfo")
75 @ApiOperation(value = "档案列表信息展示")
76 public Result queryArchivesInfo(@ApiParam("档案借阅记录ID") @RequestParam(value = "bsm_lend") String bsm_lend) {
77 return dglendService.queryArchivesInfo(bsm_lend);
78 }
79 @GetMapping("deleteArchivesInfo")
80 @ApiOperation(value = "删除档案列表中的档案信息")
81 public Result deleteArchivesInfo(@ApiParam("档案ID") @RequestParam(value = "bsm_lendcatalog") String bsm_lendcatalog) {
82 return dglendService.deleteArchivesInfo(bsm_lendcatalog);
83 }
84 @GetMapping("getDgLendDetailById")
85 @ApiOperation(value = "读取明细")
86 public Result getDgLendDetailById(@ApiParam("档案借阅ID") @RequestParam String id){
87 return Result.ok(dglendService.getDgLendDetailById(id));
88 }
89 @PostMapping("updateDgLend")
51 @ApiOperation("修改档案借阅") 90 @ApiOperation("修改档案借阅")
52 public Result updateDgLend(@RequestBody UpdateDgLendRequest request){ 91 public Result updateDgLend(@RequestBody UpdateDgLendRequest request){
53 if(dglendService.updateDgLend(request)) { 92 if(dglendService.updateDgLend(request)) {
...@@ -55,18 +94,23 @@ public class DgLendController { ...@@ -55,18 +94,23 @@ public class DgLendController {
55 } 94 }
56 return Result.error("修改失败"); 95 return Result.error("修改失败");
57 } 96 }
58 97 @PostMapping("updateStateByArchives")
59 @GetMapping("getDgLendDetailById") 98 @ApiOperation(value = "新增档案借阅列表中的借阅操作")
60 @ApiOperation(value = "读取明细") 99 public Result updateStateByArchives(@ApiParam("档案业务信息ID列表") @RequestParam(value = "idList") List<String> idList) {
61 public Result getDgLendDetailById(@ApiParam("档案借阅ID") @RequestParam String id){ 100 return dglendService.updateStateByArchives(idList);
62 return Result.ok(dglendService.getDgLendDetailById(id));
63 } 101 }
64 102 @GetMapping("updateArchivesStateByLend")
65 @PostMapping("search") 103 @ApiOperation(value = "编辑中的借阅操作")
66 @ApiOperation(value = "根据条件进行列表查询") 104 public Result updateArchivesStateByLend(@ApiParam("档案借阅记录ID") @RequestParam(value = "bsm_lend") String bsm_lend) {
67 public Result searchDgLendList(@RequestBody DgLendSearchRequest request) { 105 return dglendService.updateArchivesStateByLend(bsm_lend);
68 //TODO 默认排序条件设置
69 request.defaultFillPageProp("","");
70 return Result.ok(dglendService.searchDgLendList(request));
71 } 106 }
107
108
109
110
111
112
113
114
115
72 } 116 }
......
...@@ -101,6 +101,15 @@ public class DgLendDO implements Serializable { ...@@ -101,6 +101,15 @@ public class DgLendDO implements Serializable {
101 */ 101 */
102 @TableField("PZSJ") 102 @TableField("PZSJ")
103 private Date pzsj; 103 private Date pzsj;
104 104 /**
105 * 归还人
106 */
107 @TableField("GHR")
108 private String ghr;
109 /**
110 * 归还人联系电话
111 */
112 @TableField("GHRDH")
113 private String ghrdh;
105 114
106 } 115 }
......
...@@ -94,6 +94,16 @@ public class AddDgLendRequest implements Serializable { ...@@ -94,6 +94,16 @@ public class AddDgLendRequest implements Serializable {
94 */ 94 */
95 @ApiModelProperty(name = "pzsj", value = "批准时间") 95 @ApiModelProperty(name = "pzsj", value = "批准时间")
96 private Date pzsj; 96 private Date pzsj;
97 /**
98 * 归还人
99 */
100 @ApiModelProperty(name = "ghr", value = "归还人")
101 private String ghr;
102 /**
103 * 归还人联系电话
104 */
105 @ApiModelProperty(name = "ghrdh", value = "归还人联系电话")
106 private String ghrdh;
97 107
98 108
99 } 109 }
......
1 package com.pashanhoo.lend.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 @Data
10 @EqualsAndHashCode(callSuper = false)
11 @ApiModel(value="可以借阅的档案列表VO")
12 public class ArchiveLendInfoRequestVO implements Serializable {
13
14 private static final long serialVersionUID = 1L;
15
16 /**
17 * 档案标识码
18 */
19 @ApiModelProperty(name = "bsm_archives", value = "档案标识码")
20 private String bsm_archives;
21 /**
22 * 档案状态
23 */
24 @ApiModelProperty(name = "dazt", value = "档案状态")
25 private String dazt;
26 /**
27 * 案卷号
28 */
29 @ApiModelProperty(name = "ajh", value = "案卷号")
30 private String ajh;
31 /**
32 * 不动产单元号
33 */
34 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
35 private String bdcdyh;
36 /**
37 * 权利类型
38 */
39 @ApiModelProperty(name = "qllx", value = "权利类型")
40 private String qllx;
41 /**
42 * 登记类型
43 */
44 @ApiModelProperty(name = "djlx", value = "登记类型")
45 private String djlx;
46 /**
47 * 权利人
48 */
49 @ApiModelProperty(name = "qlr", value = "权利人")
50 private String qlr;
51 /**
52 * 义务人
53 */
54 @ApiModelProperty(name = "ywr", value = "义务人")
55 private String ywr;
56 /**
57 * 证件号码
58 */
59 @ApiModelProperty(name = "zjhm", value = "证件号码")
60 private String zjhm;
61 /**
62 * 不动产单元数量
63 */
64 @ApiModelProperty(name = "bdcdy_num", value = "不动产单元数量")
65 private String bdcdy_num;
66
67 }
1 package com.pashanhoo.lend.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 @Data
11 @EqualsAndHashCode(callSuper = false)
12 @ApiModel(value="可以借阅的档案列表请求类")
13 public class ArchiveLendSearchRequest extends PageInfo implements Serializable {
14 private static final long serialVersionUID = 1L;
15 /**
16 * 档案号
17 */
18 @ApiModelProperty(name = "ajh", value = "档案号")
19 private String ajh;
20 /**
21 * 业务号
22 */
23 @ApiModelProperty(name = "ywh", value = "业务号")
24 private String ywh;
25 /**
26 * 不动产单元号
27 */
28 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
29 private String bdcdyh;
30 /**
31 * 不动产权证号
32 */
33 @ApiModelProperty(name = "zjhm", value = "不动产权证号")
34 private String zjhm;
35 /**
36 * 权利人
37 */
38 @ApiModelProperty(name = "qlr", value = "权利人")
39 private String qlr;
40 /**
41 * 义务人
42 */
43 @ApiModelProperty(name = "ywr", value = "义务人")
44 private String ywr;
45 /**
46 * 查封文号
47 */
48 @ApiModelProperty(name = "cfwh", value = "查封文号")
49 private String cfwh;
50 /**
51 * 权利类型
52 */
53 @ApiModelProperty(name = "qllx", value = "权利类型")
54 private String qllx;
55
56 }
1 package com.pashanhoo.lend.entity.vo; 1 package com.pashanhoo.lend.entity.vo;
2 2
3 import java.util.Date;
4 import java.io.Serializable;
5 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 5 import lombok.Data;
8 import lombok.EqualsAndHashCode; 6 import lombok.EqualsAndHashCode;
9 7
8 import java.io.Serializable;
9
10 /** 10 /**
11 * <p> 11 * <p>
12 * 档案借阅明细实体 12 * 档案借阅明细实体
...@@ -21,84 +21,70 @@ import lombok.EqualsAndHashCode; ...@@ -21,84 +21,70 @@ import lombok.EqualsAndHashCode;
21 public class DgLendDetailVO implements Serializable { 21 public class DgLendDetailVO implements Serializable {
22 22
23 private static final long serialVersionUID = 1L; 23 private static final long serialVersionUID = 1L;
24
25 /** 24 /**
26 * 借阅标识码 25 * 借阅标识码
27 */ 26 */
28 @ApiModelProperty(name = "bsmLend", value = "借阅标识码") 27 @ApiModelProperty(name = "bsm_lend", value = "借阅标识码")
29 private String bsmLend; 28 private String bsm_lend;
30
31 /** 29 /**
32 * 借阅人 30 * 借阅时效
33 */ 31 */
34 @ApiModelProperty(name = "jyr", value = "借阅人") 32 @ApiModelProperty(name = "jysx", value = "借阅时效")
35 private String jyr; 33 private String jysx;
36
37 /** 34 /**
38 * 借阅单位 35 * 借阅单号
39 */ 36 */
40 @ApiModelProperty(name = "jydw", value = "借阅单位") 37 @ApiModelProperty(name = "jydh", value = "借阅单号")
41 private String jydw; 38 private String jydh;
42
43 /** 39 /**
44 * 联系电话 40 * 档案号
45 */ 41 */
46 @ApiModelProperty(name = "lxdw", value = "联系电话") 42 @ApiModelProperty(name = "ajh", value = "案卷号")
47 private String lxdw; 43 private String ajh;
48
49 /** 44 /**
50 * 通讯地址 45 * 借阅方式
51 */ 46 */
52 @ApiModelProperty(name = "txdz", value = "通讯地址") 47 @ApiModelProperty(name = "jyfs", value = "借阅方式")
53 private String txdz; 48 private String jyfs;
54
55 /** 49 /**
56 * 借阅日期 50 * 借阅单位
57 */ 51 */
58 @ApiModelProperty(name = "jyrq", value = "借阅日期") 52 @ApiModelProperty(name = "jydw", value = "借阅单位")
59 private Date jyrq; 53 private String jydw;
60
61 /** 54 /**
62 * 归还日期 55 * 借阅人
63 */ 56 */
64 @ApiModelProperty(name = "ghrq", value = "归还日期") 57 @ApiModelProperty(name = "jyr", value = "借阅人")
65 private Date ghrq; 58 private String jyr;
66
67 /** 59 /**
68 * 批准人 60 * 起始时间
69 */ 61 */
70 @ApiModelProperty(name = "pzr", value = "批准人") 62 @ApiModelProperty(name = "qssj", value = "起始时间")
71 private String pzr; 63 private String qssj;
72
73 /** 64 /**
74 * 借阅期限 65 * 截止时间
75 */ 66 */
76 @ApiModelProperty(name = "jyqx", value = "借阅期限") 67 @ApiModelProperty(name = "jzrq", value = "截止时间")
77 private String jyqx; 68 private String jzrq;
78
79 /** 69 /**
80 * 借出理由 70 * 归还人
81 */ 71 */
82 @ApiModelProperty(name = "jcly", value = "借出理由") 72 @ApiModelProperty(name = "ghr", value = "归还人")
83 private String jcly; 73 private String ghr;
84
85 /** 74 /**
86 * 利用目的 75 * 归还时间
87 */ 76 */
88 @ApiModelProperty(name = "lymd", value = "利用目的") 77 @ApiModelProperty(name = "ghsj", value = "归还时间")
89 private String lymd; 78 private String ghsj;
90
91 /** 79 /**
92 * 备注 80 * 借阅状态
93 */ 81 */
94 @ApiModelProperty(name = "bz", value = "备注") 82 @ApiModelProperty(name = "jyzt", value = "借阅状态")
95 private String bz; 83 private String jyzt;
96
97 /** 84 /**
98 * 批准时间 85 * 档案数量
99 */ 86 */
100 @ApiModelProperty(name = "pzsj", value = "批准时间") 87 @ApiModelProperty(name = "da_num", value = "档案数量")
101 private Date pzsj; 88 private String da_num;
102
103 89
104 } 90 }
......
1 package com.pashanhoo.lend.entity.vo; 1 package com.pashanhoo.lend.entity.vo;
2 2
3 import java.util.Date; 3 import com.pashanhoo.common.PageInfo;
4 import java.io.Serializable;
5 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 5 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 6 import lombok.Data;
8 import lombok.EqualsAndHashCode; 7 import lombok.EqualsAndHashCode;
9 import com.pashanhoo.common.PageInfo; 8
9 import java.io.Serializable;
10 10
11 /** 11 /**
12 * <p> 12 * <p>
...@@ -19,88 +19,46 @@ import com.pashanhoo.common.PageInfo; ...@@ -19,88 +19,46 @@ 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 DgLendSearchRequest extends PageInfo implements Serializable { 22 public class DgLendSearchRequest extends PageInfo implements Serializable {
24 23
25 private static final long serialVersionUID = 1L; 24 private static final long serialVersionUID = 1L;
26 25
27 /** 26 /**
28 * 借阅标识码 27 * 档案号
29 */
30 @ApiModelProperty(name = "bsmLend", value = "借阅标识码")
31 private String bsmLend;
32
33 /**
34 * 借阅人
35 */
36 @ApiModelProperty(name = "jyr", value = "借阅人")
37 private String jyr;
38
39 /**
40 * 借阅单位
41 */ 28 */
42 @ApiModelProperty(name = "jydw", value = "借阅单位") 29 @ApiModelProperty(name = "ajh", value = "档案号")
43 private String jydw; 30 private String ajh;
44 31
45 /** 32 /**
46 * 联系电话 33 * 不动产单元号
47 */ 34 */
48 @ApiModelProperty(name = "lxdw", value = "联系电话") 35 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
49 private String lxdw; 36 private String bdcdyh;
50 37
51 /** 38 /**
52 * 通讯地址 39 * 业务号
53 */ 40 */
54 @ApiModelProperty(name = "txdz", value = "通讯地址") 41 @ApiModelProperty(name = "ywh", value = "业务号")
55 private String txdz; 42 private String ywh;
56 43
57 /** 44 /**
58 * 借阅日期 45 * 不动产权证号
59 */ 46 */
60 @ApiModelProperty(name = "jyrq", value = "借阅日期") 47 @ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
61 private Date jyrq; 48 private String bdcqzh;
62 49
63 /** 50 /**
64 * 归还日期 51 * 借阅人
65 */
66 @ApiModelProperty(name = "ghrq", value = "归还日期")
67 private Date ghrq;
68
69 /**
70 * 批准人
71 */
72 @ApiModelProperty(name = "pzr", value = "批准人")
73 private String pzr;
74
75 /**
76 * 借阅期限
77 */
78 @ApiModelProperty(name = "jyqx", value = "借阅期限")
79 private String jyqx;
80
81 /**
82 * 借出理由
83 */
84 @ApiModelProperty(name = "jcly", value = "借出理由")
85 private String jcly;
86
87 /**
88 * 利用目的
89 */ 52 */
90 @ApiModelProperty(name = "lymd", value = "利用目的") 53 @ApiModelProperty(name = "jyr", value = "借阅人")
91 private String lymd; 54 private String jyr;
92 55
93 /** 56 /**
94 * 备注 57 * 借阅状态
95 */ 58 */
96 @ApiModelProperty(name = "bz", value = "备注") 59 @ApiModelProperty(name = "jyzt", value = "借阅状态")
97 private String bz; 60 private String jyzt;
98 61
99 /**
100 * 批准时间
101 */
102 @ApiModelProperty(name = "pzsj", value = "批准时间")
103 private Date pzsj;
104 62
105 63
106 } 64 }
......
...@@ -43,8 +43,8 @@ public class UpdateDgLendRequest implements Serializable { ...@@ -43,8 +43,8 @@ public class UpdateDgLendRequest implements Serializable {
43 /** 43 /**
44 * 联系电话 44 * 联系电话
45 */ 45 */
46 @ApiModelProperty(name = "lxdw", value = "联系电话") 46 @ApiModelProperty(name = "lxdh", value = "联系电话")
47 private String lxdw; 47 private String lxdh;
48 48
49 /** 49 /**
50 * 通讯地址 50 * 通讯地址
...@@ -99,6 +99,20 @@ public class UpdateDgLendRequest implements Serializable { ...@@ -99,6 +99,20 @@ public class UpdateDgLendRequest implements Serializable {
99 */ 99 */
100 @ApiModelProperty(name = "pzsj", value = "批准时间") 100 @ApiModelProperty(name = "pzsj", value = "批准时间")
101 private Date pzsj; 101 private Date pzsj;
102 /**
103 * 归还人
104 */
105 @ApiModelProperty(name = "ghr", value = "归还人")
106 private String ghr;
107 /**
108 * 归还人联系电话
109 */
110 @ApiModelProperty(name = "ghrdh", value = "归还人联系电话")
111 private String ghrdh;
112
113
114
115
102 116
103 117
104 } 118 }
......
1 package com.pashanhoo.lend.mapper; 1 package com.pashanhoo.lend.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.vo.DgArchivesListVO;
4 import com.pashanhoo.lend.entity.DgLendDO; 5 import com.pashanhoo.lend.entity.DgLendDO;
6 import com.pashanhoo.lend.entity.vo.ArchiveLendInfoRequestVO;
7 import com.pashanhoo.lend.entity.vo.ArchiveLendSearchRequest;
8 import com.pashanhoo.lend.entity.vo.DgLendDetailVO;
9 import com.pashanhoo.lend.entity.vo.DgLendSearchRequest;
10 import org.apache.ibatis.annotations.Param;
11
12 import java.util.List;
5 13
6 /** 14 /**
7 * <p> 15 * <p>
...@@ -13,4 +21,15 @@ import com.pashanhoo.lend.entity.DgLendDO; ...@@ -13,4 +21,15 @@ import com.pashanhoo.lend.entity.DgLendDO;
13 */ 21 */
14 public interface DgLendMapper extends BaseMapper<DgLendDO> { 22 public interface DgLendMapper extends BaseMapper<DgLendDO> {
15 23
24 List<DgLendDetailVO> getDanganJyDetail(DgLendSearchRequest request);
25
26 boolean updateArchivesStatus(@Param("lendBsm") String lendBsm, @Param("dazt") String dazt);
27
28 List<DgArchivesListVO> queryArchivesInfo(@Param("bsm_lend") String bsm_lend);
29
30 boolean updateArchivesStatusBatch(@Param("idList") List<String> idList,@Param("dazt") String dazt);
31
32 List<ArchiveLendInfoRequestVO> getArchiveLendInfo(ArchiveLendSearchRequest request);
33
34
16 } 35 }
......
1 package com.pashanhoo.lend.service; 1 package com.pashanhoo.lend.service;
2 2
3 import com.baomidou.mybatisplus.extension.service.IService; 3 import com.baomidou.mybatisplus.extension.service.IService;
4 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
5 import com.pashanhoo.common.Result;
4 import com.pashanhoo.lend.entity.DgLendDO; 6 import com.pashanhoo.lend.entity.DgLendDO;
5 import com.pashanhoo.lend.entity.vo.AddDgLendRequest; 7 import com.pashanhoo.lend.entity.vo.*;
6 import com.pashanhoo.lend.entity.vo.DgLendDetailVO;
7 import com.pashanhoo.lend.entity.vo.UpdateDgLendRequest;
8 import com.pashanhoo.lend.entity.vo.DgLendSearchRequest;
9 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 8 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
10 import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest;
11
12 import java.util.List;
10 13
11 /** 14 /**
12 * <p> 15 * <p>
...@@ -17,31 +20,83 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -17,31 +20,83 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
17 * @since 2021-11-05 20 * @since 2021-11-05
18 */ 21 */
19 public interface DgLendService extends IService<DgLendDO> { 22 public interface DgLendService extends IService<DgLendDO> {
23 /**
24 * 根据条件进行列表查询
25 * @param request
26 * @return
27 */
28 Result searchDgLendList(DgLendSearchRequest request);
29 /**
30 * 删除借阅记录
31 * @param lendBsm
32 * @return
33 */
34 Result deleteDanganJyInfo(String lendBsm);
35 /**
36 * 档案归还
37 */
38 Result danganGh(UpdateDgLendRequest ghRequest);
39 /**
40 * 展示可以选择借阅的列表
41 * @param request
42 * @return
43 */
44 Result showArchivesForLend(ArchiveLendSearchRequest request);
20 /** 45 /**
21 * 新增记录 46 * 新增记录
22 * @param request 47 * @param request
23 * @return 48 * @return
24 */ 49 */
25 boolean insertDgLend(AddDgLendRequest request); 50 boolean insertDgLend(AddDgLendRequest request);
26
27 /** 51 /**
28 * 根据主键查询记录详情 52 * 根据主键查询记录详情
29 * @param id 53 * @param id
30 * @return 54 * @return
31 */ 55 */
32 DgLendDetailVO getDgLendDetailById(String id); 56 DgLendDetailVO getDgLendDetailById(String id);
33
34 /** 57 /**
35 * 修改单条记录 58 * 修改单条记录
36 * @param request 59 * @param request
37 * @return 60 * @return
38 */ 61 */
39 boolean updateDgLend(UpdateDgLendRequest request); 62 boolean updateDgLend(UpdateDgLendRequest request);
40 63 /**
64 * 选择要借阅档案List
65 * @param archivesList
66 * @return
67 */
68 Result addDestructionArchivesInfo(List<AddDgLendCatalogRequest> archivesList);
41 /** 69 /**
42 * 根据条件进行列表查询 70 * 根据条件进行列表查询
71 * @param bsm_lend
72 * @return
73 */
74 Result queryArchivesInfo(String bsm_lend);
75 /**
76 *删除档案列表中的档案信息
77 */
78 Result deleteArchivesInfo(String bsm_lendcatalog);
79 /**
80 * 新增档案借阅列表中的借阅操作
81 * @param idList
82 * @return
83 */
84 Result updateStateByArchives(List<String> idList);
85 /**
86 * 借阅接口
87 * @param bsm_lend
88 * @return
89 */
90 Result updateArchivesStateByLend(String bsm_lend);
91 /**
92 * 批量借阅文件接口
43 * @param request 93 * @param request
44 * @return 94 * @return
45 */ 95 */
46 Page searchDgLendList(DgLendSearchRequest request); 96 Result insertDanganJyFile(List<AddDgLendFileRequest> request);
97
98
99
100
101
47 } 102 }
......
1 package com.pashanhoo.lend.service.impl; 1 package com.pashanhoo.lend.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.github.pagehelper.PageHelper;
5 import com.github.pagehelper.PageInfo;
6 import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
7 import com.pashanhoo.common.Result;
4 import com.pashanhoo.lend.entity.DgLendConverter; 8 import com.pashanhoo.lend.entity.DgLendConverter;
5 import com.pashanhoo.lend.entity.DgLendDO; 9 import com.pashanhoo.lend.entity.DgLendDO;
6 import com.pashanhoo.lend.entity.vo.AddDgLendRequest; 10 import com.pashanhoo.lend.entity.vo.*;
7 import com.pashanhoo.lend.entity.vo.DgLendDetailVO;
8 import com.pashanhoo.lend.entity.vo.UpdateDgLendRequest;
9 import com.pashanhoo.lend.entity.vo.DgLendSearchRequest;
10 import com.pashanhoo.lend.mapper.DgLendMapper; 11 import com.pashanhoo.lend.mapper.DgLendMapper;
11 import com.pashanhoo.lend.service.DgLendService; 12 import com.pashanhoo.lend.service.DgLendService;
13 import com.pashanhoo.lendcatalog.entity.DgLendCatalogConverter;
14 import com.pashanhoo.lendcatalog.entity.DgLendCatalogDO;
15 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
16 import com.pashanhoo.lendcatalog.entity.vo.UpdateDgLendCatalogRequest;
17 import com.pashanhoo.lendcatalog.service.DgLendCatalogService;
18 import com.pashanhoo.lendfile.entity.DgLendFileConverter;
19 import com.pashanhoo.lendfile.entity.DgLendFileDO;
20 import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest;
21 import com.pashanhoo.lendfile.service.DgLendFileService;
12 import org.springframework.beans.factory.annotation.Autowired; 22 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Service; 23 import org.springframework.stereotype.Service;
24 import org.springframework.transaction.annotation.Transactional;
14 25
15 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 26 import java.math.BigDecimal;
16 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 27 import java.util.ArrayList;
28 import java.util.List;
17 29
18 /** 30 /**
19 * <p> 31 * <p>
...@@ -28,9 +40,69 @@ public class DgLendServiceImpl extends ServiceImpl<DgLendMapper, DgLendDO> imple ...@@ -28,9 +40,69 @@ public class DgLendServiceImpl extends ServiceImpl<DgLendMapper, DgLendDO> imple
28 40
29 @Autowired 41 @Autowired
30 private DgLendConverter dglendConverter; 42 private DgLendConverter dglendConverter;
31 43 @Autowired
44 private DgLendCatalogConverter catalogConverter;
32 @Autowired 45 @Autowired
33 private DgLendMapper dglendMapper; 46 private DgLendMapper dglendMapper;
47 @Autowired
48 private DgLendCatalogService catalogService;
49 @Autowired
50 private DgLendFileService fileService;
51 @Autowired
52 private DgLendFileConverter fileConverter;
53 /**
54 * 根据条件进行列表查询
55 * @param request
56 * @return
57 */
58 @Override
59 public Result searchDgLendList(DgLendSearchRequest request) {
60 PageHelper.startPage(request.getCurrentPage(), request.getPageSize());
61 List<DgLendDetailVO> jyListVOList = dglendMapper.getDanganJyDetail(request);
62 PageInfo<DgLendDetailVO> pageInfo = new PageInfo<DgLendDetailVO>(jyListVOList);
63 return Result.ok(pageInfo);
64 }
65
66 @Override
67 @Transactional(rollbackFor = Exception.class)
68 public Result deleteDanganJyInfo(String lendBsm) {
69 //查询销毁记录是否存在，存在则删除
70 if(getDgLendDetailById(lendBsm)!=null){
71 dglendMapper.deleteById(lendBsm);
72 }
73 //查询销毁目录记录是否存在，存在则删除
74 List<String> jnmlList=new ArrayList<String>();
75 List<DgLendCatalogDO> catalogDOList= (List<DgLendCatalogDO>) catalogService.getJyMlInfo(lendBsm).getResult();
76 if(catalogDOList!=null){
77 catalogService.deleteJyMlInfo(lendBsm);
78 for (int i = 0; i <catalogDOList.size() ; i++) {
79 jnmlList.add(catalogDOList.get(i).getBsmLendcatalog());
80 }
81 }
82 //查询销毁目录文件记录是否存在，存在则删除
83 List<DgLendCatalogDO> list= (List<DgLendCatalogDO>) catalogService.getJyFileInfoByjybsm(jnmlList).getResult();
84 if(list!=null){
85 catalogService.deleteDanganJyBatch(list);
86 }
87 //修改档案信息表状态
88 dglendMapper.updateArchivesStatus(lendBsm,"4");
89 return Result.ok();
90 }
91
92 @Override
93 public Result danganGh(UpdateDgLendRequest ghRequest) {
94 DgLendDO lendDO=dglendConverter.updateRequest2DO(ghRequest);
95 dglendMapper.updateById(lendDO);
96 //修改档案信息表状态
97 dglendMapper.updateArchivesStatus(ghRequest.getBsmLend(),"4");
98 return Result.ok();
99 }
100
101 @Override
102 public Result showArchivesForLend(ArchiveLendSearchRequest request) {
103 List<ArchiveLendInfoRequestVO> list=dglendMapper.getArchiveLendInfo(request);
104 return Result.ok(list);
105 }
34 106
35 /** 107 /**
36 * 新增记录 108 * 新增记录
...@@ -65,23 +137,51 @@ public class DgLendServiceImpl extends ServiceImpl<DgLendMapper, DgLendDO> imple ...@@ -65,23 +137,51 @@ public class DgLendServiceImpl extends ServiceImpl<DgLendMapper, DgLendDO> imple
65 return this.updateById(dglendDO); 137 return this.updateById(dglendDO);
66 } 138 }
67 139
68 /**
69 * 根据条件进行列表查询
70 * @param request
71 * @return
72 */
73 @Override 140 @Override
74 public Page searchDgLendList(DgLendSearchRequest request) { 141 public Result addDestructionArchivesInfo(List<AddDgLendCatalogRequest> archivesList) {
75 Page<DgLendDO> pageParam = new Page<DgLendDO>(request.getCurrentPage(), request.getPageSize()); 142 List<DgLendCatalogDO> lendCatalogDOS=catalogConverter.addCataLogListDO(archivesList);
76 QueryWrapper<DgLendDO> wrapper = new QueryWrapper<>(); 143 catalogService.saveBatch(lendCatalogDOS);
77 //设置默认排序 144 return Result.ok();
78 wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) : wrapper.orderByAsc(request.getSortField()); 145 }
146
147 @Override
148 public Result queryArchivesInfo(String bsm_lend) {
149 return Result.ok(dglendMapper.queryArchivesInfo(bsm_lend));
150 }
151
152 @Override
153 public Result deleteArchivesInfo(String bsm_lendcatalog) {
154 //删除目录信息
155 catalogService.deleteJyMlInfoByDA(bsm_lendcatalog);
156 //删除目录文件信息
157 fileService.deleteJyFile(bsm_lendcatalog);
158 return Result.ok();
159 }
160
161 @Override
162 public Result updateStateByArchives(List<String> idList) {
163 dglendMapper.updateArchivesStatusBatch(idList,"8");
164 return Result.ok();
165 }
79 166
80 //TODO 根据当前情况设置wrapper条件 167 @Override
168 public Result updateArchivesStateByLend(String bsm_destruction) {
169 //修改档案信息表状态
170 dglendMapper.updateArchivesStatus(bsm_destruction,"8");
171 return Result.ok();
172 }
81 173
82 Page page = this.page(pageParam, wrapper); 174 @Override
83 //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象 175 public Result insertDanganJyFile(List<AddDgLendFileRequest> request) {
84 return page.setRecords(dglendConverter.doList2ListVOList(page.getRecords())); 176 List<DgLendFileDO> list=fileConverter.addLendFileList(request);
177 fileService.saveBatch(list);
178 //通过目录标识修改目录表记录
179 UpdateDgLendCatalogRequest catalogRequest=new UpdateDgLendCatalogRequest();
180 catalogRequest.setBsmLendcatalog(request.get(0).getBsmLendcatalog());
181 catalogRequest.setJycllx(request.get(0).getJycllx());
182 catalogService.updateDgLendCatalog(catalogRequest);
183 return Result.ok();
85 } 184 }
86 185
186
87 } 187 }
......
...@@ -3,14 +3,13 @@ package com.pashanhoo.lendcatalog.controller; ...@@ -3,14 +3,13 @@ package com.pashanhoo.lendcatalog.controller;
3 import com.pashanhoo.common.Result; 3 import com.pashanhoo.common.Result;
4 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest; 4 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
5 import com.pashanhoo.lendcatalog.entity.vo.UpdateDgLendCatalogRequest; 5 import com.pashanhoo.lendcatalog.entity.vo.UpdateDgLendCatalogRequest;
6 import com.pashanhoo.lendcatalog.entity.vo.DgLendCatalogSearchRequest;
7 import com.pashanhoo.lendcatalog.service.DgLendCatalogService; 6 import com.pashanhoo.lendcatalog.service.DgLendCatalogService;
8 import org.springframework.web.bind.annotation.RestController;
9 import org.springframework.web.bind.annotation.*;
10 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
11 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
12 import io.swagger.annotations.ApiParam; 9 import io.swagger.annotations.ApiParam;
13 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.web.bind.annotation.*;
12
14 import java.util.List; 13 import java.util.List;
15 14
16 /** 15 /**
...@@ -61,11 +60,5 @@ public class DgLendCatalogController { ...@@ -61,11 +60,5 @@ public class DgLendCatalogController {
61 return Result.ok(dglendcatalogService.getDgLendCatalogDetailById(id)); 60 return Result.ok(dglendcatalogService.getDgLendCatalogDetailById(id));
62 } 61 }
63 62
64 @PostMapping("search") 63
65 @ApiOperation(value = "根据条件进行列表查询")
66 public Result searchDgLendCatalogList(@RequestBody DgLendCatalogSearchRequest request) {
67 //TODO 默认排序条件设置
68 request.defaultFillPageProp("","");
69 return Result.ok(dglendcatalogService.searchDgLendCatalogList(request));
70 }
71 } 64 }
......
...@@ -23,4 +23,7 @@ public interface DgLendCatalogConverter{ ...@@ -23,4 +23,7 @@ public interface DgLendCatalogConverter{
23 DgLendCatalogListVO do2ListVO(DgLendCatalogDO dglendcatalogDO); 23 DgLendCatalogListVO do2ListVO(DgLendCatalogDO dglendcatalogDO);
24 24
25 List<DgLendCatalogListVO> doList2ListVOList(List<DgLendCatalogDO> dglendcatalogDOList); 25 List<DgLendCatalogListVO> doList2ListVOList(List<DgLendCatalogDO> dglendcatalogDOList);
26
27 List<DgLendCatalogDO> addCataLogListDO(List<AddDgLendCatalogRequest> request);
28
26 } 29 }
......
1 package com.pashanhoo.lendcatalog.service; 1 package com.pashanhoo.lendcatalog.service;
2 2
3 import com.pashanhoo.common.Result;
3 import com.pashanhoo.lendcatalog.entity.DgLendCatalogDO; 4 import com.pashanhoo.lendcatalog.entity.DgLendCatalogDO;
4 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest; 5 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
5 import com.pashanhoo.lendcatalog.entity.vo.DgLendCatalogDetailVO; 6 import com.pashanhoo.lendcatalog.entity.vo.DgLendCatalogDetailVO;
...@@ -8,6 +9,8 @@ import com.pashanhoo.lendcatalog.entity.vo.DgLendCatalogSearchRequest; ...@@ -8,6 +9,8 @@ import com.pashanhoo.lendcatalog.entity.vo.DgLendCatalogSearchRequest;
8 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 9 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9 import com.baomidou.mybatisplus.extension.service.IService; 10 import com.baomidou.mybatisplus.extension.service.IService;
10 11
12 import java.util.List;
13
11 /** 14 /**
12 * <p> 15 * <p>
13 * 档案借阅目录 服务类 16 * 档案借阅目录 服务类
...@@ -39,9 +42,35 @@ public interface DgLendCatalogService extends IService<DgLendCatalogDO> { ...@@ -39,9 +42,35 @@ public interface DgLendCatalogService extends IService<DgLendCatalogDO> {
39 boolean updateDgLendCatalog(UpdateDgLendCatalogRequest request); 42 boolean updateDgLendCatalog(UpdateDgLendCatalogRequest request);
40 43
41 /** 44 /**
42 * 根据条件进行列表查询 45 * 查询借阅目录信息
43 * @param request 46 * @param lendBsm
47 * @return
48 */
49 Result getJyMlInfo(String lendBsm);
50 /**
51 * 删除借阅目录信息
52 * @param lendBsm
44 * @return 53 * @return
45 */ 54 */
46 Page searchDgLendCatalogList(DgLendCatalogSearchRequest request); 55 Result deleteJyMlInfo(String lendBsm);
56 /**
57 * 通过借阅目录查询借阅的文件目录
58 * @param jnmlList
59 * @return
60 */
61 Result getJyFileInfoByjybsm(List<String> jnmlList);
62 /**
63 * 批量删除借阅文件记录
64 * @param jywjDOList
65 * @return
66 */
67 Result deleteDanganJyBatch(List<DgLendCatalogDO> jywjDOList);
68 /**
69 * 删除借阅目录信息
70 * @param bsm_lendcatalog
71 * @return
72 */
73 Result deleteJyMlInfoByDA(String bsm_lendcatalog);
74
75
47 } 76 }
......
1 package com.pashanhoo.lendcatalog.service.impl; 1 package com.pashanhoo.lendcatalog.service.impl;
2 2
3 import com.pashanhoo.common.Result;
3 import com.pashanhoo.lendcatalog.entity.DgLendCatalogConverter; 4 import com.pashanhoo.lendcatalog.entity.DgLendCatalogConverter;
4 import com.pashanhoo.lendcatalog.entity.DgLendCatalogDO; 5 import com.pashanhoo.lendcatalog.entity.DgLendCatalogDO;
5 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest; 6 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
...@@ -15,6 +16,9 @@ import org.springframework.stereotype.Service; ...@@ -15,6 +16,9 @@ import org.springframework.stereotype.Service;
15 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 16 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
16 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 17 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
17 18
19 import java.util.ArrayList;
20 import java.util.List;
21
18 /** 22 /**
19 * <p> 23 * <p>
20 * 档案借阅目录 服务实现类 24 * 档案借阅目录 服务实现类
...@@ -64,24 +68,42 @@ public class DgLendCatalogServiceImpl extends ServiceImpl<DgLendCatalogMapper, D ...@@ -64,24 +68,42 @@ public class DgLendCatalogServiceImpl extends ServiceImpl<DgLendCatalogMapper, D
64 DgLendCatalogDO dglendcatalogDO = dglendcatalogConverter.updateRequest2DO(request); 68 DgLendCatalogDO dglendcatalogDO = dglendcatalogConverter.updateRequest2DO(request);
65 return this.updateById(dglendcatalogDO); 69 return this.updateById(dglendcatalogDO);
66 } 70 }
71 @Override
72 public Result getJyMlInfo(String lendBsm){
73 QueryWrapper<DgLendCatalogDO> wrapper = new QueryWrapper<>();
74 wrapper.eq(lendBsm!=null && !"".equals(lendBsm),"BSM_LEND",lendBsm);
75 List<DgLendCatalogDO> jymlDOListt=dglendcatalogMapper.selectList(wrapper);
76 return Result.ok(jymlDOListt);
77 }
78 @Override
79 public Result deleteJyMlInfo(String lendBsm){
80 QueryWrapper<DgLendCatalogDO> wrapper = new QueryWrapper<>();
81 wrapper.eq(lendBsm!=null && !"".equals(lendBsm),"BSM_LEND",lendBsm);
82 dglendcatalogMapper.delete(wrapper);
83 return Result.ok();
84 }
67 85
68 /**
69 * 根据条件进行列表查询
70 * @param request
71 * @return
72 */
73 @Override 86 @Override
74 public Page searchDgLendCatalogList(DgLendCatalogSearchRequest request) { 87 public Result getJyFileInfoByjybsm(List<String> jnmlList) {
75 Page<DgLendCatalogDO> pageParam = new Page<DgLendCatalogDO>(request.getCurrentPage(), request.getPageSize());
76 QueryWrapper<DgLendCatalogDO> wrapper = new QueryWrapper<>(); 88 QueryWrapper<DgLendCatalogDO> wrapper = new QueryWrapper<>();
77 //设置默认排序 89 wrapper.in("BSM_LENDCATALOG",jnmlList);
78 wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) : wrapper.orderByAsc(request.getSortField()); 90 List<DgLendCatalogDO> list=dglendcatalogMapper.selectList(wrapper);
91 return Result.ok(list);
92 }
79 93
80 //TODO 根据当前情况设置wrapper条件 94 @Override
95 public Result deleteDanganJyBatch(List<DgLendCatalogDO> jywjDOList) {
96 QueryWrapper<DgLendCatalogDO> wrapper = new QueryWrapper<>();
97 wrapper.in("BSM_LENDCATALOG",jywjDOList);
98 dglendcatalogMapper.delete(wrapper);
99 return Result.ok();
100 }
81 101
82 Page page = this.page(pageParam, wrapper); 102 @Override
83 //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象 103 public Result deleteJyMlInfoByDA(String bsm_lendcatalog) {
84 return page.setRecords(dglendcatalogConverter.doList2ListVOList(page.getRecords())); 104 dglendcatalogMapper.deleteById(bsm_lendcatalog);
105 return Result.ok();
85 } 106 }
86 107
108
87 } 109 }
......
...@@ -22,4 +22,6 @@ public interface DgLendFileConverter{ ...@@ -22,4 +22,6 @@ public interface DgLendFileConverter{
22 DgLendFileListVO do2ListVO(DgLendFileDO dglendfileDO); 22 DgLendFileListVO do2ListVO(DgLendFileDO dglendfileDO);
23 23
24 List<DgLendFileListVO> doList2ListVOList(List<DgLendFileDO> dglendfileDOList); 24 List<DgLendFileListVO> doList2ListVOList(List<DgLendFileDO> dglendfileDOList);
25
26 List<DgLendFileDO> addLendFileList(List<AddDgLendFileRequest> request);
25 } 27 }
......
...@@ -34,5 +34,11 @@ public class AddDgLendFileRequest implements Serializable { ...@@ -34,5 +34,11 @@ public class AddDgLendFileRequest implements Serializable {
34 @ApiModelProperty(name = "bsmCatalog", value = "目录标识码") 34 @ApiModelProperty(name = "bsmCatalog", value = "目录标识码")
35 private String bsmCatalog; 35 private String bsmCatalog;
36 36
37 /**
38 * 借阅材料类型
39 */
40 @ApiModelProperty(name = "jycllx", value = "借阅材料类型")
41 private String jycllx;
42
37 43
38 } 44 }
......
1 package com.pashanhoo.lendfile.service; 1 package com.pashanhoo.lendfile.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.lendfile.entity.DgLendFileDO; 5 import com.pashanhoo.lendfile.entity.DgLendFileDO;
5 import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest; 6 import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest;
6 import com.pashanhoo.lendfile.entity.vo.DgLendFileDetailVO; 7 import com.pashanhoo.lendfile.entity.vo.DgLendFileDetailVO;
...@@ -44,4 +45,11 @@ public interface DgLendFileService extends IService<DgLendFileDO> { ...@@ -44,4 +45,11 @@ public interface DgLendFileService extends IService<DgLendFileDO> {
44 * @return 45 * @return
45 */ 46 */
46 Page searchDgLendFileList(DgLendFileSearchRequest request); 47 Page searchDgLendFileList(DgLendFileSearchRequest request);
48 /**
49 * 通过借阅目录标识码删除借阅文件信息
50 * @param bsm_lendcatalog
51 * @return
52 */
53 Result deleteJyFile(String bsm_lendcatalog);
54
47 } 55 }
......
1 package com.pashanhoo.lendfile.service.impl; 1 package com.pashanhoo.lendfile.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;
5 import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO;
4 import com.pashanhoo.lendfile.entity.DgLendFileConverter; 6 import com.pashanhoo.lendfile.entity.DgLendFileConverter;
5 import com.pashanhoo.lendfile.entity.DgLendFileDO; 7 import com.pashanhoo.lendfile.entity.DgLendFileDO;
6 import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest; 8 import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest;
...@@ -84,4 +86,16 @@ public class DgLendFileServiceImpl extends ServiceImpl<DgLendFileMapper, DgLendF ...@@ -84,4 +86,16 @@ public class DgLendFileServiceImpl extends ServiceImpl<DgLendFileMapper, DgLendF
84 return page.setRecords(dglendfileConverter.doList2ListVOList(page.getRecords())); 86 return page.setRecords(dglendfileConverter.doList2ListVOList(page.getRecords()));
85 } 87 }
86 88
89 @Override
90 public Result deleteJyFile(String bsm_lendcatalog) {
91 QueryWrapper<DgLendFileDO> wrapper = new QueryWrapper<>();
92 wrapper.eq(bsm_lendcatalog!=null && !"".equals(bsm_lendcatalog),"BSM_LENDCATALOG",bsm_lendcatalog);
93 int result=dglendfileMapper.delete(wrapper);
94 if(result!=0){
95 return Result.ok();
96 }else{
97 return Result.error("操作失败");
98 }
99 }
100
87 } 101 }
......
...@@ -74,11 +74,8 @@ public class DgStaffServiceImpl extends ServiceImpl<DgStaffMapper, DgStaffDO> im ...@@ -74,11 +74,8 @@ public class DgStaffServiceImpl extends ServiceImpl<DgStaffMapper, DgStaffDO> im
74 public Page searchDgStaffList(DgStaffSearchRequest request) { 74 public Page searchDgStaffList(DgStaffSearchRequest request) {
75 Page<DgStaffDO> pageParam = new Page<DgStaffDO>(request.getCurrentPage(), request.getPageSize()); 75 Page<DgStaffDO> pageParam = new Page<DgStaffDO>(request.getCurrentPage(), request.getPageSize());
76 QueryWrapper<DgStaffDO> wrapper = new QueryWrapper<>(); 76 QueryWrapper<DgStaffDO> wrapper = new QueryWrapper<>();
77 //设置默认排序 77 wrapper.eq(request.getStaffId()!=null && !"".equals(request.getStaffId()),"STAFF_ID",request.getStaffId());
78 wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) : wrapper.orderByAsc(request.getSortField()); 78 wrapper.eq(request.getStaffPassword()!=null && !"".equals(request.getStaffPassword()),"STAFF_PASSWORD",request.getStaffPassword());
79
80 //TODO 根据当前情况设置wrapper条件
81
82 Page page = this.page(pageParam, wrapper); 79 Page page = this.page(pageParam, wrapper);
83 //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象 80 //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象
84 return page.setRecords(dgstaffConverter.doList2ListVOList(page.getRecords())); 81 return page.setRecords(dgstaffConverter.doList2ListVOList(page.getRecords()));
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 select * from dg_archives b 111 select * from dg_archives b
112 where exists (select 1 112 where exists (select 1
113 from DG_DESTRUCTION_CATALOG a 113 from DG_DESTRUCTION_CATALOG a
114 where a.bsm_destruction = #{bsm_destruction,jdbcType=VARCHAR} 114 where a.BSM_LEND = #{bsm_destruction,jdbcType=VARCHAR}
115 and b.bsm_archives = a.bsm_archives) 115 and b.bsm_archives = a.bsm_archives)
116 </select> 116 </select>
117 117
......
...@@ -3,24 +3,176 @@ ...@@ -3,24 +3,176 @@
3 <mapper namespace="com.pashanhoo.lend.mapper.DgLendMapper"> 3 <mapper namespace="com.pashanhoo.lend.mapper.DgLendMapper">
4 4
5 <!-- 通用查询映射结果 --> 5 <!-- 通用查询映射结果 -->
6 <resultMap id="BaseResultMap" type="com.pashanhoo.lend.entity.DgLendDO"> 6 <resultMap id="BaseResultMap" type="com.pashanhoo.lend.entity.vo.DgLendDetailVO">
7 <id column="BSM_LEND" property="bsmLend" /> 7 <id column="BSM_LEND" property="bsm_lend" />
8 <result column="JYR" property="jyr" /> 8 <result column="JYSX" property="jyr" />
9 <result column="JYDH" property="jydw" />
10 <result column="AJH" property="ajh" />
11 <result column="JYFS" property="jyfs" />
9 <result column="JYDW" property="jydw" /> 12 <result column="JYDW" property="jydw" />
10 <result column="LXDW" property="lxdw" /> 13 <result column="JYR" property="jyr" />
11 <result column="TXDZ" property="txdz" /> 14 <result column="QSSJ" property="qssj" />
12 <result column="JYRQ" property="jyrq" /> 15 <result column="JZRQ" property="jzrq" />
13 <result column="GHRQ" property="ghrq" /> 16 <result column="GHR" property="ghr" />
14 <result column="PZR" property="pzr" /> 17 <result column="GHSJ" property="ghsj" />
15 <result column="JYQX" property="jyqx" /> 18 <result column="JYZT" property="jyzt" />
16 <result column="JCLY" property="jcly" /> 19 <result column="DA_NUM" property="da_num" />
17 <result column="LYMD" property="lymd" /> 20 </resultMap>
21 <!-- 档案列表记录查询 -->
22 <resultMap id="ShowArchivesInfoResultMap" type="com.pashanhoo.archive.entity.vo.DgArchivesListVO">
23 <id column="BSM_ARCHIVES" property="bsmArchives" />
24 <result column="AJBT" property="ajbt" />
25 <result column="ZTC" property="ztc" />
26 <result column="FLH" property="flh" />
27 <result column="MLH" property="mlh" />
28 <result column="AJH" property="ajh" />
29 <result column="ND" property="nd" />
30 <result column="JS" property="js" />
31 <result column="YS" property="ys" />
32 <result column="BGQX" property="bgqx" />
33 <result column="QSRQ" property="qsrq" />
34 <result column="ZZRQ" property="zzrq" />
35 <result column="MJ" property="mj" />
36 <result column="HH" property="hh" />
37 <result column="CFWZ" property="cfwz" />
38 <result column="CJR" property="cjr" />
39 <result column="CJRQ" property="cjrq" />
40 <result column="HCR" property="hcr" />
18 <result column="BZ" property="bz" /> 41 <result column="BZ" property="bz" />
19 <result column="PZSJ" property="pzsj" /> 42 <result column="SMZT" property="smzt" />
43 <result column="DAZT" property="dazt" />
44 <result column="CDJGBM" property="cdjgbm" />
45 <result column="DALY" property="daly" />
46 </resultMap>
47 <!-- 通用查询映射结果 -->
48 <resultMap id="ArchiveLendInfoResultMap" type="com.pashanhoo.lend.entity.vo.ArchiveLendInfoRequestVO">
49 <id column="BSM_ARCHIVES" property="bsm_archives" />
50 <result column="DAZT" property="dazt" />
51 <result column="AJH" property="ajh" />
52 <result column="BDCDYH" property="bdcdyh" />
53 <result column="QLLX" property="qllx" />
54 <result column="DJLX" property="djlx" />
55 <result column="QLR" property="qlr" />
56 <result column="YWR" property="ywr" />
57 <result column="ZJHM" property="zjhm" />
58 <result column="BDCDY_NUM" property="bdcdy_num" />
20 </resultMap> 59 </resultMap>
21
22 <!-- 通用查询结果列 --> 60 <!-- 通用查询结果列 -->
23 <sql id="Base_Column_List"> 61 <sql id="Base_Column_List">
24 BSM_LEND, JYR, JYDW, LXDW, TXDZ, JYRQ, GHRQ, PZR, JYQX, JCLY, LYMD, BZ, PZSJ 62 BSM_LEND, JYR, JYDW, LXDW, TXDZ, JYRQ, GHRQ, PZR, JYQX, JCLY, LYMD, BZ, PZSJ
25 </sql> 63 </sql>
64 <update id="updateArchivesStatus">
65 update dg_archives b
66 set b.dazt = #{dazt,jdbcType=VARCHAR}
67 where exists (select 1
68 from DG_LEND_CATALOG a
69 where a.BSM_LENDCATALOG = #{lendBsm,jdbcType=VARCHAR}
70 and b.bsm_archives = a.bsm_archives)
71
72 </update>
73 <update id="updateArchivesStatusBatch">
74 update dg_archives b
75 set b.dazt = #{dazt,jdbcType=VARCHAR} where bsm_archives in
76 <foreach collection="idList" index="index" item="item"
77 separator="," open="(" close=")">
78 #{item,jdbcType=VARCHAR}
79 </foreach>
80 </update>
81 <select id="getDanganJyDetail" resultMap="BaseResultMap">
82 select d.BSM_LEND,
83 d.jysx,
84 d.jydh,
85 d.ajh,
86 d.jyfs,
87 d.jydw,
88 d.jyr,
89 d.qssj,
90 d.jzrq,
91 d.ghr,
92 d.ghsj,
93 d.jyzt,count(1) over(partition by d.BSM_LEND order by d.jysx asc, d.jzrq asc, d.jyzt asc) da_num
94 from (select a.jy_bsm,
95 case
96 when a.jzrq &lt; sysdate and a.JYZT = '8' then
97 '0'
98 else
99 '1'
100 end as jysx,
101 a.jydh,
102 b.ajh,
103 a.jyfs,
104 a.jydw,
105 a.jyr,
106 a.qssj,
107 a.jzrq,
108 a.ghr,
109 a.ghsj,
110 a.jyzt
111 from dg_lend a, dg_archives b,dg_lend_catalog c,dg_bdcdy e,dg_business f
112 where b.BSM_ARCHIVES=c.BSM_ARCHIVES
113 and a.BSM_LEND=c.BSM_LEND
114 and e.BSM_ARCHIVES=b.BSM_ARCHIVES
115 and f.BSM_ARCHIVES=b.BSM_ARCHIVES
116 <if test="ajh != null and ajh!='' ">
117 and b.ajh=#{ajh,jdbcType=VARCHAR}
118 </if>
119 <if test="bdcdyh != null and bdcdyh!='' ">
120 and e.bdcdyh=#{bdcdyh,jdbcType=VARCHAR}
121 </if>
122 <if test="ywh != null and ywh!=''">
123 and f.ywh=#{ywh,jdbcType=VARCHAR}
124 </if>
125 <if test="bdcqzh != null and bdcqzh !='' ">
126 and e.zjhm=#{bdcqzh,jdbcType=VARCHAR}
127 </if>
128 <if test="jyr != null and jyr!='' ">
129 and a.jyr=#{jyr,jdbcType=VARCHAR}
130 </if>
131 <if test="jyzt != null and jyzt != '' ">
132 and a.jyzt=#{jyzt,jdbcType=VARCHAR}
133 </if>
134
135 ) d
136
137
138
139 </select>
140 <select id="queryArchivesInfo" resultMap="ShowArchivesInfoResultMap">
141 select * from dg_archives b
142 where exists (select 1
143 from DG_LEND_CATALOG a
144 where a.BSM_LENDCATALOG = #{bsm_lend,jdbcType=VARCHAR}
145 and b.bsm_archives = a.bsm_archives)
146 </select>
147 <select id="getArchiveLendInfo" resultType="com.pashanhoo.lend.entity.vo.ArchiveLendInfoRequestVO">
148 select a.bsm_archives,a.dazt,a.ajh,c.bdcdyh,b.qllx,b.djlx,c.qlr,c.ywr,c.zjhm,count(1) over (partition by a.bsm_archives) bdcdy_num
149 from dg_archives a, dg_business b, dg_bdcdy c
150 where a.bsm_archives = b.bsm_archives
151 and a.bsm_archives=c.bsm_archives
152 and a.dazt='4'
153 <if test="ajh != null and ajh != '' ">
154 and a.ajh=#{ajh,jdbcType=VARCHAR}
155 </if>
156 <if test="ywh != null and ywh != '' ">
157 and b.ywh=#{ywh,jdbcType=VARCHAR}
158 </if>
159 <if test="bdcdyh != null and bdcdyh != '' ">
160 and c.bdcdyh=#{bdcdyh,jdbcType=VARCHAR}
161 </if>
162 <if test="zjhm != null and zjhm != '' ">
163 and c.zjhm=#{zjhm,jdbcType=VARCHAR}
164 </if>
165 <if test="qlr != null and qlr != '' ">
166 and c.qlr=#{qlr,jdbcType=VARCHAR}
167 </if>
168 <if test="ywr != null and ywr != '' ">
169 and c.ywr=#{ywr,jdbcType=VARCHAR}
170 </if>
171 <if test="cfwh != null and cfwh != '' ">
172 and c.zjhm=#{cfwh,jdbcType=VARCHAR}
173 </if>
174 <if test="qllx != null and qllx != '' ">
175 and c.qllx=#{qllx,jdbcType=VARCHAR}
176 </if>
177 </select>
26 </mapper> 178 </mapper>
......