新增业务接收数据接口

@@ -23,4 +23,6 @@ public interface DgArchivesConverter{
     DgArchivesListVO do2ListVO(DgArchivesDO dgarchivesDO);
 
     List<DgArchivesListVO> doList2ListVOList(List<DgArchivesDO> dgarchivesDOList);
+
+    List<DgArchivesDO> addArchivesList(List<AddDgArchivesRequest> request);
 }

@@ -23,7 +23,11 @@ public class AddDgArchivesRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-
+    /**
+     * 案卷标识码
+     */
+    @ApiModelProperty(name = "bsm_archives", value = "案卷标识码")
+    private String bsm_archives;
     /**
     * 案卷标题
     */

@@ -23,4 +23,6 @@ public interface DgBdcdyConverter{
     DgBdcdyListVO do2ListVO(DgBdcdyDO dgbdcdyDO);
 
     List<DgBdcdyListVO> doList2ListVOList(List<DgBdcdyDO> dgbdcdyDOList);
+
+    List<DgBdcdyDO> addRequestListDO(List<AddDgBdcdyRequest> request);
 }

@@ -7,6 +7,7 @@ import com.pashanhoo.bdcdy.entity.vo.DgBdcdyDetailVO;
 import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest;
 import com.pashanhoo.bdcdy.entity.vo.DgBdcdySearchRequest;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pashanhoo.common.Result;
 
 /**
  * <p>
@@ -44,4 +45,10 @@ public interface DgBdcdyService extends IService<DgBdcdyDO> {
      * @return
     */
     Page searchDgBdcdyList(DgBdcdySearchRequest request);
+    /**
+     * 非主键修改单元信息
+     * @param request
+     * @return
+     */
+    Result updateDgBdcdyByArchive(UpdateDgBdcdyRequest request);
 }

@@ -9,6 +9,7 @@ import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest;
 import com.pashanhoo.bdcdy.entity.vo.DgBdcdySearchRequest;
 import com.pashanhoo.bdcdy.mapper.DgBdcdyMapper;
 import com.pashanhoo.bdcdy.service.DgBdcdyService;
+import com.pashanhoo.common.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -84,4 +85,13 @@ public class DgBdcdyServiceImpl extends ServiceImpl<DgBdcdyMapper, DgBdcdyDO> im
         return page.setRecords(dgbdcdyConverter.doList2ListVOList(page.getRecords()));
     }
 
+    @Override
+    public Result updateDgBdcdyByArchive(UpdateDgBdcdyRequest request) {
+        QueryWrapper<DgBdcdyDO> wrapper = new QueryWrapper<>();
+        wrapper.eq(request.getBsmArchives()!=null && !"".equals(request.getBsmArchives()),"BSM_ARCHIVES",request.getBsmArchives());
+        DgBdcdyDO bdcdyDO=dgbdcdyConverter.updateRequest2DO(request);
+        dgbdcdyMapper.update(bdcdyDO,wrapper);
+        return Result.ok();
+    }
+
 }

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -64,6 +66,16 @@ public class DgBusinessDO implements Serializable {
      */
     @TableField("DJJGMC")
     private String djjgmc;
+    /**
+     * 注销业务号
+     */
+    @TableField("ZXYWH")
+    private String zxywh;
+    /**
+     * 注销类型
+     */
+    @TableField("ZXLX")
+    private String zxlx;
 
 
 }

@@ -57,6 +57,15 @@ public class AddDgBusinessRequest implements Serializable {
     */
     @ApiModelProperty(name = "djjgmc", value = "登记机构名称")
     private String djjgmc;
-
+    /**
+     * 注销业务号
+     */
+    @ApiModelProperty(name = "zxywh", value = "注销业务号")
+    private String zxywh;
+    /**
+     * 注销类型
+     */
+    @ApiModelProperty(name = "zxlx", value = "注销类型")
+    private String zxlx;
 
 }

