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

@@ -65,8 +65,8 @@ public class DgArchivesDestructionController {
     }
     @GetMapping("deleteArchivesInfo")
     @ApiOperation(value = "删除档案列表中的档案信息")
-    public Result deleteArchivesInfo(@ApiParam("档案销毁记录ID") @RequestParam(value = "bsm_destruction") String bsm_destruction) {
-        return dgarchivesdestructionService.deleteDestructionArchivescataLog(bsm_destruction);
+    public Result deleteArchivesInfo(@ApiParam("档案ID") @RequestParam(value = "bsmArchives") String bsmArchives) {
+        return dgarchivesdestructionService.deleteDestructionArchivescataLog(bsmArchives);
     }
     @PostMapping("updateDgArchivesDestruction")
     @ApiOperation("修改档案销毁记录信息")

@@ -43,10 +43,10 @@ public interface DgArchivesDestructionService extends IService<DgArchivesDestruc
     Result queryArchivesInfo(String bsm_destruction);
     /**
      * 根据条件进行列表查询
-     * @param bsm_destruction
+     * @param bsmArchives
      * @return
      */
-    Result deleteDestructionArchivescataLog(String bsm_destruction);
+    Result deleteDestructionArchivescataLog(String bsmArchives);
     /**
      * 选择销毁档案List
      * @param archivesList

@@ -127,8 +127,8 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest
     }
 
     @Override
-    public Result deleteDestructionArchivescataLog(String bsm_destruction) {
-        catalogService.deleteDestructionCatalog(bsm_destruction);
+    public Result deleteDestructionArchivescataLog(String bsmArchives) {
+        catalogService.deleteDestructionCatalog(bsmArchives);
         return Result.ok();
     }
 

@@ -48,7 +48,7 @@ public interface DgDestructionCatalogService extends IService<DgDestructionCatal
     /**
      * 通过销毁标识码删除档案销毁目录数据
      */
-    Result deleteDestructionCatalog(String bsmDestruction);
+    Result deleteDestructionCatalog(String bsmArchives);
     /**
      * 通过档案标识码删除档案销毁目录数据
      */

@@ -86,9 +86,9 @@ public class DgDestructionCatalogServiceImpl extends ServiceImpl<DgDestructionCa
     }
 
     @Override
