Skip to content

荆蔚杰 / java.archive

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

修改记录新增

1 parent dfbae5cd
Inline Side-by-side
Showing 8 changed files with 157 additions and 36 deletions
...@@ -28,10 +28,10 @@ public class DgArchivesModifyController { ...@@ -28,10 +28,10 @@ public class DgArchivesModifyController {
28 @Autowired 28 @Autowired
29 private DgArchivesModifyService dgarchivesmodifyService; 29 private DgArchivesModifyService dgarchivesmodifyService;
30 30
31 @PostMapping("insertDgArchivesModify") 31 @GetMapping("insertDgArchivesModify")
32 @ApiOperation("新增档案修改信息") 32 @ApiOperation("档案修改记录新增")
33 public Result insertDgArchivesModify(@RequestBody AddDgArchivesModifyRequest request){ 33 public Result insertDgArchivesModify(@ApiParam("档案标识码") @RequestParam String bsmArchive){
34 if(dgarchivesmodifyService.insertDgArchivesModify(request)){ 34 if(dgarchivesmodifyService.insertDgArchivesModify(bsmArchive)){
35 return Result.ok(); 35 return Result.ok();
36 } 36 }
37 return Result.error("新增失败"); 37 return Result.error("新增失败");
......
...@@ -14,15 +14,15 @@ import org.mapstruct.Mapper; ...@@ -14,15 +14,15 @@ import org.mapstruct.Mapper;
14 */ 14 */
15 @Mapper(componentModel = "spring") 15 @Mapper(componentModel = "spring")
16 public interface DgArchivesModifyConverter{ 16 public interface DgArchivesModifyConverter{
17 DgArchivesModifyDO addRequest2DO(AddDgArchivesModifyRequest request); 17 DgModifyDO addRequest2DO(AddDgArchivesModifyRequest request);
18 18
19 DgArchivesModifyDetailVO do2DetailVO(DgArchivesModifyDO dgarchivesmodifyDO); 19 DgArchivesModifyDetailVO do2DetailVO(DgModifyDO dgarchivesmodifyDO);
20 20
21 DgArchivesModifyDO updateRequest2DO(UpdateDgArchivesModifyRequest request); 21 DgModifyDO updateRequest2DO(UpdateDgArchivesModifyRequest request);
22 22
23 DgArchivesModifyListVO do2ListVO(DgArchivesModifyDO dgarchivesmodifyDO); 23 DgArchivesModifyListVO do2ListVO(DgModifyDO dgarchivesmodifyDO);
24 24
25 List<DgArchivesModifyListVO> doList2ListVOList(List<DgArchivesModifyDO> dgarchivesmodifyDOList); 25 List<DgArchivesModifyListVO> doList2ListVOList(List<DgModifyDO> dgarchivesmodifyDOList);
26 26
27 List<DgArchivesModifyDetailVO> doList2DetailVOList(List<DgArchivesModifyDO> dgarchivesmodifyDOList); 27 List<DgArchivesModifyDetailVO> doList2DetailVOList(List<DgModifyDO> dgarchivesmodifyDOList);
28 } 28 }
......
...@@ -22,8 +22,8 @@ import org.springframework.format.annotation.DateTimeFormat; ...@@ -22,8 +22,8 @@ import org.springframework.format.annotation.DateTimeFormat;
22 */ 22 */
23 @Data 23 @Data
24 @EqualsAndHashCode(callSuper = false) 24 @EqualsAndHashCode(callSuper = false)
25 @TableName("DG_ARCHIVES_MODIFY") 25 @TableName("DG_MODIFY")
26 public class DgArchivesModifyDO implements Serializable { 26 public class DgModifyDO implements Serializable {
27 27
28 private static final long serialVersionUID = 1L; 28 private static final long serialVersionUID = 1L;
29 29
......
1 package com.pashanhoo.modify.entity.vo;
2
3 import com.pashanhoo.archive.entity.DgArchivesDO;
4 import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
5 import com.pashanhoo.business.entity.DgBusinessDO;
6 import com.pashanhoo.catalog.entity.DgArchivesCatalogDO;
7 import com.pashanhoo.file.entity.DgFileDO;
8 import lombok.Data;
9 import lombok.EqualsAndHashCode;
10
11 import java.io.Serializable;
12 import java.util.List;
13
14 /**
15 * 修改记录实体
16 */
17 @Data
18 @EqualsAndHashCode(callSuper = false)
19 public class ModifyRecord implements Serializable {
20
21 private static final long serialVersionUID = 1L;
22
23 /**
24 * 案卷基本信息
25 */
26 DgArchivesDO archivesDO;
27
28 /**
29 * 业务信息
30 */
31 DgBusinessDO dgBusinessDO;
32
33 /**
34 * 不动产单元信息
35 */
36 List<DgBdcdyDO> dgBdcdyDOList;
37
38 /**
39 * 卷内目录
40 */
41 List<DgArchivesCatalogDO> catalogDOList;
42
43 /**
44 * 附件
45 */
46 List<DgFileDO> dgFileDOList;
47 }
...@@ -3,13 +3,11 @@ package com.pashanhoo.modify.mapper; ...@@ -3,13 +3,11 @@ package com.pashanhoo.modify.mapper;
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.baomidou.mybatisplus.core.metadata.IPage;
6 import com.pashanhoo.modify.entity.DgArchivesModifyDO; 6 import com.pashanhoo.modify.entity.DgModifyDO;
7 import com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO; 7 import com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO;
8 import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest; 8 import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
9 import org.apache.ibatis.annotations.Param; 9 import org.apache.ibatis.annotations.Param;
10 10
11 import java.util.List;
12
13 /** 11 /**
14 * <p> 12 * <p>
15 * 档案修改信息 Mapper 接口 13 * 档案修改信息 Mapper 接口
...@@ -18,7 +16,7 @@ import java.util.List; ...@@ -18,7 +16,7 @@ import java.util.List;
18 * @author 16 * @author
19 * @since 2021-11-05 17 * @since 2021-11-05
20 */ 18 */
21 public interface DgArchivesModifyMapper extends BaseMapper<DgArchivesModifyDO> { 19 public interface DgArchivesModifyMapper extends BaseMapper<DgModifyDO> {
22 20
23 /** 21 /**
24 * 修改列表查询 22 * 修改列表查询
......
...@@ -2,10 +2,8 @@ package com.pashanhoo.modify.service; ...@@ -2,10 +2,8 @@ package com.pashanhoo.modify.service;
2 2
3 3
4 import com.baomidou.mybatisplus.core.metadata.IPage; 4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 import com.baomidou.mybatisplus.extension.service.IService; 5 import com.baomidou.mybatisplus.extension.service.IService;
7 import com.pashanhoo.common.Result; 6 import com.pashanhoo.modify.entity.DgModifyDO;
8 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
9 import com.pashanhoo.modify.entity.vo.*; 7 import com.pashanhoo.modify.entity.vo.*;
10 8
11 import java.util.List; 9 import java.util.List;
...@@ -18,14 +16,16 @@ import java.util.List; ...@@ -18,14 +16,16 @@ import java.util.List;
18 * @author 16 * @author
19 * @since 2021-11-05 17 * @since 2021-11-05
20 */ 18 */
21 public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> { 19 public interface DgArchivesModifyService extends IService<DgModifyDO> {
22 /** 20 /**
23 * 新增记录 21 * 新增记录
22 * 1.档案修改记录并把原有的档案信息存入clob字段
23 * 2.修改案卷基本信息状态为正在修改
24 * 24 *
25 * @param request 25 * @param bsmArchive
26 * @return 26 * @return
27 */ 27 */
28 boolean insertDgArchivesModify(AddDgArchivesModifyRequest request); 28 boolean insertDgArchivesModify(String bsmArchive);
29 29
30 /** 30 /**
31 * 根据主键查询记录详情 31 * 根据主键查询记录详情
......
1 package com.pashanhoo.modify.service.impl; 1 package com.pashanhoo.modify.service.impl;
2 2
3 import cn.hutool.core.date.DateTime; 3 import cn.hutool.core.date.DateTime;
4 import cn.hutool.core.lang.UUID;
5 import cn.hutool.json.JSON;
6 import cn.hutool.json.JSONConfig;
7 import cn.hutool.json.JSONUtil;
4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 8 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; 9 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
6 import com.baomidou.mybatisplus.core.metadata.IPage; 10 import com.baomidou.mybatisplus.core.metadata.IPage;
11 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
7 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 12 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
8 import com.pashanhoo.archive.entity.ArchiveStatus; 13 import com.pashanhoo.archive.entity.ArchiveStatus;
9 import com.pashanhoo.archive.entity.DgArchivesDO; 14 import com.pashanhoo.archive.entity.DgArchivesDO;
10 import com.pashanhoo.archive.service.DgArchivesService; 15 import com.pashanhoo.archive.service.DgArchivesService;
16 import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
17 import com.pashanhoo.bdcdy.service.DgBdcdyService;
18 import com.pashanhoo.business.entity.DgBusinessDO;
19 import com.pashanhoo.business.service.DgBusinessService;
20 import com.pashanhoo.catalog.entity.DgArchivesCatalogDO;
21 import com.pashanhoo.catalog.service.DgArchivesCatalogService;
22 import com.pashanhoo.file.entity.DgFileDO;
23 import com.pashanhoo.file.service.DgFileService;
11 import com.pashanhoo.modify.entity.DgArchivesModifyConverter; 24 import com.pashanhoo.modify.entity.DgArchivesModifyConverter;
12 import com.pashanhoo.modify.entity.DgArchivesModifyDO; 25 import com.pashanhoo.modify.entity.DgModifyDO;
13 import com.pashanhoo.modify.entity.vo.*; 26 import com.pashanhoo.modify.entity.vo.*;
14 import com.pashanhoo.modify.mapper.DgArchivesModifyMapper; 27 import com.pashanhoo.modify.mapper.DgArchivesModifyMapper;
15 import com.pashanhoo.modify.service.DgArchivesModifyService; 28 import com.pashanhoo.modify.service.DgArchivesModifyService;
...@@ -20,6 +33,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -20,6 +33,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
20 import org.springframework.transaction.annotation.Transactional; 33 import org.springframework.transaction.annotation.Transactional;
21 34
22 import java.util.List; 35 import java.util.List;
36 import java.util.stream.Collectors;
23 37
24 /** 38 /**
25 * <p> 39 * <p>
...@@ -30,7 +44,7 @@ import java.util.List; ...@@ -30,7 +44,7 @@ import java.util.List;
30 * @since 2021-11-05 44 * @since 2021-11-05
31 */ 45 */
32 @Service 46 @Service
33 public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMapper, DgArchivesModifyDO> implements DgArchivesModifyService { 47 public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMapper, DgModifyDO> implements DgArchivesModifyService {
34 48
35 @Autowired 49 @Autowired
36 private DgArchivesModifyConverter dgarchivesmodifyConverter; 50 private DgArchivesModifyConverter dgarchivesmodifyConverter;
...@@ -41,16 +55,78 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap ...@@ -41,16 +55,78 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
41 @Autowired 55 @Autowired
42 DgArchivesService archivesService; 56 DgArchivesService archivesService;
43 57
58 @Autowired
59 DgBusinessService businessService;
60
61 @Autowired
62 DgBdcdyService bdcdyService;
63
64 @Autowired
65 DgArchivesCatalogService catalogService;
66
67 @Autowired
68 DgFileService fileService;
69
44 /** 70 /**
45 * 新增记录 71 * 新增记录
72 * 1.档案修改记录并把原有的档案信息存入clob字段
73 * 2.修改案卷基本信息状态为正在修改
46 * 74 *
47 * @param request 75 * @param bsmArchive
48 * @return 76 * @return
49 */ 77 */
50 @Override 78 @Override
51 public boolean insertDgArchivesModify(AddDgArchivesModifyRequest request) { 79 @Transactional(rollbackFor = Exception.class)
52 DgArchivesModifyDO dgarchivesmodifyDO = dgarchivesmodifyConverter.addRequest2DO(request); 80 public boolean insertDgArchivesModify(String bsmArchive) {
53 return this.save(dgarchivesmodifyDO); 81 //获取案卷基本信息
82 DgArchivesDO archive = archivesService.getById(bsmArchive);
83 //获取业务信息
84 QueryWrapper<DgBusinessDO> businessWrapper = new QueryWrapper<>();
85 businessWrapper.lambda().eq(DgBusinessDO::getBsmArchives, bsmArchive);
86 DgBusinessDO business = businessService.getOne(businessWrapper);
87 //获取不动产信息
88 QueryWrapper<DgBdcdyDO> bdcdyWrapper = new QueryWrapper<>();
89 bdcdyWrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchive);
90 List<DgBdcdyDO> bdcdyList = bdcdyService.list(bdcdyWrapper);
91 //获取卷内目录
92 QueryWrapper<DgArchivesCatalogDO> catalogWrapper = new QueryWrapper<>();
93 catalogWrapper.lambda().eq(DgArchivesCatalogDO::getBsmArchives, bsmArchive);
94 List<DgArchivesCatalogDO> catalogList = catalogService.list(catalogWrapper);
95 //获取案卷附件
96 List<String> catalogIdList = catalogList.stream().map(DgArchivesCatalogDO::getBsmCatalog).collect(Collectors.toList());
97 QueryWrapper<DgFileDO> fileWrapper = new QueryWrapper<>();
98 fileWrapper.lambda().in(DgFileDO::getBsmCatalog, catalogIdList);
99 List<DgFileDO> fileList = fileService.list(fileWrapper);
100
101 ModifyRecord modifyRecord = new ModifyRecord();
102 modifyRecord.setArchivesDO(archive);
103 modifyRecord.setDgBusinessDO(business);
104 modifyRecord.setDgBdcdyDOList(bdcdyList);
105 modifyRecord.setCatalogDOList(catalogList);
106 modifyRecord.setDgFileDOList(fileList);
107
108 JSONConfig jsonConfig = JSONConfig.create().setIgnoreNullValue(false).setOrder(true).setDateFormat("yyyy-MM-dd HH:mm:ss");
109 JSON modifyRecordJson = JSONUtil.parse(modifyRecord, jsonConfig);
110 String modifyRecordStr = JSONUtil.toJsonStr(modifyRecordJson);
111
112 DgModifyDO modifyDO = new DgModifyDO();
113 modifyDO.setBsmArchives(bsmArchive);
114 modifyDO.setXgbh(IdWorker.get32UUID());
115 modifyDO.setYdaxx(modifyRecordStr);
116 // TODO: 2021/11/23/0023 暂时填null
117 modifyDO.setXgnr(null);
118 modifyDO.setCreateTime(DateTime.now());
119 // TODO: 2021/11/23/0023 暂时填null
120 modifyDO.setCreater(null);
121 modifyDO.setState("1");
122 modifyDO.setGdsj(null);
123
124 //修改档案状态
125 UpdateWrapper<DgArchivesDO> archiveUpdateWrapper = new UpdateWrapper<>();
126 archiveUpdateWrapper.lambda().set(DgArchivesDO::getDazt, ArchiveStatus.MODIFYING.getCode()).eq(DgArchivesDO::getBsmArchives,bsmArchive);
127 archivesService.update(archiveUpdateWrapper);
128
129 return this.save(modifyDO);
54 } 130 }
55 131
56 /** 132 /**
...@@ -61,7 +137,7 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap ...@@ -61,7 +137,7 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
61 */ 137 */
62 @Override 138 @Override
63 public DgArchivesModifyDetailVO getDgArchivesModifyDetailById(String id) { 139 public DgArchivesModifyDetailVO getDgArchivesModifyDetailById(String id) {
64 DgArchivesModifyDO dgarchivesmodifyDO = this.getById(id); 140 DgModifyDO dgarchivesmodifyDO = this.getById(id);
65 return dgarchivesmodifyConverter.do2DetailVO(dgarchivesmodifyDO); 141 return dgarchivesmodifyConverter.do2DetailVO(dgarchivesmodifyDO);
66 } 142 }
67 143
...@@ -74,9 +150,9 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap ...@@ -74,9 +150,9 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
74 @Override 150 @Override
75 @Transactional(rollbackFor = Exception.class) 151 @Transactional(rollbackFor = Exception.class)
76 public boolean updateDgArchivesModify(UpdateDgArchivesModifyRequest request) { 152 public boolean updateDgArchivesModify(UpdateDgArchivesModifyRequest request) {
77 DgArchivesModifyDO dgarchivesmodifyDO = dgarchivesmodifyConverter.updateRequest2DO(request); 153 DgModifyDO dgarchivesmodifyDO = dgarchivesmodifyConverter.updateRequest2DO(request);
78 UpdateWrapper<DgArchivesModifyDO> modifyWrapper = new UpdateWrapper<>(); 154 UpdateWrapper<DgModifyDO> modifyWrapper = new UpdateWrapper<>();
79 modifyWrapper.lambda().set(DgArchivesModifyDO::getState, "2").set(DgArchivesModifyDO::getGdsj, DateTime.now()); 155 modifyWrapper.lambda().set(DgModifyDO::getState, "2").set(DgModifyDO::getGdsj, DateTime.now());
80 this.update(dgarchivesmodifyDO, modifyWrapper); 156 this.update(dgarchivesmodifyDO, modifyWrapper);
81 //修改档案记录状态 157 //修改档案记录状态
82 UpdateWrapper<DgArchivesDO> archivesWrapper = new UpdateWrapper<>(); 158 UpdateWrapper<DgArchivesDO> archivesWrapper = new UpdateWrapper<>();
...@@ -105,9 +181,9 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap ...@@ -105,9 +181,9 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
105 */ 181 */
106 @Override 182 @Override
107 public List<DgArchivesModifyDetailVO> getArchiveWithModify(String bsmArchive) { 183 public List<DgArchivesModifyDetailVO> getArchiveWithModify(String bsmArchive) {
108 QueryWrapper<DgArchivesModifyDO> modifyWrapper = new QueryWrapper<>(); 184 QueryWrapper<DgModifyDO> modifyWrapper = new QueryWrapper<>();
109 modifyWrapper.lambda().eq(DgArchivesModifyDO::getBsmArchives, bsmArchive); 185 modifyWrapper.lambda().eq(DgModifyDO::getBsmArchives, bsmArchive);
110 List<DgArchivesModifyDO> modifyDOS = this.list(modifyWrapper); 186 List<DgModifyDO> modifyDOS = this.list(modifyWrapper);
111 return dgarchivesmodifyConverter.doList2DetailVOList(modifyDOS); 187 return dgarchivesmodifyConverter.doList2DetailVOList(modifyDOS);
112 } 188 }
113 } 189 }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
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 <!-- 通用查询映射结果 --> 4 <!-- 通用查询映射结果 -->
5 <resultMap id="BaseResultMap" type="com.pashanhoo.modify.entity.DgArchivesModifyDO"> 5 <resultMap id="BaseResultMap" type="com.pashanhoo.modify.entity.DgModifyDO">
6 <id column="BSM_MODIFY" property="bsmModify"/> 6 <id column="BSM_MODIFY" property="bsmModify"/>
7 <result column="BSM_ARCHIVES" property="bsmArchives"/> 7 <result column="BSM_ARCHIVES" property="bsmArchives"/>
8 <result column="XGBH" property="xgbh"/> 8 <result column="XGBH" property="xgbh"/>
......