@@ -18,7 +18,6 @@ import com.pashanhoo.common.PageInfo;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="档案业务信息列表查询请求实体")
-//TODO 初始查询条件是全部，需要根据情况自行删减
 public class DgBusinessSearchRequest extends PageInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -64,6 +63,15 @@ public class DgBusinessSearchRequest extends PageInfo implements Serializable {
      */
     @ApiModelProperty(name = "djjgmc", value = "登记机构名称")
     private String djjgmc;
-
+    /**
+     * 注销业务号
+     */
+    @ApiModelProperty(name = "zxywh", value = "注销业务号")
+    private String zxywh;
+    /**
+     * 注销类型
+     */
+    @ApiModelProperty(name = "zxlx", value = "注销类型")
+    private String zxlx;
 
 }

@@ -45,4 +45,11 @@ public interface DgBusinessService extends IService<DgBusinessDO> {
      * @return
     */
     Page searchDgBusinessList(DgBusinessSearchRequest request);
+
+    /**
+     *
+     * @param request
+     * @return
+     */
+    DgBusinessDO searchDgBusiness(DgBusinessSearchRequest request);
 }

@@ -77,11 +77,19 @@ public class DgBusinessServiceImpl extends ServiceImpl<DgBusinessMapper, DgBusin
         //设置默认排序
         wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) :  wrapper.orderByAsc(request.getSortField());
 
-        //TODO 根据当前情况设置wrapper条件
 
         Page page = this.page(pageParam, wrapper);
         //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象
         return page.setRecords(dgbusinessConverter.doList2ListVOList(page.getRecords()));
     }
 
+    @Override
+    public DgBusinessDO searchDgBusiness(DgBusinessSearchRequest request) {
+        QueryWrapper<DgBusinessDO> wrapper = new QueryWrapper<>();
+        wrapper.eq(request.getYwh()!=null && !"".equals(request.getYwh()),"YWH",request.getYwh());
+        wrapper.eq(request.getZxywh()!=null && !"".equals(request.getZxywh()),"ZXYWH",request.getZxywh());
+        DgBusinessDO businessDO= dgbusinessMapper.selectOne(wrapper);
+        return businessDO;
+    }
+
 }

 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.ArchiveLendSearchRequest;
@@ -40,7 +39,7 @@ public class DgLendController {
     }
     @PostMapping("deleteDanganJyInfo")
     @ApiOperation("通过借阅标识码删除借阅记录信息")
