修改记录新增

@@ -28,10 +28,10 @@ public class DgArchivesModifyController {
     @Autowired
     private DgArchivesModifyService dgarchivesmodifyService;
 
-    @PostMapping("insertDgArchivesModify")
-    @ApiOperation("新增档案修改信息")
-    public Result insertDgArchivesModify(@RequestBody AddDgArchivesModifyRequest request){
-        if(dgarchivesmodifyService.insertDgArchivesModify(request)){
+    @GetMapping("insertDgArchivesModify")
+    @ApiOperation("档案修改记录新增")
+    public Result insertDgArchivesModify(@ApiParam("档案标识码") @RequestParam String bsmArchive){
+        if(dgarchivesmodifyService.insertDgArchivesModify(bsmArchive)){
             return Result.ok();
         }
         return Result.error("新增失败");

@@ -14,15 +14,15 @@ import org.mapstruct.Mapper;
  */
 @Mapper(componentModel = "spring")
 public interface DgArchivesModifyConverter{
-    DgArchivesModifyDO addRequest2DO(AddDgArchivesModifyRequest request);
+    DgModifyDO addRequest2DO(AddDgArchivesModifyRequest request);
 
-    DgArchivesModifyDetailVO do2DetailVO(DgArchivesModifyDO dgarchivesmodifyDO);
+    DgArchivesModifyDetailVO do2DetailVO(DgModifyDO dgarchivesmodifyDO);
 
-    DgArchivesModifyDO updateRequest2DO(UpdateDgArchivesModifyRequest request);
+    DgModifyDO updateRequest2DO(UpdateDgArchivesModifyRequest request);
 
-    DgArchivesModifyListVO do2ListVO(DgArchivesModifyDO dgarchivesmodifyDO);
+    DgArchivesModifyListVO do2ListVO(DgModifyDO dgarchivesmodifyDO);
 
-    List<DgArchivesModifyListVO> doList2ListVOList(List<DgArchivesModifyDO> dgarchivesmodifyDOList);
+    List<DgArchivesModifyListVO> doList2ListVOList(List<DgModifyDO> dgarchivesmodifyDOList);
 
-    List<DgArchivesModifyDetailVO> doList2DetailVOList(List<DgArchivesModifyDO> dgarchivesmodifyDOList);
+    List<DgArchivesModifyDetailVO> doList2DetailVOList(List<DgModifyDO> dgarchivesmodifyDOList);
 }

@@ -22,8 +22,8 @@ import org.springframework.format.annotation.DateTimeFormat;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("DG_ARCHIVES_MODIFY")
-public class DgArchivesModifyDO implements Serializable {
+@TableName("DG_MODIFY")
+public class DgModifyDO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

+package com.pashanhoo.modify.entity.vo;
+
+import com.pashanhoo.archive.entity.DgArchivesDO;
+import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
+import com.pashanhoo.business.entity.DgBusinessDO;
+import com.pashanhoo.catalog.entity.DgArchivesCatalogDO;
+import com.pashanhoo.file.entity.DgFileDO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 修改记录实体
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ModifyRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 案卷基本信息
+     */
+    DgArchivesDO archivesDO;
+
+    /**
+     * 业务信息
+     */
+    DgBusinessDO dgBusinessDO;
+
+    /**
+     * 不动产单元信息
+     */
+    List<DgBdcdyDO> dgBdcdyDOList;
+
+    /**
+     * 卷内目录
+     */
+    List<DgArchivesCatalogDO> catalogDOList;
+
+    /**
+     * 附件
+     */
+    List<DgFileDO> dgFileDOList;
+}

@@ -3,13 +3,11 @@ package com.pashanhoo.modify.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.pashanhoo.modify.entity.DgArchivesModifyDO;
+import com.pashanhoo.modify.entity.DgModifyDO;
 import com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO;
 import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * <p>
  * 档案修改信息 Mapper 接口
@@ -18,7 +16,7 @@ import java.util.List;
  * @author
  * @since 2021-11-05
  */
-public interface DgArchivesModifyMapper extends BaseMapper<DgArchivesModifyDO> {
+public interface DgArchivesModifyMapper extends BaseMapper<DgModifyDO> {
 
     /**
      * 修改列表查询

@@ -2,10 +2,8 @@ package com.pashanhoo.modify.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pashanhoo.common.Result;
-import com.pashanhoo.modify.entity.DgArchivesModifyDO;
+import com.pashanhoo.modify.entity.DgModifyDO;
 import com.pashanhoo.modify.entity.vo.*;
 
 import java.util.List;
@@ -18,14 +16,16 @@ import java.util.List;
  * @author
  * @since 2021-11-05
  */
-public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> {
+public interface DgArchivesModifyService extends IService<DgModifyDO> {
     /**
      * 新增记录
+     * 1.档案修改记录并把原有的档案信息存入clob字段
+     * 2.修改案卷基本信息状态为正在修改
      *
-     * @param request
+     * @param bsmArchive
      * @return
      */
-    boolean insertDgArchivesModify(AddDgArchivesModifyRequest request);
+    boolean insertDgArchivesModify(String bsmArchive);
 
     /**
      * 根据主键查询记录详情

 package com.pashanhoo.modify.service.impl;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.lang.UUID;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONConfig;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pashanhoo.archive.entity.ArchiveStatus;
 import com.pashanhoo.archive.entity.DgArchivesDO;
 import com.pashanhoo.archive.service.DgArchivesService;
+import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
+import com.pashanhoo.bdcdy.service.DgBdcdyService;
+import com.pashanhoo.business.entity.DgBusinessDO;
+import com.pashanhoo.business.service.DgBusinessService;
+import com.pashanhoo.catalog.entity.DgArchivesCatalogDO;
+import com.pashanhoo.catalog.service.DgArchivesCatalogService;
+import com.pashanhoo.file.entity.DgFileDO;
+import com.pashanhoo.file.service.DgFileService;
 import com.pashanhoo.modify.entity.DgArchivesModifyConverter;
-import com.pashanhoo.modify.entity.DgArchivesModifyDO;
+import com.pashanhoo.modify.entity.DgModifyDO;
 import com.pashanhoo.modify.entity.vo.*;
 import com.pashanhoo.modify.mapper.DgArchivesModifyMapper;
 import com.pashanhoo.modify.service.DgArchivesModifyService;
@@ -20,6 +33,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,7 +44,7 @@ import java.util.List;
  * @since 2021-11-05
  */
 @Service
-public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMapper, DgArchivesModifyDO> implements DgArchivesModifyService {
+public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMapper, DgModifyDO> implements DgArchivesModifyService {
 
     @Autowired
     private DgArchivesModifyConverter dgarchivesmodifyConverter;
@@ -41,16 +55,78 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
     @Autowired
     DgArchivesService archivesService;
 
+    @Autowired
+    DgBusinessService businessService;
+
+    @Autowired
+    DgBdcdyService bdcdyService;
+
+    @Autowired
+    DgArchivesCatalogService catalogService;
+
+    @Autowired
+    DgFileService fileService;
+
     /**
      * 新增记录
+     * 1.档案修改记录并把原有的档案信息存入clob字段
+     * 2.修改案卷基本信息状态为正在修改
      *
-     * @param request
+     * @param bsmArchive
      * @return
      */
     @Override
-    public boolean insertDgArchivesModify(AddDgArchivesModifyRequest request) {
-        DgArchivesModifyDO dgarchivesmodifyDO = dgarchivesmodifyConverter.addRequest2DO(request);
-        return this.save(dgarchivesmodifyDO);
+    @Transactional(rollbackFor = Exception.class)
+    public boolean insertDgArchivesModify(String bsmArchive) {
+        //获取案卷基本信息
+        DgArchivesDO archive = archivesService.getById(bsmArchive);
+        //获取业务信息
+        QueryWrapper<DgBusinessDO> businessWrapper = new QueryWrapper<>();
+        businessWrapper.lambda().eq(DgBusinessDO::getBsmArchives, bsmArchive);
+        DgBusinessDO business = businessService.getOne(businessWrapper);
+        //获取不动产信息
+        QueryWrapper<DgBdcdyDO> bdcdyWrapper = new QueryWrapper<>();
+        bdcdyWrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchive);
+        List<DgBdcdyDO> bdcdyList = bdcdyService.list(bdcdyWrapper);
+        //获取卷内目录
+        QueryWrapper<DgArchivesCatalogDO> catalogWrapper = new QueryWrapper<>();
+        catalogWrapper.lambda().eq(DgArchivesCatalogDO::getBsmArchives, bsmArchive);
+        List<DgArchivesCatalogDO> catalogList = catalogService.list(catalogWrapper);
+        //获取案卷附件
+        List<String> catalogIdList = catalogList.stream().map(DgArchivesCatalogDO::getBsmCatalog).collect(Collectors.toList());
+        QueryWrapper<DgFileDO> fileWrapper = new QueryWrapper<>();
+        fileWrapper.lambda().in(DgFileDO::getBsmCatalog, catalogIdList);
+        List<DgFileDO> fileList = fileService.list(fileWrapper);
+
+        ModifyRecord modifyRecord = new ModifyRecord();
+        modifyRecord.setArchivesDO(archive);
+        modifyRecord.setDgBusinessDO(business);
+        modifyRecord.setDgBdcdyDOList(bdcdyList);
+        modifyRecord.setCatalogDOList(catalogList);
+        modifyRecord.setDgFileDOList(fileList);
+
+        JSONConfig jsonConfig = JSONConfig.create().setIgnoreNullValue(false).setOrder(true).setDateFormat("yyyy-MM-dd HH:mm:ss");
+        JSON modifyRecordJson = JSONUtil.parse(modifyRecord, jsonConfig);
+        String modifyRecordStr = JSONUtil.toJsonStr(modifyRecordJson);
+
+        DgModifyDO modifyDO = new DgModifyDO();
+        modifyDO.setBsmArchives(bsmArchive);
+        modifyDO.setXgbh(IdWorker.get32UUID());
+        modifyDO.setYdaxx(modifyRecordStr);
+        // TODO: 2021/11/23/0023 暂时填null
+        modifyDO.setXgnr(null);
+        modifyDO.setCreateTime(DateTime.now());
+        // TODO: 2021/11/23/0023 暂时填null
+        modifyDO.setCreater(null);
+        modifyDO.setState("1");
+        modifyDO.setGdsj(null);
+
+        //修改档案状态
+        UpdateWrapper<DgArchivesDO> archiveUpdateWrapper = new UpdateWrapper<>();
+        archiveUpdateWrapper.lambda().set(DgArchivesDO::getDazt, ArchiveStatus.MODIFYING.getCode()).eq(DgArchivesDO::getBsmArchives,bsmArchive);
+        archivesService.update(archiveUpdateWrapper);
+
+        return this.save(modifyDO);
     }
 
     /**
@@ -61,7 +137,7 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
      */
     @Override
     public DgArchivesModifyDetailVO getDgArchivesModifyDetailById(String id) {
-        DgArchivesModifyDO dgarchivesmodifyDO = this.getById(id);
+        DgModifyDO dgarchivesmodifyDO = this.getById(id);
         return dgarchivesmodifyConverter.do2DetailVO(dgarchivesmodifyDO);
     }
 
@@ -74,9 +150,9 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updateDgArchivesModify(UpdateDgArchivesModifyRequest request) {
-        DgArchivesModifyDO dgarchivesmodifyDO = dgarchivesmodifyConverter.updateRequest2DO(request);
-        UpdateWrapper<DgArchivesModifyDO> modifyWrapper = new UpdateWrapper<>();
-        modifyWrapper.lambda().set(DgArchivesModifyDO::getState, "2").set(DgArchivesModifyDO::getGdsj, DateTime.now());
+        DgModifyDO dgarchivesmodifyDO = dgarchivesmodifyConverter.updateRequest2DO(request);
+        UpdateWrapper<DgModifyDO> modifyWrapper = new UpdateWrapper<>();
+        modifyWrapper.lambda().set(DgModifyDO::getState, "2").set(DgModifyDO::getGdsj, DateTime.now());
         this.update(dgarchivesmodifyDO, modifyWrapper);
         //修改档案记录状态
         UpdateWrapper<DgArchivesDO> archivesWrapper = new UpdateWrapper<>();
@@ -105,9 +181,9 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
      */
     @Override
     public List<DgArchivesModifyDetailVO> getArchiveWithModify(String bsmArchive) {
-        QueryWrapper<DgArchivesModifyDO> modifyWrapper = new QueryWrapper<>();
-        modifyWrapper.lambda().eq(DgArchivesModifyDO::getBsmArchives, bsmArchive);
-        List<DgArchivesModifyDO> modifyDOS = this.list(modifyWrapper);
+        QueryWrapper<DgModifyDO> modifyWrapper = new QueryWrapper<>();
+        modifyWrapper.lambda().eq(DgModifyDO::getBsmArchives, bsmArchive);
+        List<DgModifyDO> modifyDOS = this.list(modifyWrapper);
         return dgarchivesmodifyConverter.doList2DetailVOList(modifyDOS);
     }
 }

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pashanhoo.modify.mapper.DgArchivesModifyMapper">
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.pashanhoo.modify.entity.DgArchivesModifyDO">
+    <resultMap id="BaseResultMap" type="com.pashanhoo.modify.entity.DgModifyDO">
         <id column="BSM_MODIFY" property="bsmModify"/>
         <result column="BSM_ARCHIVES" property="bsmArchives"/>
         <result column="XGBH" property="xgbh"/>