-    public Result deleteDestructionCatalog(String bsmDestruction) {
+    public Result deleteDestructionCatalog(String bsmArchives) {
         QueryWrapper<DgDestructionCatalogDO> wrapper = new QueryWrapper<>();
-        wrapper.eq(bsmDestruction!=null && !"".equals(bsmDestruction),"BSM_DESTRUCTION",bsmDestruction);
+        wrapper.eq(bsmArchives!=null && !"".equals(bsmArchives),"BSM_ARCHIVES",bsmArchives);
         int result=dgdestructioncatalogMapper.delete(wrapper);
         if(result!=0){
             return  Result.ok();

 package com.pashanhoo.lend.controller;
 
 
+import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
 import com.pashanhoo.common.Result;
 import com.pashanhoo.lend.entity.vo.AddDgLendRequest;
-import com.pashanhoo.lend.entity.vo.UpdateDgLendRequest;
+import com.pashanhoo.lend.entity.vo.ArchiveLendSearchRequest;
 import com.pashanhoo.lend.entity.vo.DgLendSearchRequest;
+import com.pashanhoo.lend.entity.vo.UpdateDgLendRequest;
 import com.pashanhoo.lend.service.DgLendService;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
+import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
+import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**
@@ -29,6 +33,26 @@ public class DgLendController {
     @Autowired
     private DgLendService dglendService;
 
+    @PostMapping("search")
+    @ApiOperation(value = "根据条件进行列表查询")
+    public Result searchDgLendList(@RequestBody DgLendSearchRequest request) {
+        return dglendService.searchDgLendList(request);
+    }
+    @PostMapping("deleteDanganJyInfo")
+    @ApiOperation("通过借阅标识码删除借阅记录信息")
+    public Result deleteDanganJyInfo(@RequestParam String lendBsm){
+        return dglendService.deleteDanganJyInfo(lendBsm);
+    }
+    @PostMapping("danganGh")
+    @ApiOperation("档案归还")
+    public Result danganGh(@RequestBody UpdateDgLendRequest ghRequest){
+        return dglendService.danganGh(ghRequest);
+    }
+    @PostMapping("showArchivesForLend")
+    @ApiOperation("展示可以选择借阅的列表")
+    public Result showArchivesForLend(@RequestBody ArchiveLendSearchRequest request) {
+        return  dglendService.showArchivesForLend(request);
+    }
     @PostMapping("insertDgLend")
     @ApiOperation("新增档案借阅")
     public Result insertDgLend(@RequestBody AddDgLendRequest request){
@@ -37,17 +61,32 @@ public class DgLendController {
         }
         return Result.error("新增失败");
     }
-
-    @DeleteMapping("deleteDgLendByIds")
-    @ApiOperation(value = "批量删除档案借阅")
-    public Result deleteDgLendByIds(@ApiParam("档案借阅ID列表") @RequestParam(value = "idList") List<String> idList) {
-        if(dglendService.removeByIds(idList)) {
-            return Result.ok("删除成功");
-        }
-        return Result.error("删除失败");
+    @PostMapping("addLendArchivesInfo")
+    @ApiOperation(value = "选择要借阅档案List")
+    public Result addLendArchivesInfo(@RequestBody List<AddDgLendCatalogRequest> archivesList) {
+        return dglendService.addDestructionArchivesInfo(archivesList);
     }
-
-    @PutMapping("updateDgLend")
+    @PostMapping("insertDanganJyFile")
+    @ApiOperation("批量借阅文件信息")
+    public Result insertDanganJyFile(@RequestBody List<AddDgLendFileRequest> request){
+        return dglendService.insertDanganJyFile(request);
+    }
+    @PostMapping("queryArchivesInfo")
+    @ApiOperation(value = "档案列表信息展示")
+    public Result queryArchivesInfo(@ApiParam("档案借阅记录ID") @RequestParam(value = "bsm_lend") String bsm_lend) {
+        return dglendService.queryArchivesInfo(bsm_lend);
+    }
+    @GetMapping("deleteArchivesInfo")
+    @ApiOperation(value = "删除档案列表中的档案信息")
+    public Result deleteArchivesInfo(@ApiParam("档案ID") @RequestParam(value = "bsm_lendcatalog") String bsm_lendcatalog) {
+        return dglendService.deleteArchivesInfo(bsm_lendcatalog);
+    }
+    @GetMapping("getDgLendDetailById")
+    @ApiOperation(value = "读取明细")
+    public Result getDgLendDetailById(@ApiParam("档案借阅ID") @RequestParam String id){
+        return Result.ok(dglendService.getDgLendDetailById(id));
+    }
+    @PostMapping("updateDgLend")
     @ApiOperation("修改档案借阅")
     public Result updateDgLend(@RequestBody UpdateDgLendRequest request){
         if(dglendService.updateDgLend(request)) {
@@ -55,18 +94,23 @@ public class DgLendController {
         }
         return Result.error("修改失败");
     }
-
-    @GetMapping("getDgLendDetailById")
-    @ApiOperation(value = "读取明细")
-    public Result getDgLendDetailById(@ApiParam("档案借阅ID") @RequestParam String id){
-        return Result.ok(dglendService.getDgLendDetailById(id));
+    @PostMapping("updateStateByArchives")
+    @ApiOperation(value = "新增档案借阅列表中的借阅操作")
+    public Result updateStateByArchives(@ApiParam("档案业务信息ID列表") @RequestParam(value = "idList") List<String> idList) {
+        return dglendService.updateStateByArchives(idList);
     }
-
-    @PostMapping("search")
-    @ApiOperation(value = "根据条件进行列表查询")
-    public Result searchDgLendList(@RequestBody DgLendSearchRequest request) {
-        //TODO 默认排序条件设置
-        request.defaultFillPageProp("","");
-        return Result.ok(dglendService.searchDgLendList(request));
+    @GetMapping("updateArchivesStateByLend")
+    @ApiOperation(value = "编辑中的借阅操作")
+    public Result updateArchivesStateByLend(@ApiParam("档案借阅记录ID") @RequestParam(value = "bsm_lend") String bsm_lend) {
+        return dglendService.updateArchivesStateByLend(bsm_lend);
     }
+
+
+
+
+
+
+
+
+
 }

@@ -101,6 +101,15 @@ public class DgLendDO implements Serializable {
      */
     @TableField("PZSJ")
     private Date pzsj;
-
+    /**
+     * 归还人
+     */
+    @TableField("GHR")
+    private String ghr;
+    /**
+     * 归还人联系电话
+     */
+    @TableField("GHRDH")
+    private String ghrdh;
 
 }

@@ -94,6 +94,16 @@ public class AddDgLendRequest implements Serializable {
     */
     @ApiModelProperty(name = "pzsj", value = "批准时间")
     private Date pzsj;
+    /**
+     * 归还人
+     */
+    @ApiModelProperty(name = "ghr", value = "归还人")
+    private String ghr;
+    /**
+     * 归还人联系电话
+     */
+    @ApiModelProperty(name = "ghrdh", value = "归还人联系电话")
+    private String ghrdh;
 
 
 }

+package com.pashanhoo.lend.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="可以借阅的档案列表VO")
+public class ArchiveLendInfoRequestVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 档案标识码
+     */
+    @ApiModelProperty(name = "bsm_archives", value = "档案标识码")
+    private String bsm_archives;
+    /**
+     * 档案状态
+     */
+    @ApiModelProperty(name = "dazt", value = "档案状态")
+    private String dazt;
+    /**
+     * 案卷号
+     */
+    @ApiModelProperty(name = "ajh", value = "案卷号")
+    private String ajh;
+    /**
+     * 不动产单元号
+     */
+    @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
+    private String bdcdyh;
+    /**
+     * 权利类型
+     */
+    @ApiModelProperty(name = "qllx", value = "权利类型")
+    private String qllx;
+    /**
+     * 登记类型
+     */
+    @ApiModelProperty(name = "djlx", value = "登记类型")
+    private String djlx;
+    /**
+     * 权利人
+     */
+    @ApiModelProperty(name = "qlr", value = "权利人")
+    private String qlr;
+    /**
+     * 义务人
+     */
+    @ApiModelProperty(name = "ywr", value = "义务人")
+    private String ywr;
+    /**
+     * 证件号码
+     */
+    @ApiModelProperty(name = "zjhm", value = "证件号码")
+    private String zjhm;
+    /**
+     * 不动产单元数量
+     */
+    @ApiModelProperty(name = "bdcdy_num", value = "不动产单元数量")
+    private String bdcdy_num;
+
+}

+package com.pashanhoo.lend.entity.vo;
+
+import com.pashanhoo.common.PageInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="可以借阅的档案列表请求类")
+public class ArchiveLendSearchRequest extends PageInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 档案号
+     */
+    @ApiModelProperty(name = "ajh", value = "档案号")
+    private String ajh;
+    /**
+     * 业务号
+     */
+    @ApiModelProperty(name = "ywh", value = "业务号")
+    private String ywh;
+    /**
+     * 不动产单元号
+     */
+    @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
+    private String bdcdyh;
+    /**
+     * 不动产权证号
+     */
+    @ApiModelProperty(name = "zjhm", value = "不动产权证号")
+    private String zjhm;
+    /**
+     * 权利人
+     */
+    @ApiModelProperty(name = "qlr", value = "权利人")
+    private String qlr;
+    /**
+     * 义务人
+     */
+    @ApiModelProperty(name = "ywr", value = "义务人")
+    private String ywr;
+    /**
+     * 查封文号
+     */
+    @ApiModelProperty(name = "cfwh", value = "查封文号")
+    private String cfwh;
+    /**
+     * 权利类型
+     */
+    @ApiModelProperty(name = "qllx", value = "权利类型")
+    private String qllx;
+
+}

 package com.pashanhoo.lend.entity.vo;
 
-import java.util.Date;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 档案借阅明细实体
@@ -21,84 +21,70 @@ import lombok.EqualsAndHashCode;
 public class DgLendDetailVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
     /**
      * 借阅标识码
      */
-    @ApiModelProperty(name = "bsmLend", value = "借阅标识码")
-    private String bsmLend;
-
+    @ApiModelProperty(name = "bsm_lend", value = "借阅标识码")
+    private String bsm_lend;
     /**
-     * 借阅人
+     * 借阅时效
      */
-    @ApiModelProperty(name = "jyr", value = "借阅人")
-    private String jyr;
-
+    @ApiModelProperty(name = "jysx", value = "借阅时效")
+    private String jysx;
     /**
-     * 借阅单位
+     * 借阅单号
      */
-    @ApiModelProperty(name = "jydw", value = "借阅单位")
-    private String jydw;
-
+    @ApiModelProperty(name = "jydh", value = "借阅单号")
+    private String jydh;
     /**
-     * 联系电话
+     * 档案号
      */
-    @ApiModelProperty(name = "lxdw", value = "联系电话")
-    private String lxdw;
-
+    @ApiModelProperty(name = "ajh", value = "案卷号")
+    private String ajh;
     /**
-     * 通讯地址
+     * 借阅方式
      */
-    @ApiModelProperty(name = "txdz", value = "通讯地址")
-    private String txdz;
-
+    @ApiModelProperty(name = "jyfs", value = "借阅方式")
+    private String jyfs;
     /**
-     * 借阅日期
+     * 借阅单位
      */
-    @ApiModelProperty(name = "jyrq", value = "借阅日期")
-    private Date jyrq;
-
+    @ApiModelProperty(name = "jydw", value = "借阅单位")
+    private String jydw;
     /**
-     * 归还日期
+     * 借阅人
      */
-    @ApiModelProperty(name = "ghrq", value = "归还日期")
-    private Date ghrq;
-
+    @ApiModelProperty(name = "jyr", value = "借阅人")
+    private String jyr;
     /**
-     * 批准人
+     * 起始时间
      */
-    @ApiModelProperty(name = "pzr", value = "批准人")
-    private String pzr;
-
+    @ApiModelProperty(name = "qssj", value = "起始时间")
+    private String qssj;
     /**
-     * 借阅期限
+     * 截止时间
      */
-    @ApiModelProperty(name = "jyqx", value = "借阅期限")
-    private String jyqx;
-
+    @ApiModelProperty(name = "jzrq", value = "截止时间")
+    private String jzrq;
     /**
-     * 借出理由
+     * 归还人
      */
-    @ApiModelProperty(name = "jcly", value = "借出理由")
-    private String jcly;
-
+    @ApiModelProperty(name = "ghr", value = "归还人")
+    private String ghr;
     /**
-     * 利用目的
+     * 归还时间
      */
-    @ApiModelProperty(name = "lymd", value = "利用目的")
-    private String lymd;
-
+    @ApiModelProperty(name = "ghsj", value = "归还时间")
+    private String ghsj;
     /**
-     * 备注
+     * 借阅状态
      */
-    @ApiModelProperty(name = "bz", value = "备注")
-    private String bz;
-
+    @ApiModelProperty(name = "jyzt", value = "借阅状态")
+    private String jyzt;
     /**
-     * 批准时间
+     * 档案数量
      */
-    @ApiModelProperty(name = "pzsj", value = "批准时间")
-    private Date pzsj;
-
+    @ApiModelProperty(name = "da_num", value = "档案数量")
+    private String da_num;
 
 }

 package com.pashanhoo.lend.entity.vo;
 
-import java.util.Date;
-import java.io.Serializable;
+import com.pashanhoo.common.PageInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import com.pashanhoo.common.PageInfo;
+
+import java.io.Serializable;
 
 /**
  * <p>
@@ -19,88 +19,46 @@ import com.pashanhoo.common.PageInfo;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="档案借阅列表查询请求实体")
-//TODO 初始查询条件是全部，需要根据情况自行删减
 public class DgLendSearchRequest extends PageInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 借阅标识码
-     */
-    @ApiModelProperty(name = "bsmLend", value = "借阅标识码")
-    private String bsmLend;
-
-    /**
-     * 借阅人
-     */
-    @ApiModelProperty(name = "jyr", value = "借阅人")
-    private String jyr;
-
-    /**
-     * 借阅单位
+     * 档案号
      */
-    @ApiModelProperty(name = "jydw", value = "借阅单位")
-    private String jydw;
+    @ApiModelProperty(name = "ajh", value = "档案号")
+    private String ajh;
 
     /**
-     * 联系电话
+     * 不动产单元号
      */
-    @ApiModelProperty(name = "lxdw", value = "联系电话")
-    private String lxdw;
+    @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
+    private String bdcdyh;
 
     /**
-     * 通讯地址
+     * 业务号
      */
-    @ApiModelProperty(name = "txdz", value = "通讯地址")
-    private String txdz;
+    @ApiModelProperty(name = "ywh", value = "业务号")
+    private String ywh;
 
     /**
-     * 借阅日期
+     * 不动产权证号
      */
-    @ApiModelProperty(name = "jyrq", value = "借阅日期")
-    private Date jyrq;
+    @ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
+    private String bdcqzh;
 
     /**
-     * 归还日期
-     */
-    @ApiModelProperty(name = "ghrq", value = "归还日期")
-    private Date ghrq;
-
-    /**
-     * 批准人
-     */
-    @ApiModelProperty(name = "pzr", value = "批准人")
-    private String pzr;
-
-    /**
-     * 借阅期限
-     */
-    @ApiModelProperty(name = "jyqx", value = "借阅期限")
-    private String jyqx;
-
-    /**
-     * 借出理由
-     */
-    @ApiModelProperty(name = "jcly", value = "借出理由")
-    private String jcly;
-
-    /**
-     * 利用目的
+     * 借阅人
      */
-    @ApiModelProperty(name = "lymd", value = "利用目的")
-    private String lymd;
+    @ApiModelProperty(name = "jyr", value = "借阅人")
+    private String jyr;
 
     /**
-     * 备注
+     * 借阅状态
      */
-    @ApiModelProperty(name = "bz", value = "备注")
-    private String bz;
+    @ApiModelProperty(name = "jyzt", value = "借阅状态")
+    private String jyzt;
 
-    /**
-     * 批准时间
-     */
-    @ApiModelProperty(name = "pzsj", value = "批准时间")
-    private Date pzsj;
 
 
 }

@@ -43,8 +43,8 @@ public class UpdateDgLendRequest implements Serializable {
     /**
      * 联系电话
      */
-    @ApiModelProperty(name = "lxdw", value = "联系电话")
-    private String lxdw;
+    @ApiModelProperty(name = "lxdh", value = "联系电话")
+    private String lxdh;
 
     /**
      * 通讯地址
@@ -99,6 +99,20 @@ public class UpdateDgLendRequest implements Serializable {
      */
     @ApiModelProperty(name = "pzsj", value = "批准时间")
     private Date pzsj;
+    /**
+     * 归还人
+     */
+    @ApiModelProperty(name = "ghr", value = "归还人")
+    private String ghr;
+    /**
+     * 归还人联系电话
+     */
+    @ApiModelProperty(name = "ghrdh", value = "归还人联系电话")
+    private String ghrdh;
+
+
+
+
 
 
 }

 package com.pashanhoo.lend.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pashanhoo.archive.entity.vo.DgArchivesListVO;
 import com.pashanhoo.lend.entity.DgLendDO;
+import com.pashanhoo.lend.entity.vo.ArchiveLendInfoRequestVO;
+import com.pashanhoo.lend.entity.vo.ArchiveLendSearchRequest;
+import com.pashanhoo.lend.entity.vo.DgLendDetailVO;
+import com.pashanhoo.lend.entity.vo.DgLendSearchRequest;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +21,15 @@ import com.pashanhoo.lend.entity.DgLendDO;
  */
 public interface DgLendMapper extends BaseMapper<DgLendDO> {
 
+    List<DgLendDetailVO> getDanganJyDetail(DgLendSearchRequest request);
+
+    boolean updateArchivesStatus(@Param("lendBsm") String lendBsm, @Param("dazt") String dazt);
+
+    List<DgArchivesListVO> queryArchivesInfo(@Param("bsm_lend") String bsm_lend);
+
+    boolean updateArchivesStatusBatch(@Param("idList") List<String> idList,@Param("dazt") String dazt);
+
+    List<ArchiveLendInfoRequestVO> getArchiveLendInfo(ArchiveLendSearchRequest request);
+
+
 }

 package com.pashanhoo.lend.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
+import com.pashanhoo.common.Result;
 import com.pashanhoo.lend.entity.DgLendDO;
-import com.pashanhoo.lend.entity.vo.AddDgLendRequest;
-import com.pashanhoo.lend.entity.vo.DgLendDetailVO;
-import com.pashanhoo.lend.entity.vo.UpdateDgLendRequest;
-import com.pashanhoo.lend.entity.vo.DgLendSearchRequest;
+import com.pashanhoo.lend.entity.vo.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
+import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,31 +20,83 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  * @since 2021-11-05
  */
 public interface DgLendService extends IService<DgLendDO> {
+    /**
+     * 根据条件进行列表查询
+     * @param request
+     * @return
+     */
+    Result searchDgLendList(DgLendSearchRequest request);
+    /**
+     * 删除借阅记录
+     * @param lendBsm
+     * @return
+     */
+    Result deleteDanganJyInfo(String lendBsm);
+    /**
+     * 档案归还
+     */
+    Result danganGh(UpdateDgLendRequest ghRequest);
+    /**
+     * 展示可以选择借阅的列表
+     * @param request
+     * @return
+     */
+    Result showArchivesForLend(ArchiveLendSearchRequest request);
      /**
      * 新增记录
      * @param request
      * @return
      */
     boolean insertDgLend(AddDgLendRequest request);
-
     /**
      * 根据主键查询记录详情
      * @param id
      * @return
      */
     DgLendDetailVO getDgLendDetailById(String id);
-
     /**
      * 修改单条记录
      * @param request
      * @return
      */
     boolean updateDgLend(UpdateDgLendRequest request);
-
+    /**
+     * 选择要借阅档案List
+     * @param archivesList
+     * @return
+     */
+    Result addDestructionArchivesInfo(List<AddDgLendCatalogRequest> archivesList);
     /**
      * 根据条件进行列表查询
+     * @param bsm_lend
+     * @return
+     */
+    Result queryArchivesInfo(String bsm_lend);
+    /**
+     *删除档案列表中的档案信息
+     */
+    Result deleteArchivesInfo(String bsm_lendcatalog);
+    /**
+     * 新增档案借阅列表中的借阅操作
+     * @param idList
+     * @return
+     */
+    Result updateStateByArchives(List<String> idList);
+    /**
+     * 借阅接口
+     * @param bsm_lend
+     * @return
+     */
+    Result updateArchivesStateByLend(String bsm_lend);
+    /**
+     * 批量借阅文件接口
      * @param request
      * @return
-    */
-    Page searchDgLendList(DgLendSearchRequest request);
+     */
+    Result insertDanganJyFile(List<AddDgLendFileRequest> request);
+
+
+
+
+
 }

 package com.pashanhoo.lend.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
+import com.pashanhoo.common.Result;
 import com.pashanhoo.lend.entity.DgLendConverter;
 import com.pashanhoo.lend.entity.DgLendDO;
-import com.pashanhoo.lend.entity.vo.AddDgLendRequest;
-import com.pashanhoo.lend.entity.vo.DgLendDetailVO;
-import com.pashanhoo.lend.entity.vo.UpdateDgLendRequest;
-import com.pashanhoo.lend.entity.vo.DgLendSearchRequest;
+import com.pashanhoo.lend.entity.vo.*;
 import com.pashanhoo.lend.mapper.DgLendMapper;
 import com.pashanhoo.lend.service.DgLendService;
+import com.pashanhoo.lendcatalog.entity.DgLendCatalogConverter;
+import com.pashanhoo.lendcatalog.entity.DgLendCatalogDO;
+import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
+import com.pashanhoo.lendcatalog.entity.vo.UpdateDgLendCatalogRequest;
+import com.pashanhoo.lendcatalog.service.DgLendCatalogService;
+import com.pashanhoo.lendfile.entity.DgLendFileConverter;
+import com.pashanhoo.lendfile.entity.DgLendFileDO;
+import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest;
+import com.pashanhoo.lendfile.service.DgLendFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -28,9 +40,69 @@ public class DgLendServiceImpl extends ServiceImpl<DgLendMapper, DgLendDO> imple
 
     @Autowired
     private DgLendConverter dglendConverter;
-
+    @Autowired
+    private DgLendCatalogConverter catalogConverter;
     @Autowired
     private DgLendMapper dglendMapper;
+    @Autowired
+    private DgLendCatalogService   catalogService;
+    @Autowired
+    private DgLendFileService  fileService;
+    @Autowired
+    private DgLendFileConverter fileConverter;
+    /**
+     * 根据条件进行列表查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result searchDgLendList(DgLendSearchRequest request) {
+        PageHelper.startPage(request.getCurrentPage(), request.getPageSize());
+        List<DgLendDetailVO> jyListVOList = dglendMapper.getDanganJyDetail(request);
+        PageInfo<DgLendDetailVO> pageInfo = new PageInfo<DgLendDetailVO>(jyListVOList);
+        return Result.ok(pageInfo);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result deleteDanganJyInfo(String lendBsm) {
+        //查询销毁记录是否存在，存在则删除
+        if(getDgLendDetailById(lendBsm)!=null){
+            dglendMapper.deleteById(lendBsm);
+        }
+        //查询销毁目录记录是否存在，存在则删除
+        List<String> jnmlList=new ArrayList<String>();
+        List<DgLendCatalogDO> catalogDOList= (List<DgLendCatalogDO>) catalogService.getJyMlInfo(lendBsm).getResult();
+        if(catalogDOList!=null){
+            catalogService.deleteJyMlInfo(lendBsm);
+            for (int i = 0; i <catalogDOList.size() ; i++) {
+                jnmlList.add(catalogDOList.get(i).getBsmLendcatalog());
+            }
+        }
+        //查询销毁目录文件记录是否存在，存在则删除
+        List<DgLendCatalogDO> list= (List<DgLendCatalogDO>) catalogService.getJyFileInfoByjybsm(jnmlList).getResult();
+        if(list!=null){
+            catalogService.deleteDanganJyBatch(list);
+        }
+        //修改档案信息表状态
+        dglendMapper.updateArchivesStatus(lendBsm,"4");
+        return Result.ok();
+    }
+
+    @Override
+    public Result danganGh(UpdateDgLendRequest ghRequest) {
+        DgLendDO lendDO=dglendConverter.updateRequest2DO(ghRequest);
+        dglendMapper.updateById(lendDO);
+        //修改档案信息表状态
+        dglendMapper.updateArchivesStatus(ghRequest.getBsmLend(),"4");
+        return Result.ok();
+    }
+
+    @Override
+    public Result showArchivesForLend(ArchiveLendSearchRequest request) {
+        List<ArchiveLendInfoRequestVO> list=dglendMapper.getArchiveLendInfo(request);
+        return Result.ok(list);
+    }
 
     /**
      * 新增记录
@@ -65,23 +137,51 @@ public class DgLendServiceImpl extends ServiceImpl<DgLendMapper, DgLendDO> imple
         return this.updateById(dglendDO);
     }
 
-    /**
-     * 根据条件进行列表查询
-     * @param request
-     * @return
-     */
     @Override
-    public Page searchDgLendList(DgLendSearchRequest request) {
-        Page<DgLendDO> pageParam = new Page<DgLendDO>(request.getCurrentPage(), request.getPageSize());
-        QueryWrapper<DgLendDO> wrapper = new QueryWrapper<>();
-        //设置默认排序
-        wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) :  wrapper.orderByAsc(request.getSortField());
+    public Result addDestructionArchivesInfo(List<AddDgLendCatalogRequest> archivesList) {
+        List<DgLendCatalogDO> lendCatalogDOS=catalogConverter.addCataLogListDO(archivesList);
+        catalogService.saveBatch(lendCatalogDOS);
+        return Result.ok();
+    }
+
+    @Override
+    public Result queryArchivesInfo(String bsm_lend) {
+        return Result.ok(dglendMapper.queryArchivesInfo(bsm_lend));
+    }
+
+    @Override
+    public Result deleteArchivesInfo(String bsm_lendcatalog) {
+        //删除目录信息
+        catalogService.deleteJyMlInfoByDA(bsm_lendcatalog);
+        //删除目录文件信息
+        fileService.deleteJyFile(bsm_lendcatalog);
+        return Result.ok();
+    }
+
+    @Override
+    public Result updateStateByArchives(List<String> idList) {
+        dglendMapper.updateArchivesStatusBatch(idList,"8");
+        return Result.ok();
+    }
 
-        //TODO 根据当前情况设置wrapper条件
+    @Override
+    public Result updateArchivesStateByLend(String bsm_destruction) {
+        //修改档案信息表状态
+        dglendMapper.updateArchivesStatus(bsm_destruction,"8");
+        return Result.ok();
+    }
 
-        Page page = this.page(pageParam, wrapper);
-        //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象
-        return page.setRecords(dglendConverter.doList2ListVOList(page.getRecords()));
+    @Override
+    public Result insertDanganJyFile(List<AddDgLendFileRequest> request) {
+        List<DgLendFileDO> list=fileConverter.addLendFileList(request);
+        fileService.saveBatch(list);
+        //通过目录标识修改目录表记录
+        UpdateDgLendCatalogRequest catalogRequest=new UpdateDgLendCatalogRequest();
+        catalogRequest.setBsmLendcatalog(request.get(0).getBsmLendcatalog());
+        catalogRequest.setJycllx(request.get(0).getJycllx());
+        catalogService.updateDgLendCatalog(catalogRequest);
+        return Result.ok();
     }
 
+
 }

