Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
8875d2fa by 荆蔚杰
Options

档案信息列表（查找） 

案卷封皮展示
档案基本信息展示
案卷基本信息修改
1 parent 9878f474
Inline Side-by-side
Showing 18 changed files with 426 additions and 107 deletions
package com.pashanhoo.archive.controller;
import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pashanhoo.archive.entity.vo.*;
import com.pashanhoo.archive.service.DgArchivesService;
import com.pashanhoo.common.Result;
import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
......@@ -48,26 +47,32 @@ public class DgArchivesController {
}
@PutMapping("updateDgArchives")
@ApiOperation("修改案卷基本信息")
public Result updateDgArchives(@RequestBody UpdateDgArchivesRequest request){
if(dgarchivesService.updateDgArchives(request)) {
@ApiOperation("修改案卷基本信息,业务信息,不动产信息")
public Result updateDgArchives(@RequestBody UpdateArchiveAndOtherInfoRequest request){
if(dgarchivesService.updateDgArchivesReplenish(request)) {
return Result.ok("修改成功");
}
return Result.error("修改失败");
}
@GetMapping("getDgArchivesDetailById")
@ApiOperation(value = "读取明细")
public Result getDgArchivesDetailById(@ApiParam("案卷基本信息ID") @RequestParam String id){
return Result.ok(dgarchivesService.getDgArchivesDetailById(id));
@ApiOperation(value = "案卷基本信息")
public Result getDgArchivesDetailById(@ApiParam("案卷标识码") @RequestParam String bsmArchive){
return Result.ok(dgarchivesService.getDgArchivesDetailById(bsmArchive));
}
@PostMapping("search")
@ApiOperation(value = "根据条件进行列表查询")
public Result searchDgArchivesList(@RequestBody DgArchivesSearchRequest request) {
//TODO 默认排序条件设置
request.defaultFillPageProp("","");
return Result.ok(dgarchivesService.searchDgArchivesList(request));
@PostMapping("searchArchives")
@ApiOperation(value = "档案查找")
public Result<IPage<SearchArchiveVO>> searchArchives(@RequestBody SearchArchiveRequest request) {
return Result.ok(dgarchivesService.searchArchive(request));
}
@GetMapping("searchArchivesCover")
@ApiOperation(value = "案卷封皮信息查找")
public Result<ArchiveDetailAndCoverVO> searchArchivesCover(@ApiParam("档案标识码") @RequestParam String bsmArchive) {
return Result.ok(dgarchivesService.searchArchivesCover(bsmArchive));
}
/**
......
package com.pashanhoo.archive.entity.vo;
import com.pashanhoo.bdcdy.entity.vo.DgBdcdyDetailVO;
import com.pashanhoo.business.entity.vo.DgBusinessDetailVO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.List;
/**
* 档案封皮返回实体
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "档案封皮和案卷信息返回实体")
public class ArchiveDetailAndCoverVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 案卷基本信息实体
*/
private DgArchivesDetailVO dgArchivesDetailVO;
/**
* 不动产信息实体集合
*/
private List<DgBdcdyDetailVO> dgBdcdyDetailVOList;
/**
* 业务信息实体
*/
private DgBusinessDetailVO dgBusinessDetailVO;
}
package com.pashanhoo.archive.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 SearchArchiveRequest extends PageInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 档案号
*/
@ApiModelProperty(name = "ajh", value = "档案号")
private String ajh;
/**
* 目录号
*/
@ApiModelProperty(name = "mlh", value = "目录号")
private String mlh;
/**
* 盒号
*/
@ApiModelProperty(name = "hh", value = "盒号")
private String hh;
/**
* 档案状态
* (1：正在接收；2：正在补录；3：正在修改；4：在库；5：正在销毁；6：已销毁；7：正在借阅；8：已借阅)
*/
@ApiModelProperty(name = "dazt", value = "档案状态.1：正在接收；2：正在补录；3：正在修改；4：在库；5：正在销毁；6：已销毁；7：正在借阅；8：已借阅")
private String dazt;
/**
* 业务号
*/
@ApiModelProperty(name = "ywh", value = "业务号")
private String ywh;
/**
* 不动产权证号
*/
@ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
private String bdcqzh;
/**
* 不动产单元号
*/
@ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
private String bdcdyh;
/**
* 权利类型
*/
@ApiModelProperty(name = "qllx", value = "权利类型")
private String qllx;
}
package com.pashanhoo.archive.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="档案查找返回实体")
public class SearchArchiveVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 序号
*/
@ApiModelProperty(name = "xh", value = "序号")
private String xh;
/**
* 档案标识码
*/
@ApiModelProperty(name = "bsmArchive", value = "档案标识码")
private String bsmArchive;
/**
* 档案状态
* (1：正在接收；2：正在补录；3：正在修改；4：在库；5：正在销毁；6：已销毁；7：正在借阅；8：已借阅)
*/
@ApiModelProperty(name = "dazt", value = "档案状态.1：正在接收；2：正在补录；3：正在修改；4：在库；5：正在销毁；6：已销毁；7：正在借阅；8：已借阅")
private String dazt;
/**
* 档案来源
* 1:不动产归档.2:存量档案补录
*/
@ApiModelProperty(name = "daly", value = "档案来源")
private String daly;
/**
* 档案号
*/
@ApiModelProperty(name = "ajh", value = "档案号")
private String ajh;
/**
* 存放位置
*/
@ApiModelProperty(name = "cfwz", value = "存放位置")
private String cfwz;
/**
* 盒号
*/
@ApiModelProperty(name = "hh", value = "盒号")
private String hh;
/**
* 不动产权证号
*/
@ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
private String bdcqzh;
/**
* 权利人
*/
@ApiModelProperty(name = "qlr", value = "权利人")
private String qlr;
/**
* 义务人
*/
@ApiModelProperty(name = "ywr", value = "义务人")
private String ywr;
/**
* 业务号
*/
@ApiModelProperty(name = "ywh", value = "业务号")
private String ywh;
/**
* 不动产单元号
*/
@ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
private String bdcdyh;
/**
* 权利类型
*/
@ApiModelProperty(name = "qllx", value = "权利类型")
private String qllx;
}
package com.pashanhoo.replenish.entity.vo;
package com.pashanhoo.archive.entity.vo;
import java.io.Serializable;
import java.util.List;
import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
import com.pashanhoo.bdcdy.entity.vo.AddDgBdcdyRequest;
import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest;
import com.pashanhoo.business.entity.vo.AddDgBusinessRequest;
import com.pashanhoo.business.entity.vo.UpdateDgBusinessRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -16,7 +12,7 @@ import lombok.EqualsAndHashCode;
/**
* <p>
* 档案补录信息修改请求实体
* 档案信息,业务信息,不动产单元修改请求实体
* </p>
*
* @author
......@@ -24,8 +20,8 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "档案补录信息修改请求实体")
public class UpdateDgArchivesReplenishRequest implements Serializable {
@ApiModel(value = "档案信息,业务信息,不动产单元修改请求实体")
public class UpdateArchiveAndOtherInfoRequest implements Serializable {
private static final long serialVersionUID = 1L;
......
......@@ -2,10 +2,13 @@ package com.pashanhoo.archive.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>
......@@ -86,12 +89,16 @@ public class UpdateDgArchivesRequest implements Serializable {
* 起始日期
*/
@ApiModelProperty(name = "qsrq", value = "起始日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date qsrq;
/**
* 终止日期
*/
@ApiModelProperty(name = "zzrq", value = "终止日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date zzrq;
/**
......@@ -122,6 +129,8 @@ public class UpdateDgArchivesRequest implements Serializable {
* 创建日期
*/
@ApiModelProperty(name = "cjrq", value = "创建日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date cjrq;
/**
......
......@@ -2,7 +2,10 @@ package com.pashanhoo.archive.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pashanhoo.archive.entity.DgArchivesDO;
import com.pashanhoo.archive.entity.vo.SearchArchiveRequest;
import com.pashanhoo.archive.entity.vo.SearchArchiveVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -19,4 +22,6 @@ public interface DgArchivesMapper extends BaseMapper<DgArchivesDO> {
boolean updateArchivesInfoByReceiveIdList(@Param("idList") List<String> idList,@Param("dazt") String dazt);
IPage<SearchArchiveVO> searchArchive(@Param("pageParam") IPage<SearchArchiveVO> pageParam, @Param("request") SearchArchiveRequest request);
}
......
package com.pashanhoo.archive.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.pashanhoo.archive.entity.DgArchivesDO;
import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
import com.pashanhoo.archive.entity.vo.DgArchivesDetailVO;
import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
import com.pashanhoo.archive.entity.vo.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
......@@ -27,18 +25,19 @@ public interface DgArchivesService extends IService<DgArchivesDO> {
boolean insertDgArchives(AddDgArchivesRequest request);
/**
* 根据主键查询记录详情
* @param id
* 查询案卷基本信息
* @param bsmArchive
* @return
*/
DgArchivesDetailVO getDgArchivesDetailById(String id);
ArchiveDetailAndCoverVO getDgArchivesDetailById(String bsmArchive);
/**
* 修改单条记录
* 修改案卷基本信息,业务信息,不动产信息
*
* @param request
* @return
*/
boolean updateDgArchives(UpdateDgArchivesRequest request);
boolean updateDgArchivesReplenish(UpdateArchiveAndOtherInfoRequest request);
/**
* 根据条件进行列表查询
......@@ -53,4 +52,18 @@ public interface DgArchivesService extends IService<DgArchivesDO> {
* @return
*/
List getArchiveLiftMenu(String bsmArchives);
/**
* 档案查找
* @param request
* @return
*/
IPage<SearchArchiveVO> searchArchive(SearchArchiveRequest request);
/**
* 档案封皮查找
* @param bsmArchive
* @return
*/
ArchiveDetailAndCoverVO searchArchivesCover(String bsmArchive);
}
......
package com.pashanhoo.archive.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.entity.vo.DgArchivesDetailVO;
import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
import com.pashanhoo.archive.entity.vo.*;
import com.pashanhoo.archive.mapper.DgArchivesMapper;
import com.pashanhoo.archive.service.DgArchivesService;
import com.pashanhoo.bdcdy.entity.DgBdcdyConverter;
import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
import com.pashanhoo.bdcdy.entity.vo.DgBdcdyDetailVO;
import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest;
import com.pashanhoo.bdcdy.mapper.DgBdcdyMapper;
import com.pashanhoo.bdcdy.service.DgBdcdyService;
import com.pashanhoo.business.entity.DgBusinessConverter;
import com.pashanhoo.business.entity.DgBusinessDO;
import com.pashanhoo.business.entity.vo.DgBusinessDetailVO;
import com.pashanhoo.business.entity.vo.UpdateDgBusinessRequest;
import com.pashanhoo.business.service.DgBusinessService;
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;
......@@ -43,6 +50,15 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
@Autowired
private DgBdcdyMapper dgBdcdyMapper;
@Autowired
private DgBdcdyConverter dgBdcdyConverter;
@Autowired
private DgBusinessService dgBusinessService;
@Autowired
private DgBusinessConverter dgBusinessConverter;
/**
* 新增记录
* @param request
......@@ -55,25 +71,55 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
}
/**
* 根据主键查询记录详情
* @param id
* 查询案卷基本信息
* @param bsmArchive
* @return
*/
@Override
public DgArchivesDetailVO getDgArchivesDetailById(String id) {
DgArchivesDO dgarchivesDO = this.getById(id);
return dgarchivesConverter.do2DetailVO(dgarchivesDO);
public ArchiveDetailAndCoverVO getDgArchivesDetailById(String bsmArchive) {
ArchiveDetailAndCoverVO detailAndCoverVO = getCover(bsmArchive);
//查询业务信息
QueryWrapper<DgBusinessDO> businessWrapper = new QueryWrapper<>();
businessWrapper.lambda().eq(DgBusinessDO::getBsmArchives, bsmArchive);
DgBusinessDO businessDO = dgBusinessService.getOne(businessWrapper);
DgBusinessDetailVO dgBusinessDetailVO = dgBusinessConverter.do2DetailVO(businessDO);
detailAndCoverVO.setDgBusinessDetailVO(dgBusinessDetailVO);
return detailAndCoverVO;
}
/**
* 修改单条记录
* 修改案卷基本信息,业务信息,不动产信息
*
* @param request
* @return
*/
@Override
public boolean updateDgArchives(UpdateDgArchivesRequest request) {
DgArchivesDO dgarchivesDO = dgarchivesConverter.updateRequest2DO(request);
return this.updateById(dgarchivesDO);
@Transactional(rollbackFor = Exception.class)
public boolean updateDgArchivesReplenish(UpdateArchiveAndOtherInfoRequest request) {
//修改案卷基本信息
UpdateDgArchivesRequest updateDgArchivesRequest = request.getUpdateDgArchivesRequest();
DgArchivesDO dgArchivesDO = dgarchivesConverter.updateRequest2DO(updateDgArchivesRequest);
String bsmArchives = dgArchivesDO.getBsmArchives();
this.updateById(dgArchivesDO);
//修改不动产信息,先删除.后插入
List<UpdateDgBdcdyRequest> updateDgBdcdyRequests = request.getUpdateDgBdcdyRequests();
List<DgBdcdyDO> dgBdcdyDOS = dgBdcdyConverter.voList2DoList(updateDgBdcdyRequests);
//删除
QueryWrapper<DgBdcdyDO> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchives);
dgBdcdyService.remove(wrapper);
//插入
dgBdcdyService.saveBatch(dgBdcdyDOS);
//修改业务信息
UpdateDgBusinessRequest updateDgBusinessRequest = request.getUpdateDgBusinessRequest();
DgBusinessDO dgBusinessDO = dgBusinessConverter.updateRequest2DO(updateDgBusinessRequest);
QueryWrapper<DgBusinessDO> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(DgBusinessDO::getBsmArchives, bsmArchives);
return dgBusinessService.update(dgBusinessDO, queryWrapper);
}
/**
......@@ -136,4 +182,42 @@ public class DgArchivesServiceImpl extends ServiceImpl<DgArchivesMapper, DgArchi
}
return dgBdcdyDOS;
}
/**
* 档案查找
* @param request
* @return
*/
@Override
public IPage<SearchArchiveVO> searchArchive(SearchArchiveRequest request) {
IPage<SearchArchiveVO> pageParam = new Page<>(request.getCurrentPage(), request.getPageSize());
return dgarchivesMapper.searchArchive(pageParam, request);
}
/**
* 档案封皮查找
* @param bsmArchive
* @return
*/
@Override
public ArchiveDetailAndCoverVO searchArchivesCover(String bsmArchive) {
return getCover(bsmArchive);
}
private ArchiveDetailAndCoverVO getCover(String bsmArchive) {
DgArchivesDO archivesDO = this.getById(bsmArchive);
DgArchivesDetailVO dgArchivesDetailVO = dgarchivesConverter.do2DetailVO(archivesDO);
QueryWrapper<DgBdcdyDO> bdcdyWrapper = new QueryWrapper<>();
bdcdyWrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchive);
List<DgBdcdyDO> bdcdyDOS = dgBdcdyService.list(bdcdyWrapper);
List<DgBdcdyDetailVO> bdcdyDetailVOList = dgBdcdyConverter.do2DetailVOList(bdcdyDOS);
ArchiveDetailAndCoverVO archiveDetailAndCoverVO = new ArchiveDetailAndCoverVO();
archiveDetailAndCoverVO.setDgArchivesDetailVO(dgArchivesDetailVO);
archiveDetailAndCoverVO.setDgBdcdyDetailVOList(bdcdyDetailVOList);
return archiveDetailAndCoverVO;
}
}
......
......@@ -27,4 +27,6 @@ public interface DgBdcdyConverter{
List<DgBdcdyDO> addRequestListDO(List<AddDgBdcdyRequest> request);
List<DgBdcdyDO> voList2DoList(List<UpdateDgBdcdyRequest> requests);
List<DgBdcdyDetailVO> do2DetailVOList(List<DgBdcdyDO> bdcdyDOS);
}
......
......@@ -2,10 +2,13 @@ package com.pashanhoo.bdcdy.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>
......@@ -86,12 +89,16 @@ public class UpdateDgBdcdyRequest implements Serializable {
* 登记时间
*/
@ApiModelProperty(name = "djsj", value = "登记时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date djsj;
/**
* 注销时间
*/
@ApiModelProperty(name = "zxsj", value = "注销时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date zxsj;
......
......@@ -3,10 +3,12 @@ package com.pashanhoo.business.entity.vo;
import java.io.Serializable;
import java.util.Date;
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>
......@@ -76,6 +78,8 @@ public class DgBusinessDetailVO implements Serializable {
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date sjsj;
/**
......
......@@ -3,10 +3,12 @@ package com.pashanhoo.business.entity.vo;
import java.io.Serializable;
import java.util.Date;
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>
......@@ -76,6 +78,8 @@ public class UpdateDgBusinessRequest implements Serializable {
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date sjsj;
/**
......
......@@ -5,7 +5,6 @@ import com.pashanhoo.common.Result;
import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest;
import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO;
import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest;
import com.pashanhoo.replenish.entity.vo.UpdateDgArchivesReplenishRequest;
import com.pashanhoo.replenish.service.DgArchivesReplenishService;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
......@@ -53,15 +52,6 @@ public class DgArchivesReplenishController {
return Result.ok("删除失败");
}
@PutMapping("updateDgArchivesReplenish")
@ApiOperation("修改档案补录信息")
public Result updateDgArchivesReplenish(@RequestBody UpdateDgArchivesReplenishRequest request){
if(dgarchivesreplenishService.updateDgArchivesReplenish(request)) {
return Result.ok("修改成功");
}
return Result.error("修改失败");
}
@GetMapping("getDgArchivesReplenishDetailById")
@ApiOperation(value = "读取明细")
public Result getDgArchivesReplenishDetailById(@ApiParam("档案补录信息ID") @RequestParam String id){
......@@ -77,7 +67,7 @@ public class DgArchivesReplenishController {
@GetMapping("doReplenishArchive")
@ApiOperation(value = "归档")
public Result doReplenishArchive(@ApiParam("归档id") @RequestParam String bsmModify,@ApiParam("档案标识码") @RequestParam String bsmArchive){
public Result doReplenishArchive(@ApiParam("档案补录标识码") @RequestParam String bsmModify,@ApiParam("档案标识码") @RequestParam String bsmArchive){
return Result.ok(dgarchivesreplenishService.doReplenishArchive(bsmModify,bsmArchive));
}
}
......
......@@ -2,10 +2,10 @@ package com.pashanhoo.replenish.entity;
import java.util.List;
import com.pashanhoo.archive.entity.vo.UpdateArchiveAndOtherInfoRequest;
import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest;
import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishDetailVO;
import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO;
import com.pashanhoo.replenish.entity.vo.UpdateDgArchivesReplenishRequest;
import org.mapstruct.Mapper;
/**
......@@ -18,7 +18,7 @@ public interface DgArchivesReplenishConverter{
DgArchivesReplenishDetailVO do2DetailVO(DgArchivesReplenishDO dgarchivesreplenishDO);
DgArchivesReplenishDO updateRequest2DO(UpdateDgArchivesReplenishRequest request);
DgArchivesReplenishDO updateRequest2DO(UpdateArchiveAndOtherInfoRequest request);
DgArchivesReplenishListVO do2ListVO(DgArchivesReplenishDO dgarchivesreplenishDO);
......
package com.pashanhoo.replenish.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.replenish.entity.*;
import com.pashanhoo.replenish.entity.vo.*;
......@@ -36,14 +33,6 @@ public interface DgArchivesReplenishService extends IService<DgArchivesReplenish
DgArchivesReplenishDetailVO getDgArchivesReplenishDetailById(String id);
/**
* 修改单条记录
*
* @param request
* @return
*/
boolean updateDgArchivesReplenish(UpdateDgArchivesReplenishRequest request);
/**
* 根据条件进行列表查询
*
* @param request
......
......@@ -12,17 +12,14 @@ 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.entity.vo.UpdateDgArchivesRequest;
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.DgBusinessConverter;
import com.pashanhoo.business.entity.DgBusinessDO;
import com.pashanhoo.business.entity.vo.AddDgBusinessRequest;
import com.pashanhoo.business.entity.vo.UpdateDgBusinessRequest;
import com.pashanhoo.business.service.DgBusinessService;
import com.pashanhoo.catalog.entity.DgArchivesCatalogDO;
import com.pashanhoo.catalog.service.DgArchivesCatalogService;
......@@ -164,41 +161,6 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
}
/**
* 修改单条记录
*
* @param request
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateDgArchivesReplenish(UpdateDgArchivesReplenishRequest request) {
//修改案卷基本信息
UpdateDgArchivesRequest updateDgArchivesRequest = request.getUpdateDgArchivesRequest();
DgArchivesDO dgArchivesDO = dgArchivesConverter.updateRequest2DO(updateDgArchivesRequest);
String bsmArchives = dgArchivesDO.getBsmArchives();
dgArchivesService.updateById(dgArchivesDO);
//修改不动产信息,先删除.后插入
List<UpdateDgBdcdyRequest> updateDgBdcdyRequests = request.getUpdateDgBdcdyRequests();
List<DgBdcdyDO> dgBdcdyDOS = dgBdcdyConverter.voList2DoList(updateDgBdcdyRequests);
//删除
QueryWrapper<DgBdcdyDO> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchives);
dgBdcdyService.remove(wrapper);
//插入
dgBdcdyService.saveBatch(dgBdcdyDOS);
//修改业务信息
UpdateDgBusinessRequest updateDgBusinessRequest = request.getUpdateDgBusinessRequest();
DgBusinessDO dgBusinessDO = dgBusinessConverter.updateRequest2DO(updateDgBusinessRequest);
QueryWrapper<DgBusinessDO> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(DgBusinessDO::getBsmArchives, bsmArchives);
return dgBusinessService.update(dgBusinessDO, queryWrapper);
}
/**
* 根据条件进行列表查询
*
* @param request
......
......@@ -44,4 +44,49 @@
)
</update>
<select id="searchArchive" resultType="com.pashanhoo.archive.entity.vo.SearchArchiveVO">
select rownum as xh,
DA.BSM_ARCHIVES,
DA.DAZT,
DA.DALY,
DA.AJH,
DA.CFWZ,
DA.HH,
D.BDCQZH,
D.QLR,
D.YWR,
DB.YWH,
D.BDCDYH,
DB.QLLX
from DG_ARCHIVES DA
join DG_BUSINESS DB on DA.BSM_ARCHIVES = DB.BSM_ARCHIVES
join DG_BDCDY D on DA.BSM_ARCHIVES = D.BSM_ARCHIVES
<where>
<if test="request.ajh != null and request.ajh != ''">
AJH = #{request.ajh,jdbcType=VARCHAR}
</if>
<if test="request.mlh != null and request.mlh != ''">
and MLH = #{request.mlh,jdbcType=VARCHAR}
</if>
<if test="request.hh != null and request.hh != ''">
and HH = #{request.hh,jdbcType=VARCHAR}
</if>
<if test="request.dazt != null and request.dazt != ''">
and DAZT = #{request.dazt,jdbcType=VARCHAR}
</if>
<if test="request.ywh != null and request.ywh != ''">
and YWH = #{request.ywh,jdbcType=VARCHAR}
</if>
<if test="request.bdcqzh != null and request.bdcqzh != ''">
and BDCQZH = #{request.bdcqzh,jdbcType=VARCHAR}
</if>
<if test="request.bdcdyh != null and request.bdcdyh != ''">
and BDCDYH = #{request.bdcdyh,jdbcType=VARCHAR}
</if>
<if test="request.qllx != null and request.qllx != ''">
and QLLX = #{request.qllx,jdbcType=VARCHAR}
</if>
</where>
</select>
</mapper>
......