-    public Result deleteDanganJyInfo(@RequestParam String lendBsm){
+    public Result deleteDanganJyInfo(@ApiParam("档案借阅记录ID") @RequestParam String lendBsm){
         return dglendService.deleteDanganJyInfo(lendBsm);
     }
     @PostMapping("danganGh")

@@ -90,7 +90,9 @@ public class DgLendServiceImpl extends ServiceImpl<DgLendMapper, DgLendDO> imple
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result danganGh(UpdateDgLendRequest ghRequest) {
+        //新增借阅记录表归还信息数据
         DgLendDO lendDO=dglendConverter.updateRequest2DO(ghRequest);
         dglendMapper.updateById(lendDO);
         //修改档案信息表状态

@@ -31,10 +31,7 @@ public class DgReceiveController {
     @PostMapping("insertDgReceive")
     @ApiOperation("新增档案接收记录")
     public Result insertDgReceive(@RequestBody AddDgReceiveRequest request){
-        if(dgreceiveService.insertDgReceive(request)){
-            return Result.ok();
-        }
-        return Result.error("新增失败");
+        return dgreceiveService.insertDgReceive(request);
     }
 
     @DeleteMapping("deleteDgReceiveByIds")

@@ -3,6 +3,10 @@ package com.pashanhoo.receive.entity.vo;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.io.Serializable;
+import java.util.List;
+
+import com.pashanhoo.bdcdy.entity.vo.AddDgBdcdyRequest;
+import com.pashanhoo.business.entity.vo.AddDgBusinessRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,121 +26,101 @@ import lombok.EqualsAndHashCode;
 public class AddDgReceiveRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
-
+    /**
+     * 主键
+     */
+    @ApiModelProperty(name = "bms_receive", value = "主键")
+    private String bms_receive;
     /**
     * 业务来源编码
     */
     @ApiModelProperty(name = "ywlyjbm", value = "业务来源编码")
     private String ywlyjbm;
-
     /**
     * 权利类型
     */
     @ApiModelProperty(name = "qllx", value = "权利类型")
     private String qllx;
-
     /**
     * 登记类型
     */
     @ApiModelProperty(name = "djlx", value = "登记类型")
     private String djlx;
-
     /**
     * 收件人员
     */
     @ApiModelProperty(name = "sjry", value = "收件人员")
     private String sjry;
-
     /**
     * 收件时间
     */
     @ApiModelProperty(name = "sjsj", value = "收件时间")
     private Date sjsj;
-
     /**
     * 业务号
     */
     @ApiModelProperty(name = "ywh", value = "业务号")
     private String ywh;
-
     /**
     * 不动产单元号
     */
     @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
     private String bdcdyh;
-
     /**
     * 单元总数
     */
     @ApiModelProperty(name = "dyzs", value = "单元总数")
     private BigDecimal dyzs;
-
     /**
     * 不动产权证号
     */
     @ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
     private String bdcqzh;
-
     /**
     * 权利人
     */
     @ApiModelProperty(name = "qlr", value = "权利人")
     private String qlr;
-
     /**
     * 权利人证件号码
     */
     @ApiModelProperty(name = "zjhm", value = "权利人证件号码")
     private String zjhm;
-
     /**
     * 义务人
     */
     @ApiModelProperty(name = "ywr", value = "义务人")
     private String ywr;
-
     /**
     * 坐落
     */
     @ApiModelProperty(name = "zl", value = "坐落")
     private String zl;
-
     /**
     * 登记时间
     */
     @ApiModelProperty(name = "djsj", value = "登记时间")
     private Date djsj;
-
     /**
     * 接收时间
     */
     @ApiModelProperty(name = "jssj", value = "接收时间")
     private Date jssj;
-
     /**
     * 推送机构编码
     */
     @ApiModelProperty(name = "tsjgbm", value = "推送机构编码")
     private String tsjgbm;
-
-    /**
-    * 归档方式(1：按业务归档，2：按单元归档，3：档案补充归档)
-    */
-    @ApiModelProperty(name = "gdfs", value = "归档方式(1：按业务归档，2：按单元归档，3：档案补充归档)")
-    private String gdfs;
-
     /**
-    * 归档时间
+     * 推送业务信息
      */
-    @ApiModelProperty(name = "gdsj", value = "归档时间")
-    private Date gdsj;
-
+    @ApiModelProperty(name = "businessRequest", value = "推送业务信息")
+    private AddDgBusinessRequest businessRequest;
     /**
-    * 整理状态(0：待处理，1：已归档)
+     * 不动产单元信息
      */
-    @ApiModelProperty(name = "state", value = "整理状态(0：待处理，1：已归档)")
-    private String state;
+    @ApiModelProperty(name = "businessRequest", value = "推送业务信息")
+    private List<AddDgBdcdyRequest> bdcdyRequestList;
 
 
 }

 package com.pashanhoo.receive.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.pashanhoo.common.Result;
 import com.pashanhoo.receive.entity.DgReceiveDO;
 import com.pashanhoo.receive.entity.vo.AddDgReceiveRequest;
 import com.pashanhoo.receive.entity.vo.DgReceiveDetailVO;
@@ -22,7 +23,7 @@ public interface DgReceiveService extends IService<DgReceiveDO> {
      * @param request
      * @return
      */
-    boolean insertDgReceive(AddDgReceiveRequest request);
+    Result insertDgReceive(AddDgReceiveRequest request);
 
     /**
      * 根据主键查询记录详情

 package com.pashanhoo.receive.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pashanhoo.archive.entity.DgArchivesConverter;
+import com.pashanhoo.archive.entity.DgArchivesDO;
+import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
+import com.pashanhoo.archive.service.DgArchivesService;
+import com.pashanhoo.bdcdy.entity.DgBdcdyConverter;
+import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
+import com.pashanhoo.bdcdy.entity.vo.AddDgBdcdyRequest;
+import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest;
+import com.pashanhoo.bdcdy.service.DgBdcdyService;
+import com.pashanhoo.business.entity.DgBusinessDO;
+import com.pashanhoo.business.entity.vo.AddDgBusinessRequest;
+import com.pashanhoo.business.entity.vo.DgBusinessSearchRequest;
+import com.pashanhoo.business.mapper.DgBusinessMapper;
+import com.pashanhoo.business.service.DgBusinessService;
+import com.pashanhoo.common.Result;
 import com.pashanhoo.receive.entity.DgReceiveConverter;
 import com.pashanhoo.receive.entity.DgReceiveDO;
 import com.pashanhoo.receive.entity.vo.AddDgReceiveRequest;
@@ -9,12 +25,21 @@ import com.pashanhoo.receive.entity.vo.UpdateDgReceiveRequest;
 import com.pashanhoo.receive.entity.vo.DgReceiveSearchRequest;
 import com.pashanhoo.receive.mapper.DgReceiveMapper;
 import com.pashanhoo.receive.service.DgReceiveService;
+import com.pashanhoo.receiverelation.entity.DgReceiveRelationConverter;
+import com.pashanhoo.receiverelation.entity.DgReceiveRelationDO;
+import com.pashanhoo.receiverelation.entity.vo.AddDgReceiveRelationRequest;
+import com.pashanhoo.receiverelation.service.DgReceiveRelationService;
 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 java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 档案接收记录 服务实现类
@@ -28,9 +53,24 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive
 
     @Autowired
     private DgReceiveConverter dgreceiveConverter;
-
+    @Autowired
+    private DgBdcdyConverter bdcdyConverter;
     @Autowired
     private DgReceiveMapper dgreceiveMapper;
+    @Autowired
+    private DgBusinessService businessService;
+    @Autowired
+    private DgBusinessMapper  businessMapper;
+    @Autowired
+    private DgBdcdyService  bdcdyService;
+    @Autowired
+    private DgArchivesService  archivesService;
+    @Autowired
+    private DgArchivesConverter  archivesConverter;
+    @Autowired
+    private DgReceiveRelationService  relationService;
+    @Autowired
+    private DgReceiveRelationConverter  relationConverter;
 
     /**
      * 新增记录
@@ -38,9 +78,89 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive
      * @return
      */
     @Override
-    public boolean insertDgReceive(AddDgReceiveRequest request) {
+    public Result insertDgReceive(AddDgReceiveRequest request) {
+        //获取接收编码
+        String receiveBsm= IdWorker.get32UUID();
+        request.setBms_receive(receiveBsm);
+        //新增接收表信息=============start===========
         DgReceiveDO dgreceiveDO = dgreceiveConverter.addRequest2DO(request);
-        return this.save(dgreceiveDO);
+        //TODO获取归档方式
+        if(dgreceiveDO.getGdfs()==null || "".equals(dgreceiveDO.getGdfs())){
+            dgreceiveDO.setGdfs("1");
+        }
+        this.save(dgreceiveDO);
+        //新增接收表信息=============end===========
+        //获取登记传入的不动产单元List集合数据
+        List<AddDgBdcdyRequest>  bdcdyRequestList=request.getBdcdyRequestList();
+        //获取登记传入的业务数据
+        AddDgBusinessRequest businessRequest=request.getBusinessRequest();
+        //归档方式(1：按业务归档，2：按单元归档，3：档案补充归档)
+        if("1".equals(dgreceiveDO.getGdfs())){
+            //新增档案表基础信息
+            AddDgArchivesRequest  archivesRequest=new  AddDgArchivesRequest();
+            String bsm_archives= IdWorker.get32UUID();
+            archivesRequest.setBsm_archives(bsm_archives);
+            archivesRequest.setDazt(new BigDecimal("1"));
+            archivesService.insertDgArchives(archivesRequest);
+            //新增接收表和档案表关联关系表
+            AddDgReceiveRelationRequest relationRequest=new AddDgReceiveRelationRequest();
+            relationRequest.setBmsReceive(receiveBsm);
+            relationRequest.setBsmArchives(bsm_archives);
+            relationService.insertDgReceiveRelation(relationRequest);
+        }else if("2".equals(dgreceiveDO.getGdfs())){
+            List<AddDgReceiveRelationRequest> relationRequestList=new ArrayList<AddDgReceiveRelationRequest>();
+            List<AddDgArchivesRequest>  archivesRequest=new ArrayList<AddDgArchivesRequest>(bdcdyRequestList.size());
+            AddDgArchivesRequest  request1=null;
+            AddDgReceiveRelationRequest receiveRelationRequest=null;
+            for (int i = 0; i < bdcdyRequestList.size(); i++) {
+                //组装档案表基础信息
+                String bsm_archives= IdWorker.get32UUID();
+                request1=new  AddDgArchivesRequest();
+                request1.setBsm_archives(bsm_archives);
+                request1.setDazt(new BigDecimal("1"));
+                archivesRequest.add(request1);
+                //组装接收表和档案表关联关系表
+                receiveRelationRequest=new AddDgReceiveRelationRequest();
+                receiveRelationRequest.setBmsReceive(receiveBsm);
+                receiveRelationRequest.setBsmArchives(bsm_archives);
+                relationRequestList.add(receiveRelationRequest);
+            }
+            //批量新增接收表和档案表关联关系表
+            List<DgReceiveRelationDO> receiveRelationDOList=relationConverter.addReceiveRelationList(relationRequestList);
+            relationService.saveBatch(receiveRelationDOList);
+            //批量新增档案表基础信息
+            List<DgArchivesDO> archivesDOList=archivesConverter.addArchivesList(archivesRequest);
+            archivesService.saveBatch(archivesDOList);
+        }else if("3".equals(dgreceiveDO.getGdfs())){
+            //通过业务号和注销业务号查询业务表是否有数据，有数据则修改
+            DgBusinessSearchRequest request2=new DgBusinessSearchRequest();
+            request2.setYwh(businessRequest.getYwh());
+            request2.setZxywh(businessRequest.getZxywh());
+            DgBusinessDO businessDO=businessService.searchDgBusiness(request2);
+            if(businessDO!=null){
+                businessDO.setZxlx(businessRequest.getZxlx());
+                //更新业务表中的注销类型
+                businessMapper.updateById(businessDO);
+                Date zxsj=null;
+                for (int i = 0; i < bdcdyRequestList.size(); i++) {
+                    if(businessDO.getBsmArchives().equals(bdcdyRequestList.get(i).getBsmArchives())){
+                        zxsj=bdcdyRequestList.get(i).getZxsj();
+                       break;
+                    }
+                }
+                //更新不动产单元表中的注销时间
+                UpdateDgBdcdyRequest updateDgBdcdyRequest=new UpdateDgBdcdyRequest();
+                updateDgBdcdyRequest.setBsmArchives(businessDO.getBsmArchives());
+                updateDgBdcdyRequest.setZxsj(zxsj);
+                bdcdyService.updateDgBdcdyByArchive(updateDgBdcdyRequest);
+            }
+        }
+        //新增业务表
+        businessService.insertDgBusiness(businessRequest);
+        //新增不动产单元号表
+        List<DgBdcdyDO> bdcdyDOList=bdcdyConverter.addRequestListDO(bdcdyRequestList);
+        bdcdyService.saveBatch(bdcdyDOList);
+        return  Result.ok();
     }
 
     /**

@@ -22,4 +22,6 @@ public interface DgReceiveRelationConverter{
     DgReceiveRelationListVO do2ListVO(DgReceiveRelationDO dgreceiverelationDO);
 
     List<DgReceiveRelationListVO> doList2ListVOList(List<DgReceiveRelationDO> dgreceiverelationDOList);
+
+    List<DgReceiveRelationDO> addReceiveRelationList(List<AddDgReceiveRelationRequest> request);
 }