@@ -3,14 +3,13 @@ package com.pashanhoo.lendcatalog.controller;
 import com.pashanhoo.common.Result;
 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
 import com.pashanhoo.lendcatalog.entity.vo.UpdateDgLendCatalogRequest;
-import com.pashanhoo.lendcatalog.entity.vo.DgLendCatalogSearchRequest;
 import com.pashanhoo.lendcatalog.service.DgLendCatalogService;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**
@@ -61,11 +60,5 @@ public class DgLendCatalogController {
         return Result.ok(dglendcatalogService.getDgLendCatalogDetailById(id));
     }
 
-    @PostMapping("search")
-    @ApiOperation(value = "根据条件进行列表查询")
-    public Result searchDgLendCatalogList(@RequestBody DgLendCatalogSearchRequest request) {
-        //TODO 默认排序条件设置
-        request.defaultFillPageProp("","");
-        return Result.ok(dglendcatalogService.searchDgLendCatalogList(request));
-    }
+
 }

@@ -23,4 +23,7 @@ public interface DgLendCatalogConverter{
     DgLendCatalogListVO do2ListVO(DgLendCatalogDO dglendcatalogDO);
 
     List<DgLendCatalogListVO> doList2ListVOList(List<DgLendCatalogDO> dglendcatalogDOList);
+
+    List<DgLendCatalogDO> addCataLogListDO(List<AddDgLendCatalogRequest> request);
+
 }

 package com.pashanhoo.lendcatalog.service;
 
