档案修改列表查询

档案修改=》修改完毕
档案对应修改列表

@@ -12,6 +12,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -39,10 +41,14 @@ public class DgFileController {
     }
 
     @DeleteMapping("deleteDgFileByIds")
-    @ApiOperation(value = "批量删除档案文件信息")
-    public Result deleteDgFileByIds(@ApiParam("档案文件信息ID列表") @RequestParam(value = "idList") List<String> idList) {
-        if(dgfileService.removeByIds(idList)) {
-            return Result.ok("删除成功");
+    @ApiOperation(value = "批量删除档案文件信息和附件")
+    public Result deleteDgFileByIds(@ApiParam("档案文件信息ID列表") @RequestParam(value = "bsmFileList") List<String> bsmFileList) {
+        try {
+            if(dgfileService.delete(bsmFileList)) {
+                return Result.ok("删除成功");
+            }
+        } catch (Exception e) {
+            return Result.exception(e.getMessage());
         }
         return Result.error("删除失败");
     }
@@ -62,12 +68,12 @@ public class DgFileController {
         return Result.ok(dgfileService.getFileList(bsmArchive));
     }
 
-    // @PutMapping("updateFileSort")
-    // @ApiOperation("附件排序")
-    // public Result updateFileSort(@RequestBody UpdateDgFileRequest request){
-    //     if(dgfileService.updateFileSort(request)) {
-    //         return Result.ok("修改成功");
-    //     }
-    //     return Result.error("修改失败");
-    // }
+    @PutMapping("updateFileSort")
+    @ApiOperation("附件排序")
+    public Result updateFileSort(@RequestBody List<UpdateDgFileRequest> requests){
+        if(dgfileService.updateFileSort(requests)) {
+            return Result.ok("修改成功");
+        }
+        return Result.error("修改失败");
+    }
 }

@@ -25,4 +25,6 @@ public interface DgFileConverter{
     List<DgFileListVO> doList2ListVOList(List<DgFileDO> dgfileDOList);
 
     List<DgFileDO> voList2ListDO(List<AddDgFileRequest> addDgFileRequestList);
+
+    List<DgFileDO> updateList2DOList(List<UpdateDgFileRequest> requests);
 }

@@ -71,5 +71,9 @@ public class DgFileDO implements Serializable {
     @TableField("FJLY")
     private String fjly;
 
-
+    /**
+     * 序号
+     */
+    @TableField("XH")
+    private Integer xh;
 }

@@ -2,6 +2,8 @@ package com.pashanhoo.file.entity.vo;
 
 import java.util.Date;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -64,4 +66,9 @@ public class AddDgFileRequest implements Serializable {
     @ApiModelProperty(name = "fjly", value = "附件来源（1：业务附件，2：补录附件）")
     private String fjly;
 
+    /**
+     * 序号
+     */
+    @ApiModelProperty(name = "xh", value = "序号")
+    private Integer xh;
 }

@@ -64,5 +64,9 @@ public class DgFileDetailVO implements Serializable {
     @ApiModelProperty(name = "fjsize", value = "附件大小")
     private String fjsize;
 
-
+    /**
+     * 序号
+     */
+    @ApiModelProperty(name = "xh", value = "序号")
+    private Integer xh;
 }

@@ -69,4 +69,9 @@ public class DgFileListVO implements Serializable {
     @ApiModelProperty(name = "fjsize", value = "附件大小")
     private String fjsize;
 
+    /**
+     * 序号
+     */
+    @ApiModelProperty(name = "xh", value = "序号")
+    private Integer xh;
 }

@@ -66,6 +66,12 @@ public class DgFileSearchRequest extends PageInfo implements Serializable {
     private String fjsize;
 
     /**
+     * 序号
+     */
+    @ApiModelProperty(name = "xh", value = "序号")
+    private Integer xh;
+
+    /**
      * 档案标识码
      */
     @ApiModelProperty(name = "bsmArchives", value = "档案标识码")

@@ -64,5 +64,9 @@ public class UpdateDgFileRequest implements Serializable {
     @ApiModelProperty(name = "fjsize", value = "附件大小")
     private String fjsize;
 
-
+    /**
+     * 序号
+     */
+    @ApiModelProperty(name = "xh", value = "序号")
+    private Integer xh;
 }

@@ -4,6 +4,7 @@ package com.pashanhoo.file.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pashanhoo.file.entity.DgFileDO;
 import com.pashanhoo.file.entity.vo.DgCatalogWithFileVO;
+import com.pashanhoo.file.entity.vo.UpdateDgFileRequest;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,4 +27,11 @@ public interface DgFileMapper extends BaseMapper<DgFileDO> {
      * @return
      */
     List<DgCatalogWithFileVO> getFileList(@Param("bsmArchive") String bsmArchive);
+
+    /**
+     * 更新排序
+     * @param requests
+     * @return
+     */
+    int updateFileSort(@Param("requests") List<UpdateDgFileRequest> requests);
 }

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.pashanhoo.file.entity.DgFileDO;
 import com.pashanhoo.file.entity.vo.*;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -42,4 +43,18 @@ public interface DgFileService extends IService<DgFileDO> {
      * @return
      */
     List<DgCatalogWithFileVO> getFileList(String bsmArchive);
+
+    /**
+     * 修改文件排序
+     * @param requests
+     * @return
+     */
+    boolean updateFileSort(List<UpdateDgFileRequest> requests);
+
+    /**
+     * 批量删除档案文件信息
+     * @param bsmFileList
+     * @return
+     */
+    boolean delete(List<String> bsmFileList) throws Exception;
 }

 package com.pashanhoo.file.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pashanhoo.common.util.fileupload.MinioConfig;
 import com.pashanhoo.common.util.fileupload.MinioUtil;
 import com.pashanhoo.file.entity.DgFileConverter;
 import com.pashanhoo.file.entity.DgFileDO;
@@ -11,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
+import java.io.IOException;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -34,6 +36,9 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
     @Autowired
     MinioUtil minioUtil;
 
+    @Autowired
+    MinioConfig minioConfig;
+
     /**
      * 新增记录
      * @param request
@@ -82,4 +87,35 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
         return fileList;
     }
 
+    /**
+     * 修改文件排序
+     *
+     * @param requests
+     * @return
+     */
+    @Override
+    public boolean updateFileSort(List<UpdateDgFileRequest> requests) {
+        List<DgFileDO> fileList = dgfileConverter.updateList2DOList(requests);
+        return this.updateBatchById(fileList);
+    }
+
+    /**
+     * 批量删除档案文件信息
+     * @param bsmFileList
+     * @return
+     */
+    @Override
+    public boolean delete(List<String> bsmFileList) throws Exception {
+        boolean flag = this.removeByIds(bsmFileList);
+
+        QueryWrapper<DgFileDO> fileWrapper = new QueryWrapper<>();
+        fileWrapper.lambda().in(DgFileDO::getBsmFile, bsmFileList);
+        List<DgFileDO> fileDOList = this.list(fileWrapper);
+        for (DgFileDO fileDO : fileDOList) {
+            minioUtil.removeObject(minioConfig.getBucket(),fileDO.getFjurl());
+        }
+        return flag;
+    }
+
+
 }

 package com.pashanhoo.modify.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.pashanhoo.common.Result;
-import com.pashanhoo.modify.entity.vo.AddDgArchivesModifyRequest;
-import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
-import com.pashanhoo.modify.entity.vo.UpdateDgArchivesModifyRequest;
+import com.pashanhoo.modify.entity.vo.*;
 import com.pashanhoo.modify.service.DgArchivesModifyService;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -48,7 +47,7 @@ public class DgArchivesModifyController {
     }
 
     @PutMapping("updateDgArchivesModify")
-    @ApiOperation("修改档案修改信息")
+    @ApiOperation("修改档案修改状态")
     public Result updateDgArchivesModify(@RequestBody UpdateDgArchivesModifyRequest request){
         if(dgarchivesmodifyService.updateDgArchivesModify(request)) {
             return Result.ok("修改成功");
@@ -62,9 +61,15 @@ public class DgArchivesModifyController {
         return Result.ok(dgarchivesmodifyService.getDgArchivesModifyDetailById(id));
     }
 
-    @PostMapping("search")
-    @ApiOperation(value = "根据条件进行列表查询")
-    public Result searchDgArchivesModifyList(@RequestBody DgArchivesModifySearchRequest request) {
-        return dgarchivesmodifyService.searchDgArchivesModifyList(request);
+    @PostMapping("searchDgArchivesModifyList")
+    @ApiOperation(value = "修改列表查询")
+    public Result<IPage<DgArchivesModifyListVO>> searchDgArchivesModifyList(@RequestBody DgArchivesModifySearchRequest request) {
+        return Result.ok(dgarchivesmodifyService.searchDgArchivesModifyList(request));
+    }
+
+    @GetMapping("getArchiveWithModify")
+    @ApiOperation(value = "一个档案对应的修改列表查询")
+    public Result<List<DgArchivesModifyDetailVO>> getArchiveWithModify(@ApiParam("档案标识码") @RequestParam String bsmArchive) {
+        return Result.ok(dgarchivesmodifyService.getArchiveWithModify(bsmArchive));
     }
 }

@@ -23,4 +23,6 @@ public interface DgArchivesModifyConverter{
     DgArchivesModifyListVO do2ListVO(DgArchivesModifyDO dgarchivesmodifyDO);
 
     List<DgArchivesModifyListVO> doList2ListVOList(List<DgArchivesModifyDO> dgarchivesmodifyDOList);
+
+    List<DgArchivesModifyDetailVO> doList2DetailVOList(List<DgArchivesModifyDO> dgarchivesmodifyDOList);
 }

@@ -6,8 +6,11 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -49,28 +52,24 @@ public class DgArchivesModifyDO implements Serializable {
     private String ydaxx;
 
     /**
-     * 现档案信息
-     */
-    @TableField("XDAXX")
-    private String xdaxx;
-
-    /**
      * 修改内容
      */
     @TableField("XGNR")
     private String xgnr;
 
     /**
-     * 修改时间
+     * 创建时间
      */
-    @TableField("XGSJ")
-    private Date xgsj;
+    @TableField("createTime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
 
     /**
      * 修改人
      */
-    @TableField("XGR")
-    private String xgr;
+    @TableField("CREATER")
+    private String creater;
 
     /**
      * 备注
@@ -78,5 +77,17 @@ public class DgArchivesModifyDO implements Serializable {
     @TableField("BZ")
     private String bz;
 
+    /**
+     * 状态1:修改中,2:已归档
+     */
+    @TableField("STATE")
+    private String state;
 
+    /**
+     * 归档时间
+     */
+    @TableField("GDSJ")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date gdsj;
 }

@@ -2,10 +2,14 @@ package com.pashanhoo.modify.entity.vo;
 
 import java.util.Date;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -42,28 +46,24 @@ public class AddDgArchivesModifyRequest implements Serializable {
     private String ydaxx;
 
     /**
-    * 现档案信息
-    */
-    @ApiModelProperty(name = "xdaxx", value = "现档案信息")
-    private String xdaxx;
-
-    /**
     * 修改内容
     */
     @ApiModelProperty(name = "xgnr", value = "修改内容")
     private String xgnr;
 
     /**
-    * 修改时间
-    */
-    @ApiModelProperty(name = "xgsj", value = "修改时间")
-    private Date xgsj;
+     * 创建时间
+     */
+    @ApiModelProperty(name="createTime" ,value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
 
     /**
-    * 修改人
-    */
-    @ApiModelProperty(name = "xgr", value = "修改人")
-    private String xgr;
+     * 修改人
+     */
+    @ApiModelProperty(name = "CREATER",value = "创建人")
+    private String creater;
 
     /**
     * 备注
@@ -71,5 +71,17 @@ public class AddDgArchivesModifyRequest implements Serializable {
     @ApiModelProperty(name = "bz", value = "备注")
     private String bz;
 
+    /**
+     * 状态1:修改中,2:已归档
+     */
+    @ApiModelProperty(name = "state", value = "状态1:修改中,2:已归档")
+    private String state;
 
+    /**
+     * 归档时间
+     */
+    @ApiModelProperty(name = "gdsj", value = "归档时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date gdsj;
 }

@@ -2,10 +2,13 @@ package com.pashanhoo.modify.entity.vo;
 
 import java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -47,28 +50,24 @@ public class DgArchivesModifyDetailVO implements Serializable {
     private String ydaxx;
 
     /**
-     * 现档案信息
-     */
-    @ApiModelProperty(name = "xdaxx", value = "现档案信息")
-    private String xdaxx;
-
-    /**
      * 修改内容
      */
     @ApiModelProperty(name = "xgnr", value = "修改内容")
     private String xgnr;
 
     /**
-     * 修改时间
+     * 创建时间
      */
-    @ApiModelProperty(name = "xgsj", value = "修改时间")
-    private Date xgsj;
+    @ApiModelProperty(name="createTime" ,value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
 
     /**
      * 修改人
      */
-    @ApiModelProperty(name = "xgr", value = "修改人")
-    private String xgr;
+    @ApiModelProperty(name = "CREATER",value = "创建人")
+    private String creater;
 
     /**
      * 备注
@@ -76,5 +75,17 @@ public class DgArchivesModifyDetailVO implements Serializable {
     @ApiModelProperty(name = "bz", value = "备注")
     private String bz;
 
+    /**
+     * 状态1:修改中,2:已归档
+     */
+    @ApiModelProperty(name = "state", value = "状态1:修改中,2:已归档")
+    private String state;
 
+    /**
+     * 归档时间
+     */
+    @ApiModelProperty(name = "gdsj", value = "归档时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date gdsj;
 }

@@ -2,10 +2,13 @@ package com.pashanhoo.modify.entity.vo;
 
 import java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -26,65 +29,74 @@ public class DgArchivesModifyListVO implements Serializable {
     /**
      * 案卷标识码
      */
-    @ApiModelProperty(name = "bsm_archives", value = "案卷标识码")
-    private String bsm_archives;
-
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(name = "xgsj", value = "修改时间")
-    private Date xgsj;
+    @ApiModelProperty(name = "bsmArchives", value = "案卷标识码")
+    private String bsmArchives;
 
     /**
-     * 修改人
-     */
-    @ApiModelProperty(name = "xgr", value = "修改人")
-    private String xgr;
-    /**
      * 业务类型名称
      */
-    @ApiModelProperty(name = "djjgmc", value = "业务类型名称")
-    private String djjgmc;
+    @ApiModelProperty(name = "djywmc", value = "业务类型名称")
+    private String djywmc;
     /**
      * 登记类型
      */
     @ApiModelProperty(name = "djlx", value = "登记类型")
     private String djlx;
+
     /**
      * 档案号
      */
     @ApiModelProperty(name = "ajh", value = "档案号")
     private String ajh;
+
     /**
      * 业务号
      */
     @ApiModelProperty(name = "ywh", value = "业务号")
     private String ywh;
+
     /**
      * 不动产单元号
      */
     @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
     private String bdcdyh;
+
     /**
      * 权利人
      */
     @ApiModelProperty(name = "qlr", value = "权利人")
     private String qlr;
+
     /**
      * 义务人
      */
     @ApiModelProperty(name = "ywr", value = "义务人")
     private String ywr;
+
     /**
      * 不动产证件号码
      */
     @ApiModelProperty(name = "bdcqzh", value = "不动产证件号码")
     private String bdcqzh;
+
     /**
-     * 不动产单元号数量
+     * 修改时间
+     */
+    @ApiModelProperty(name = "xgsj", value = "修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date xgsj;
+
+    /**
+     * 修改人
      */
-    @ApiModelProperty(name = "bdcdy_num", value = "不动产单元号数量")
-    private String bdcdy_num;
+    @ApiModelProperty(name = "creater", value = "修改人")
+    private String creater;
 
+    /**
+     * 不动产单元号数量
+     */
+    @ApiModelProperty(name = "bdcdyNum", value = "不动产单元号数量")
+    private String bdcdyNum;
 
 }

@@ -2,11 +2,14 @@ package com.pashanhoo.modify.entity.vo;
 
 import java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import com.pashanhoo.common.PageInfo;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -19,7 +22,6 @@ import com.pashanhoo.common.PageInfo;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="档案修改信息列表查询请求实体")
-//TODO 初始查询条件是全部，需要根据情况自行删减
 public class DgArchivesModifySearchRequest extends PageInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -36,17 +38,21 @@ public class DgArchivesModifySearchRequest extends PageInfo implements Serializa
     /**
      * 修改人
      */
-    @ApiModelProperty(name = "xgr", value = "修改人")
-    private String xgr;
+    @ApiModelProperty(name = "creater", value = "修改人")
+    private String creater;
     /**
      * 修改起始时间
      */
     @ApiModelProperty(name = "xgqssj", value = "修改起始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date xgqssj;
     /**
      * 修改截止时间
      */
     @ApiModelProperty(name = "xgjzsj", value = "修改截止时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date xgjzsj;
     /**
      * 档案号
@@ -69,7 +75,4 @@ public class DgArchivesModifySearchRequest extends PageInfo implements Serializa
     @ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
     private String bdcqzh;
 
-
-
-
 }

@@ -2,10 +2,13 @@ package com.pashanhoo.modify.entity.vo;
 
 import java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -47,22 +50,18 @@ public class UpdateDgArchivesModifyRequest implements Serializable {
     private String ydaxx;
 
     /**
-     * 现档案信息
+     * 创建时间
      */
-    @ApiModelProperty(name = "xdaxx", value = "现档案信息")
-    private String xdaxx;
+    @ApiModelProperty(name="createTime" ,value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
 
     /**
-     * 修改内容
-     */
-    @ApiModelProperty(name = "xgnr", value = "修改内容")
-    private String xgnr;
-
-    /**
-     * 修改时间
+     * 修改人
      */
-    @ApiModelProperty(name = "xgsj", value = "修改时间")
-    private Date xgsj;
+    @ApiModelProperty(name = "CREATER",value = "创建人")
+    private String creater;
 
     /**
      * 修改人
@@ -76,5 +75,17 @@ public class UpdateDgArchivesModifyRequest implements Serializable {
     @ApiModelProperty(name = "bz", value = "备注")
     private String bz;
 
+    /**
+     * 状态1:修改中,2:已归档
+     */
+    @ApiModelProperty(name = "state", value = "状态1:修改中,2:已归档")
+    private String state;
 
+    /**
+     * 归档时间
+     */
+    @ApiModelProperty(name = "gdsj", value = "归档时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date gdsj;
 }

@@ -2,9 +2,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.vo.DgArchivesModifyListVO;
 import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,7 +20,11 @@ import java.util.List;
  */
 public interface DgArchivesModifyMapper extends BaseMapper<DgArchivesModifyDO> {
 
-
-    List<DgArchivesModifyListVO> searchDgArchivesModifyList(DgArchivesModifySearchRequest request);
-
+    /**
+     * 修改列表查询
+     * @param pageParam
+     * @param request
+     * @return
+     */
+    IPage<DgArchivesModifyListVO> searchDgArchivesModifyList(@Param("pageParam") IPage<DgArchivesModifyListVO> pageParam, @Param("request") DgArchivesModifySearchRequest request);
 }

 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.vo.AddDgArchivesModifyRequest;
-import com.pashanhoo.modify.entity.vo.DgArchivesModifyDetailVO;
-import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
-import com.pashanhoo.modify.entity.vo.UpdateDgArchivesModifyRequest;
+import com.pashanhoo.modify.entity.vo.*;
+
+import java.util.List;
 
 /**
  * <p>
@@ -19,8 +19,9 @@ import com.pashanhoo.modify.entity.vo.UpdateDgArchivesModifyRequest;
  * @since 2021-11-05
  */
 public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> {
-     /**
+    /**
      * 新增记录
+     *
      * @param request
      * @return
      */
@@ -28,22 +29,33 @@ public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> {
 
     /**
      * 根据主键查询记录详情
+     *
      * @param id
      * @return
      */
     DgArchivesModifyDetailVO getDgArchivesModifyDetailById(String id);
 
     /**
-     * 修改单条记录
+     * 修改记录状态为已归档和归档日期，一并修改档案记录的状态为在库
+     *
      * @param request
      * @return
      */
     boolean updateDgArchivesModify(UpdateDgArchivesModifyRequest request);
 
     /**
-     * 根据条件进行列表查询
+     * 修改列表查询
+     *
      * @param request
      * @return
-    */
-    Result searchDgArchivesModifyList(DgArchivesModifySearchRequest request);
+     */
+    IPage<DgArchivesModifyListVO> searchDgArchivesModifyList(DgArchivesModifySearchRequest request);
+
+    /**
+     * 一个档案对应的修改列表查询
+     *
+     * @param bsmArchive
+     * @return
+     */
+    List<DgArchivesModifyDetailVO> getArchiveWithModify(String bsmArchive);
 }

 package com.pashanhoo.modify.service.impl;
 
+import cn.hutool.core.date.DateTime;
+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.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.pashanhoo.common.Result;
+import com.pashanhoo.archive.entity.ArchiveStatus;
+import com.pashanhoo.archive.entity.DgArchivesDO;
+import com.pashanhoo.archive.service.DgArchivesService;
 import com.pashanhoo.modify.entity.DgArchivesModifyConverter;
 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
 import com.pashanhoo.modify.entity.vo.*;
 import com.pashanhoo.modify.mapper.DgArchivesModifyMapper;
 import com.pashanhoo.modify.service.DgArchivesModifyService;
-import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -35,6 +38,9 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
     @Autowired
     private DgArchivesModifyMapper dgarchivesmodifyMapper;
 
+    @Autowired
+    DgArchivesService archivesService;
+
     /**
      * 新增记录
      *
@@ -60,15 +66,22 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
     }
 
     /**
-     * 修改单条记录
+     * 修改记录状态为已归档和归档日期，一并修改档案记录的状态为在库
      *
      * @param request
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateDgArchivesModify(UpdateDgArchivesModifyRequest request) {
         DgArchivesModifyDO dgarchivesmodifyDO = dgarchivesmodifyConverter.updateRequest2DO(request);
-        return this.updateById(dgarchivesmodifyDO);
+        UpdateWrapper<DgArchivesModifyDO> modifyWrapper = new UpdateWrapper<>();
+        modifyWrapper.lambda().set(DgArchivesModifyDO::getState, "2").set(DgArchivesModifyDO::getGdsj, DateTime.now());
+        this.update(dgarchivesmodifyDO, modifyWrapper);
+        //修改档案记录状态
+        UpdateWrapper<DgArchivesDO> archivesWrapper = new UpdateWrapper<>();
+        archivesWrapper.lambda().set(DgArchivesDO::getDazt, ArchiveStatus.STORED.getCode()).eq(DgArchivesDO::getBsmArchives, request.getBsmArchives());
+        return archivesService.update(archivesWrapper);
     }
 
     /**
@@ -78,11 +91,23 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
      * @return
      */
     @Override
-    public Result searchDgArchivesModifyList(DgArchivesModifySearchRequest request) {
-        PageHelper.startPage(request.getCurrentPage(), request.getPageSize());
-        List<DgArchivesModifyListVO> list= dgarchivesmodifyMapper.searchDgArchivesModifyList(request);
-        PageInfo<DgArchivesModifyListVO> pageInfo = new PageInfo<DgArchivesModifyListVO>(list);
-        return Result.ok(pageInfo);
+    public IPage<DgArchivesModifyListVO> searchDgArchivesModifyList(DgArchivesModifySearchRequest request) {
+        IPage<DgArchivesModifyListVO> pageParam = new Page<>(request.getCurrentPage(), request.getPageSize());
+        IPage<DgArchivesModifyListVO> list = dgarchivesmodifyMapper.searchDgArchivesModifyList(pageParam, request);
+        return list;
     }
 
+    /**
+     * 一个档案对应的修改列表查询
+     *
+     * @param bsmArchive
+     * @return
+     */
+    @Override
+    public List<DgArchivesModifyDetailVO> getArchiveWithModify(String bsmArchive) {
+        QueryWrapper<DgArchivesModifyDO> modifyWrapper = new QueryWrapper<>();
+        modifyWrapper.lambda().eq(DgArchivesModifyDO::getBsmArchives, bsmArchive);
+        List<DgArchivesModifyDO> modifyDOS = this.list(modifyWrapper);
+        return dgarchivesmodifyConverter.doList2DetailVOList(modifyDOS);
+    }
 }

 <?xml version="1.0" encoding="UTF-8"?>
 <!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">
-        <id column="BSM_MODIFY" property="bsmModify" />
-        <result column="BSM_ARCHIVES" property="bsmArchives" />
-        <result column="XGBH" property="xgbh" />
-        <result column="YDAXX" property="ydaxx" />
-        <result column="XDAXX" property="xdaxx" />
-        <result column="XGNR" property="xgnr" />
-        <result column="XGSJ" property="xgsj" />
-        <result column="XGR" property="xgr" />
-        <result column="BZ" property="bz" />
-    </resultMap>
-    <!-- 通用查询映射结果 -->
-    <resultMap id="SearchResultMap" type="com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO">
-        <id column="BSM_ARCHIVES" property="bsm_archives" />
-        <result column="XGSJ" property="xgsj" />
-        <result column="XGR" property="xgr" />
-        <result column="DJLX" property="djlx" />
-        <result column="DJJGMC" property="djjgmc" />
-        <result column="AJH" property="ajh" />
-        <result column="YWH" property="ywh" />
-        <result column="BDCDYH" property="bdcdyh" />
-        <result column="QLR" property="qlr" />
-        <result column="YWR" property="ywr" />
-        <result column="BDCQZH" property="bdcqzh" />
-        <result column="BDCDY_NUM" property="bdcdy_num" />
+        <id column="BSM_MODIFY" property="bsmModify"/>
+        <result column="BSM_ARCHIVES" property="bsmArchives"/>
+        <result column="XGBH" property="xgbh"/>
+        <result column="YDAXX" property="ydaxx"/>
+        <result column="XDAXX" property="xdaxx"/>
+        <result column="XGNR" property="xgnr"/>
+        <result column="XGSJ" property="xgsj"/>
+        <result column="XGR" property="xgr"/>
+        <result column="BZ" property="bz"/>
     </resultMap>
+    <!--&lt;!&ndash; 通用查询映射结果 &ndash;&gt;-->
+    <!--<resultMap id="SearchResultMap" type="com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO">-->
+    <!--    <id column="BSM_ARCHIVES" property="bsmArchives" />-->
+    <!--    <result column="XGSJ" property="xgsj" />-->
+    <!--    <result column="CREATER" property="creater" />-->
+    <!--    <result column="DJLX" property="djlx" />-->
+    <!--    <result column="DJJGMC" property="djjgmc" />-->
+    <!--    <result column="AJH" property="ajh" />-->
+    <!--    <result column="YWH" property="ywh" />-->
+    <!--    <result column="BDCDYH" property="bdcdyh" />-->
+    <!--    <result column="QLR" property="qlr" />-->
+    <!--    <result column="YWR" property="ywr" />-->
+    <!--    <result column="BDCQZH" property="bdcqzh" />-->
+    <!--    <result column="BDCDY_NUM" property="bdcdyNum" />-->
+    <!--</resultMap>-->
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        BSM_MODIFY, BSM_ARCHIVES, XGBH, YDAXX, XDAXX, XGNR, XGSJ, XGR, BZ
+        BSM_MODIFY,
+        BSM_ARCHIVES,
+        XGBH,
+        YDAXX,
+        XDAXX,
+        XGNR,
+        XGSJ,
+        XGR,
+        BZ
     </sql>
-    <select id="searchDgArchivesModifyList" resultMap="SearchResultMap">
-        select a.bsm_archives,a.xgsj,a.xgr,b.djlx,b.djjgmc,d.ajh,b.ywh,c.bdcdyh,c.qlr,c.ywr,c.BDCQZH,count(1) over(partition by c.bdcdyh) bdcdy_num
-        from dg_archives_modify a, dg_business b, dg_bdcdy c,dg_archives d
-        where a.bsm_archives = d.bsm_archives
-        and a.bsm_archives=d.bsm_archives
-        and c.bsm_archives=d.bsm_archives
-        <if test="ywh != null and ywh!='' ">
-            and b.ywh=#{ywh,jdbcType=VARCHAR}
-        </if>
-        <if test="djjgbm != null and djjgbm!='' ">
-            and b.djjgbm=#{djjgbm,jdbcType=VARCHAR}
-        </if>
-        <if test="djlx != null and djlx!='' ">
-            and b.djlx=#{djlx,jdbcType=VARCHAR}
-        </if>
-        <if test="xgr != null and xgr!='' ">
-            and a.xgr=#{xgr,jdbcType=VARCHAR}
-        </if>
-        <if test="xgsj != null and xgsj!='' ">
-            and a.xgsj=#{xgsj,jdbcType=VARCHAR}
-        </if>
-
-
+    <select id="searchDgArchivesModifyList" resultType="com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO">
+        select DA.BSM_ARCHIVES,
+               DB.DJYWMC,
+               DB.DJLX,
+               DA.AJH,
+               DB.YWH,
+               BDCDY.BDCDYH,
+               BDCDY.QLR,
+               BDCDY.YWR,
+               BDCDY.BDCQZH,
+               DM.CREATETIME,
+               DM.CREATER,
+               count(*) over (partition by BDCDY.bdcdyh) as bdcdyNum
+        from DG_MODIFY DM
+                     join DG_BUSINESS DB on DM.BSM_ARCHIVES = DB.BSM_ARCHIVES
+                     join DG_BDCDY BDCDY on DM.BSM_ARCHIVES = BDCDY.BSM_ARCHIVES
+                     join DG_ARCHIVES DA on DM.BSM_ARCHIVES = DA.BSM_ARCHIVES
+        <where>
+            <if test="request.djywmc != null and request.djywmc != ''">
+                DB.DJYWMC = #{request.djywmc,jdbcType=VARCHAR}
+            </if>
+            <if test="request.djlx != null and request.djlx != ''">
+                and DB.DJLX = #{request.djlx,jdbcType=VARCHAR}
+            </if>
+            <if test="request.creater != null and request.creater != ''">
+                and DM.CREATER = #{request.creater,jdbcType=VARCHAR}
+            </if>
+            <if test="request.xgqssj != null">
+                <![CDATA[
+                and DM.CREATETIME >= #{request.xgqssj,jdbcType=TIMESTAMP}
+                ]]>
+            </if>
+            <if test="request.xgjzsj != null">
+                <![CDATA[
+                and DM.CREATETIME <= #{request.xgjzsj,jdbcType=TIMESTAMP}
+                ]]>
+            </if>
+            <if test="request.ajh != null and request.ajh != ''">
+                and DA.AJH = #{request.ajh,jdbcType=VARCHAR}
+            </if>
+            <if test="request.ywh != null and request.ywh != ''">
+                and DB.YWH = #{request.ywh,jdbcType=VARCHAR}
+            </if>
+            <if test="request.bdcdyh != null and request.bdcdyh != ''">
+                and BDCDY.BDCDYH = #{request.bdcdyh,jdbcType=VARCHAR}
+            </if>
+            <if test="request.bdcqzh != null and request.bdcqzh != ''">
+                and BDCDY.BDCQZH = #{request.bdcqzh,jdbcType=VARCHAR}
+            </if>
+        </where>
     </select>
 </mapper>

@@ -38,7 +38,7 @@
         </collection>
     </resultMap>
 
-    <select id="getFileList" resultType="com.pashanhoo.file.entity.vo.DgFileListVO">
+    <select id="getFileList" resultMap="result">
         select DF.*, DAC.XH, DAC.WJMC,DAC.BSM_CATALOG
         from DG_FILE DF
         join DG_ARCHIVES_CATALOG DAC on DAC.BSM_CATALOG = DF.BSM_CATALOG
@@ -49,4 +49,8 @@
         </where>
         order by DAC.XH
     </select>
+
+    <update id="updateFileSort">
+        update DG_FILE set
+    </update>
 </mapper>