字段调整

@@ -5,45 +5,45 @@ public enum ArchiveStatus {
     /**
     /**
      * 正在接收
      * 正在接收
      */
      */
-    RECEIVING("1","正在接收"),
+    RECEIVING(1,"正在接收"),
     /**
     /**
      * 正在补录
      * 正在补录
      */
      */
-    REPLENISHING("2","正在补录"),
+    REPLENISHING(2,"正在补录"),
     /**
     /**
      * 正在修改
      * 正在修改
      */
      */
-    MODIFYING("3","正在修改"),
+    MODIFYING(3,"正在修改"),
     /**
     /**
      * 在库
      * 在库
      */
      */
-    STORED("4","在库"),
+    STORED(4,"在库"),
     /**
     /**
      * 正在销毁
      * 正在销毁
      */
      */
-    DESTROYING("5","正在销毁"),
+    DESTROYING(5,"正在销毁"),
     /**
     /**
      * 已销毁
      * 已销毁
      */
      */
-    DESTROYED("6","已销毁"),
+    DESTROYED(6,"已销毁"),
     /**
     /**
      * 正在借阅
      * 正在借阅
      */
      */
-    LENDING("7","正在借阅"),
+    LENDING(7,"正在借阅"),
     /**
     /**
      * 已借阅
      * 已借阅
      */
      */
-    LENDED("8","已借阅");
+    LENDED(8,"已借阅");
 
 
-    private String code;
+    private Integer code;
     private String description;
     private String description;
 
 
-    ArchiveStatus(String code,String description) {
+    ArchiveStatus(Integer code,String description) {
         this.code = code;
         this.code = code;
         this.description = description;
         this.description = description;
     }
     }
 
 
-    public String getCode() {
+    public Integer getCode() {
         return this.code;
         return this.code;
     }
     }
 }
 }

 package com.pashanhoo.file.controller;
 package com.pashanhoo.file.controller;
 
 
 import com.pashanhoo.common.Result;
 import com.pashanhoo.common.Result;
+import com.pashanhoo.common.util.fileupload.MinioConfig;
+import com.pashanhoo.common.util.fileupload.MinioUtil;
 import com.pashanhoo.file.entity.vo.AddDgFileRequest;
 import com.pashanhoo.file.entity.vo.AddDgFileRequest;
 import com.pashanhoo.file.entity.vo.DgCatalogWithFileVO;
 import com.pashanhoo.file.entity.vo.DgCatalogWithFileVO;
 import com.pashanhoo.file.entity.vo.DgFileListVO;
 import com.pashanhoo.file.entity.vo.DgFileListVO;
@@ -12,7 +14,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
 
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.List;
 import java.util.List;
 
 
@@ -76,4 +80,14 @@ public class DgFileController {
         }
         }
         return Result.error("修改失败");
         return Result.error("修改失败");
     }
     }
+
+    @RequestMapping(value = "/upload", method = RequestMethod.POST)
+    @ApiOperation("上传材料附件")
+    public Result upload(@RequestPart("file") MultipartFile file, AddDgFileRequest fileRequest) {
+        try {
+            return Result.ok(dgfileService.upload(file,fileRequest));
+        } catch (Exception e) {
+            return Result.exception(e.getMessage());
+        }
+    }
 }
 }

@@ -2,10 +2,13 @@ package com.pashanhoo.file.entity.vo;
 
 
 import java.util.Date;
 import java.util.Date;
 import java.io.Serializable;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -44,6 +47,8 @@ public class UpdateDgFileRequest implements Serializable {
      * 上传日期
      * 上传日期
      */
      */
     @ApiModelProperty(name = "scrq", value = "上传日期")
     @ApiModelProperty(name = "scrq", value = "上传日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date scrq;
     private Date scrq;
 
 
     /**
     /**

@@ -3,6 +3,7 @@ package com.pashanhoo.file.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pashanhoo.file.entity.DgFileDO;
 import com.pashanhoo.file.entity.DgFileDO;
 import com.pashanhoo.file.entity.vo.*;
 import com.pashanhoo.file.entity.vo.*;
+import org.springframework.web.multipart.MultipartFile;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.util.List;
 import java.util.List;
@@ -57,4 +58,12 @@ public interface DgFileService extends IService<DgFileDO> {
      * @return
      * @return
      */
      */
     boolean delete(List<String> bsmFileList) throws Exception;
     boolean delete(List<String> bsmFileList) throws Exception;
+
+    /**
+     * 上传材料附件.材料附件信息入库
+     * @param file
+     * @param fileRequest
+     * @return
+     */
+    boolean upload(MultipartFile file, AddDgFileRequest fileRequest) throws IOException;
 }
 }

@@ -11,6 +11,7 @@ import com.pashanhoo.file.mapper.DgFileMapper;
 import com.pashanhoo.file.service.DgFileService;
 import com.pashanhoo.file.service.DgFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 
 
 
 import java.io.IOException;
 import java.io.IOException;