+import com.pashanhoo.common.Result;
 import com.pashanhoo.lendcatalog.entity.DgLendCatalogDO;
 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
 import com.pashanhoo.lendcatalog.entity.vo.DgLendCatalogDetailVO;
@@ -8,6 +9,8 @@ import com.pashanhoo.lendcatalog.entity.vo.DgLendCatalogSearchRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 档案借阅目录 服务类
@@ -39,9 +42,35 @@ public interface DgLendCatalogService extends IService<DgLendCatalogDO> {
     boolean updateDgLendCatalog(UpdateDgLendCatalogRequest request);
 
     /**
-     * 根据条件进行列表查询
-     * @param request
+     * 查询借阅目录信息
+     * @param lendBsm
+     * @return
+     */
+    Result getJyMlInfo(String lendBsm);
+    /**
+     * 删除借阅目录信息
+     * @param lendBsm
      * @return
-    */
-    Page searchDgLendCatalogList(DgLendCatalogSearchRequest request);
+     */
+    Result deleteJyMlInfo(String lendBsm);
+    /**
+     * 通过借阅目录查询借阅的文件目录
+     * @param jnmlList
+     * @return
+     */
+    Result getJyFileInfoByjybsm(List<String> jnmlList);
+    /**
+     * 批量删除借阅文件记录
+     * @param jywjDOList
+     * @return
+     */
+    Result deleteDanganJyBatch(List<DgLendCatalogDO> jywjDOList);
+    /**
+     * 删除借阅目录信息
+     * @param bsm_lendcatalog
+     * @return
+     */
+    Result deleteJyMlInfoByDA(String bsm_lendcatalog);
+
+
 }

 package com.pashanhoo.lendcatalog.service.impl;
 
+import com.pashanhoo.common.Result;
 import com.pashanhoo.lendcatalog.entity.DgLendCatalogConverter;
 import com.pashanhoo.lendcatalog.entity.DgLendCatalogDO;
 import com.pashanhoo.lendcatalog.entity.vo.AddDgLendCatalogRequest;
@@ -15,6 +16,9 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 档案借阅目录 服务实现类
@@ -64,24 +68,42 @@ public class DgLendCatalogServiceImpl extends ServiceImpl<DgLendCatalogMapper, D
         DgLendCatalogDO dglendcatalogDO = dglendcatalogConverter.updateRequest2DO(request);
         return this.updateById(dglendcatalogDO);
     }
+    @Override
+    public Result getJyMlInfo(String lendBsm){
+        QueryWrapper<DgLendCatalogDO> wrapper = new QueryWrapper<>();
+        wrapper.eq(lendBsm!=null && !"".equals(lendBsm),"BSM_LEND",lendBsm);
+        List<DgLendCatalogDO> jymlDOListt=dglendcatalogMapper.selectList(wrapper);
+        return Result.ok(jymlDOListt);
+    }
+    @Override
+    public Result deleteJyMlInfo(String lendBsm){
+        QueryWrapper<DgLendCatalogDO> wrapper = new QueryWrapper<>();
+        wrapper.eq(lendBsm!=null && !"".equals(lendBsm),"BSM_LEND",lendBsm);
+        dglendcatalogMapper.delete(wrapper);
+        return Result.ok();
+    }
 