@@ -117,5 +118,21 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
         return flag;
         return flag;
     }
     }
 
 
+    /**
+     * 上传材料附件.材料附件信息入库
+     *
+     * @param file
+     * @param fileRequest
+     * @return
+     */
+    @Override
+    public boolean upload(MultipartFile file, AddDgFileRequest fileRequest) throws IOException {
+        //文件上传
+        FileAttribute fileAttribute = minioUtil.upload(file);
+
+        //文件
+        return true;
+    }
+
 
 
 }
 }

@@ -39,8 +39,8 @@ public class DgArchivesModifyController {
 
 
     @DeleteMapping("deleteDgArchivesModifyByIds")
     @DeleteMapping("deleteDgArchivesModifyByIds")
     @ApiOperation(value = "批量删除档案修改信息")
     @ApiOperation(value = "批量删除档案修改信息")
-    public Result deleteDgArchivesModifyByIds(@ApiParam("档案修改信息ID列表") @RequestParam(value = "idList") List<String> idList) {
-        if(dgarchivesmodifyService.removeByIds(idList)) {
+    public Result deleteDgArchivesModifyByIds(@ApiParam("档案修改标识码") @RequestParam(value = "bsmModify") String bsmModify) {
+        if(dgarchivesmodifyService.delete(bsmModify)) {
             return Result.ok("删除成功");
             return Result.ok("删除成功");
         }
         }
         return Result.error("删除失败");
         return Result.error("删除失败");

@@ -58,4 +58,11 @@ public interface DgArchivesModifyService extends IService<DgModifyDO> {
      * @return
      * @return
      */
      */
     List<DgArchivesModifyDetailVO> getArchiveWithModify(String bsmArchive);
     List<DgArchivesModifyDetailVO> getArchiveWithModify(String bsmArchive);
+
+    /**
+     * 删除修改记录，并回滚档案信息和修改档案状态在库
+     * @param bsmModify
+     * @return
+     */
+    boolean delete(String bsmModify);
 }
 }

@@ -186,4 +186,58 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
         List<DgModifyDO> modifyDOS = this.list(modifyWrapper);
         List<DgModifyDO> modifyDOS = this.list(modifyWrapper);
         return dgarchivesmodifyConverter.doList2DetailVOList(modifyDOS);
         return dgarchivesmodifyConverter.doList2DetailVOList(modifyDOS);
     }
     }
+
+    /**
+     * 删除修改记录，并回滚档案信息和修改档案状态在库
+     * @param bsmModify
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean delete(String bsmModify) {
+        //获取修改前信息
+        DgModifyDO modifyDO = this.getById(bsmModify);
+        String bsmArchives = modifyDO.getBsmArchives();
+        //获取原档案信息json字段
+        String ydaxxJson = modifyDO.getYdaxx();
+        ModifyRecord modifyRecord = JSONUtil.toBean(ydaxxJson, ModifyRecord.class);
+
+        //删除修改记录表数据
+        this.removeById(bsmModify);
+
+        //删除案卷附件
+        QueryWrapper<DgArchivesCatalogDO> catalogWrapper = new QueryWrapper<>();
+        catalogWrapper.lambda().eq(DgArchivesCatalogDO::getBsmArchives, bsmArchives);
+        List<DgArchivesCatalogDO> catalogDOList = catalogService.list(catalogWrapper);
+        List<String> bsmCatalogList = catalogDOList.stream().map(DgArchivesCatalogDO::getBsmCatalog).collect(Collectors.toList());
+        QueryWrapper<DgFileDO> fileWrapper = new QueryWrapper<>();
+        fileWrapper.lambda().in(DgFileDO::getBsmCatalog, bsmCatalogList);
+        fileService.remove(fileWrapper);
+        //插入原案卷附件
+        fileService.saveBatch(modifyRecord.getDgFileDOList());
+
+        //删除案卷目录
+        catalogService.removeByIds(bsmCatalogList);
+        //插入原案卷目录
+        catalogService.saveBatch(modifyRecord.getCatalogDOList());
+
+        //删除不动产信息
+        QueryWrapper<DgBdcdyDO> bdcdyWrapper = new QueryWrapper<>();
+        bdcdyWrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchives);
+        bdcdyService.remove(bdcdyWrapper);
+        //插入原不动产信息
+        bdcdyService.saveBatch(modifyRecord.getDgBdcdyDOList());
+
+        //删除业务信息
+        QueryWrapper<DgBusinessDO> businessWrapper = new QueryWrapper<>();
+        businessWrapper.lambda().eq(DgBusinessDO::getBsmArchives, bsmArchives);
+        businessService.remove(businessWrapper);
+        //插入原业务信息
+        businessService.save(modifyRecord.getDgBusinessDO());
+
+        //更新档案信息
+        DgArchivesDO archivesDO = modifyRecord.getArchivesDO();
+        archivesDO.setDazt(ArchiveStatus.STORED.getCode());
+        return archivesService.updateById(archivesDO);
+    }
 }
 }