-    /**
-     * 根据条件进行列表查询
-     * @param request
-     * @return
-     */
     @Override
-    public Page searchDgLendCatalogList(DgLendCatalogSearchRequest request) {
-        Page<DgLendCatalogDO> pageParam = new Page<DgLendCatalogDO>(request.getCurrentPage(), request.getPageSize());
+    public Result getJyFileInfoByjybsm(List<String> jnmlList) {
         QueryWrapper<DgLendCatalogDO> wrapper = new QueryWrapper<>();
-        //设置默认排序
-        wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) :  wrapper.orderByAsc(request.getSortField());
+        wrapper.in("BSM_LENDCATALOG",jnmlList);
+        List<DgLendCatalogDO> list=dglendcatalogMapper.selectList(wrapper);
+        return Result.ok(list);
+    }
 
-        //TODO 根据当前情况设置wrapper条件
+    @Override
+    public Result deleteDanganJyBatch(List<DgLendCatalogDO> jywjDOList) {
+        QueryWrapper<DgLendCatalogDO> wrapper = new QueryWrapper<>();
+        wrapper.in("BSM_LENDCATALOG",jywjDOList);
+        dglendcatalogMapper.delete(wrapper);
+        return Result.ok();
+    }
 
-        Page page = this.page(pageParam, wrapper);
-        //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象
-        return page.setRecords(dglendcatalogConverter.doList2ListVOList(page.getRecords()));
+    @Override
+    public Result deleteJyMlInfoByDA(String bsm_lendcatalog) {
+        dglendcatalogMapper.deleteById(bsm_lendcatalog);
+        return Result.ok();
     }
 
+
 }

@@ -22,4 +22,6 @@ public interface DgLendFileConverter{
     DgLendFileListVO do2ListVO(DgLendFileDO dglendfileDO);
 
     List<DgLendFileListVO> doList2ListVOList(List<DgLendFileDO> dglendfileDOList);
+
+    List<DgLendFileDO> addLendFileList(List<AddDgLendFileRequest> request);
 }

@@ -34,5 +34,11 @@ public class AddDgLendFileRequest implements Serializable {
     @ApiModelProperty(name = "bsmCatalog", value = "目录标识码")
     private String bsmCatalog;
 
+    /**
+     * 借阅材料类型
+     */
+    @ApiModelProperty(name = "jycllx", value = "借阅材料类型")
+    private String jycllx;
+
 
 }

 package com.pashanhoo.lendfile.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.pashanhoo.common.Result;
 import com.pashanhoo.lendfile.entity.DgLendFileDO;
 import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest;
 import com.pashanhoo.lendfile.entity.vo.DgLendFileDetailVO;
@@ -44,4 +45,11 @@ public interface DgLendFileService extends IService<DgLendFileDO> {
      * @return
     */
     Page searchDgLendFileList(DgLendFileSearchRequest request);
+    /**
+     * 通过借阅目录标识码删除借阅文件信息
+     * @param bsm_lendcatalog
+     * @return
+     */
+    Result deleteJyFile(String  bsm_lendcatalog);
+
 }

 package com.pashanhoo.lendfile.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pashanhoo.common.Result;
+import com.pashanhoo.destroycatalog.entity.DgDestructionCatalogDO;
 import com.pashanhoo.lendfile.entity.DgLendFileConverter;
 import com.pashanhoo.lendfile.entity.DgLendFileDO;
 import com.pashanhoo.lendfile.entity.vo.AddDgLendFileRequest;
@@ -84,4 +86,16 @@ public class DgLendFileServiceImpl extends ServiceImpl<DgLendFileMapper, DgLendF
         return page.setRecords(dglendfileConverter.doList2ListVOList(page.getRecords()));
     }
 
+    @Override
+    public Result deleteJyFile(String bsm_lendcatalog) {
+        QueryWrapper<DgLendFileDO> wrapper = new QueryWrapper<>();
+        wrapper.eq(bsm_lendcatalog!=null && !"".equals(bsm_lendcatalog),"BSM_LENDCATALOG",bsm_lendcatalog);
+        int result=dglendfileMapper.delete(wrapper);
+        if(result!=0){
+            return  Result.ok();
+        }else{
+            return  Result.error("操作失败");
+        }
+    }
+
 }

@@ -74,11 +74,8 @@ public class DgStaffServiceImpl extends ServiceImpl<DgStaffMapper, DgStaffDO> im
     public Page searchDgStaffList(DgStaffSearchRequest request) {
         Page<DgStaffDO> pageParam = new Page<DgStaffDO>(request.getCurrentPage(), request.getPageSize());
         QueryWrapper<DgStaffDO> wrapper = new QueryWrapper<>();
-        //设置默认排序
-        wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) :  wrapper.orderByAsc(request.getSortField());
-
-        //TODO 根据当前情况设置wrapper条件
-
+        wrapper.eq(request.getStaffId()!=null && !"".equals(request.getStaffId()),"STAFF_ID",request.getStaffId());
+        wrapper.eq(request.getStaffPassword()!=null && !"".equals(request.getStaffPassword()),"STAFF_PASSWORD",request.getStaffPassword());
         Page page = this.page(pageParam, wrapper);
         //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象
         return page.setRecords(dgstaffConverter.doList2ListVOList(page.getRecords()));

@@ -111,7 +111,7 @@
         select * from  dg_archives b
         where exists (select 1
                       from DG_DESTRUCTION_CATALOG a
-                      where a.bsm_destruction = #{bsm_destruction,jdbcType=VARCHAR}
+                      where a.BSM_LEND = #{bsm_destruction,jdbcType=VARCHAR}
                         and b.bsm_archives = a.bsm_archives)
     </select>
 

@@ -3,24 +3,176 @@
 <mapper namespace="com.pashanhoo.lend.mapper.DgLendMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.pashanhoo.lend.entity.DgLendDO">
-        <id column="BSM_LEND" property="bsmLend" />
-        <result column="JYR" property="jyr" />
+    <resultMap id="BaseResultMap" type="com.pashanhoo.lend.entity.vo.DgLendDetailVO">
+        <id column="BSM_LEND" property="bsm_lend" />
+        <result column="JYSX" property="jyr" />
+        <result column="JYDH" property="jydw" />
+        <result column="AJH" property="ajh" />
+        <result column="JYFS" property="jyfs" />
         <result column="JYDW" property="jydw" />
-        <result column="LXDW" property="lxdw" />
-        <result column="TXDZ" property="txdz" />
-        <result column="JYRQ" property="jyrq" />
-        <result column="GHRQ" property="ghrq" />
-        <result column="PZR" property="pzr" />
-        <result column="JYQX" property="jyqx" />
-        <result column="JCLY" property="jcly" />
-        <result column="LYMD" property="lymd" />
+        <result column="JYR" property="jyr" />
+        <result column="QSSJ" property="qssj" />
+        <result column="JZRQ" property="jzrq" />
+        <result column="GHR" property="ghr" />
+        <result column="GHSJ" property="ghsj" />
+        <result column="JYZT" property="jyzt" />
+        <result column="DA_NUM" property="da_num" />
+    </resultMap>
+    <!-- 档案列表记录查询 -->
+    <resultMap id="ShowArchivesInfoResultMap" type="com.pashanhoo.archive.entity.vo.DgArchivesListVO">
+        <id column="BSM_ARCHIVES" property="bsmArchives" />
+        <result column="AJBT" property="ajbt" />
+        <result column="ZTC" property="ztc" />
+        <result column="FLH" property="flh" />
+        <result column="MLH" property="mlh" />
+        <result column="AJH" property="ajh" />
+        <result column="ND" property="nd" />
+        <result column="JS" property="js" />
+        <result column="YS" property="ys" />
+        <result column="BGQX" property="bgqx" />
+        <result column="QSRQ" property="qsrq" />
+        <result column="ZZRQ" property="zzrq" />
+        <result column="MJ" property="mj" />
+        <result column="HH" property="hh" />
+        <result column="CFWZ" property="cfwz" />
+        <result column="CJR" property="cjr" />
+        <result column="CJRQ" property="cjrq" />
+        <result column="HCR" property="hcr" />
         <result column="BZ" property="bz" />
-        <result column="PZSJ" property="pzsj" />
+        <result column="SMZT" property="smzt" />
+        <result column="DAZT" property="dazt" />
+        <result column="CDJGBM" property="cdjgbm" />
+        <result column="DALY" property="daly" />
+    </resultMap>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="ArchiveLendInfoResultMap" type="com.pashanhoo.lend.entity.vo.ArchiveLendInfoRequestVO">
+        <id column="BSM_ARCHIVES" property="bsm_archives" />
+        <result column="DAZT" property="dazt" />
+        <result column="AJH" property="ajh" />
+        <result column="BDCDYH" property="bdcdyh" />
+        <result column="QLLX" property="qllx" />
+        <result column="DJLX" property="djlx" />
+        <result column="QLR" property="qlr" />
+        <result column="YWR" property="ywr" />
+        <result column="ZJHM" property="zjhm" />
+        <result column="BDCDY_NUM" property="bdcdy_num" />
     </resultMap>
-
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         BSM_LEND, JYR, JYDW, LXDW, TXDZ, JYRQ, GHRQ, PZR, JYQX, JCLY, LYMD, BZ, PZSJ
     </sql>
+    <update id="updateArchivesStatus">
+        update dg_archives b
+        set b.dazt = #{dazt,jdbcType=VARCHAR}
+        where exists (select 1
+                      from DG_LEND_CATALOG a
+                      where a.BSM_LENDCATALOG = #{lendBsm,jdbcType=VARCHAR}
+                        and b.bsm_archives = a.bsm_archives)
+
+    </update>
+    <update id="updateArchivesStatusBatch">
+        update dg_archives b
+        set b.dazt = #{dazt,jdbcType=VARCHAR} where bsm_archives in
+        <foreach collection="idList" index="index" item="item"
+                 separator="," open="(" close=")">
+            #{item,jdbcType=VARCHAR}
+        </foreach>
+    </update>
+    <select id="getDanganJyDetail" resultMap="BaseResultMap">
+        select d.BSM_LEND,
+        d.jysx,
+        d.jydh,
+        d.ajh,
+        d.jyfs,
+        d.jydw,
+        d.jyr,
+        d.qssj,
+        d.jzrq,
+        d.ghr,
+        d.ghsj,
+        d.jyzt,count(1) over(partition by d.BSM_LEND order by d.jysx asc, d.jzrq asc, d.jyzt asc) da_num
+        from (select a.jy_bsm,
+        case
+        when a.jzrq &lt; sysdate and a.JYZT = '8' then
+        '0'
+        else
+        '1'
+        end as jysx,
+        a.jydh,
+        b.ajh,
+        a.jyfs,
+        a.jydw,
+        a.jyr,
+        a.qssj,
+        a.jzrq,
+        a.ghr,
+        a.ghsj,
+        a.jyzt
+        from dg_lend a, dg_archives b,dg_lend_catalog c,dg_bdcdy e,dg_business f
+        where b.BSM_ARCHIVES=c.BSM_ARCHIVES
+        and a.BSM_LEND=c.BSM_LEND
+        and e.BSM_ARCHIVES=b.BSM_ARCHIVES
+        and f.BSM_ARCHIVES=b.BSM_ARCHIVES
+        <if test="ajh != null and ajh!='' ">
+            and b.ajh=#{ajh,jdbcType=VARCHAR}
+        </if>
+        <if test="bdcdyh != null and bdcdyh!='' ">
+            and e.bdcdyh=#{bdcdyh,jdbcType=VARCHAR}
+        </if>
+        <if test="ywh != null and ywh!=''">
+            and f.ywh=#{ywh,jdbcType=VARCHAR}
+        </if>
+        <if test="bdcqzh != null and bdcqzh !='' ">
+            and e.zjhm=#{bdcqzh,jdbcType=VARCHAR}
+        </if>
+        <if test="jyr != null and jyr!='' ">
+            and a.jyr=#{jyr,jdbcType=VARCHAR}
+        </if>
+        <if test="jyzt != null and jyzt != '' ">
+            and a.jyzt=#{jyzt,jdbcType=VARCHAR}
+        </if>
+
+        ) d
+
+
+
+    </select>
+    <select id="queryArchivesInfo" resultMap="ShowArchivesInfoResultMap">
+        select * from  dg_archives b
+        where exists (select 1
+                      from DG_LEND_CATALOG a
+                      where a.BSM_LENDCATALOG = #{bsm_lend,jdbcType=VARCHAR}
+                        and b.bsm_archives = a.bsm_archives)
+    </select>
+    <select id="getArchiveLendInfo" resultType="com.pashanhoo.lend.entity.vo.ArchiveLendInfoRequestVO">
+        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
+        from dg_archives a, dg_business b, dg_bdcdy c
+        where a.bsm_archives = b.bsm_archives
+          and   a.bsm_archives=c.bsm_archives
+          and a.dazt='4'
+        <if test="ajh != null and ajh != '' ">
+            and a.ajh=#{ajh,jdbcType=VARCHAR}
+        </if>
+        <if test="ywh != null and ywh != '' ">
+            and b.ywh=#{ywh,jdbcType=VARCHAR}
+        </if>
+        <if test="bdcdyh != null and bdcdyh != '' ">
+            and c.bdcdyh=#{bdcdyh,jdbcType=VARCHAR}
+        </if>
+        <if test="zjhm != null and zjhm != '' ">
+            and c.zjhm=#{zjhm,jdbcType=VARCHAR}
+        </if>
+        <if test="qlr != null and qlr != '' ">
+            and c.qlr=#{qlr,jdbcType=VARCHAR}
+        </if>
+        <if test="ywr != null and ywr != '' ">
+            and c.ywr=#{ywr,jdbcType=VARCHAR}
+        </if>
+        <if test="cfwh != null and cfwh != '' ">
+            and c.zjhm=#{cfwh,jdbcType=VARCHAR}
+        </if>
+        <if test="qllx != null and qllx != '' ">
+            and c.qllx=#{qllx,jdbcType=VARCHAR}
+        </if>
+    </select>
 </mapper>