Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
0161de33 by 荆蔚杰
Options

补录记录新增 

档案补录=》权利信息挂接
1 parent 741567f2
Inline Side-by-side
Showing 25 changed files with 421 additions and 125 deletions
package com.pashanhoo.archive.entity;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
......@@ -65,19 +64,19 @@ public class DgArchivesDO implements Serializable {
* 年度
*/
@TableField("ND")
private BigDecimal nd;
private Integer nd;
/**
* 件数
*/
@TableField("JS")
private BigDecimal js;
private Integer js;
/**
* 页数
*/
@TableField("YS")
private BigDecimal ys;
private Integer ys;
/**
* 保管期限
......@@ -143,13 +142,13 @@ public class DgArchivesDO implements Serializable {
* 扫描状态
*/
@TableField("SMZT")
private BigDecimal smzt;
private Integer smzt;
/**
* 档案状态
*/
@TableField("DAZT")
private BigDecimal dazt;
private Integer dazt;
/**
* 存档机构编码
......
......@@ -3,10 +3,13 @@ package com.pashanhoo.archive.entity.vo;
import java.math.BigDecimal;
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,8 +29,8 @@ public class AddDgArchivesRequest implements Serializable {
/**
* 案卷标识码
*/
@ApiModelProperty(name = "bsm_archives", value = "案卷标识码")
private String bsm_archives;
@ApiModelProperty(name = "bsmArchives", value = "案卷标识码")
private String bsmArchives;
/**
* 案卷标题
*/
......@@ -62,19 +65,19 @@ public class AddDgArchivesRequest implements Serializable {
* 年度
*/
@ApiModelProperty(name = "nd", value = "年度")
private BigDecimal nd;
private Integer nd;
/**
* 件数
*/
@ApiModelProperty(name = "js", value = "件数")
private BigDecimal js;
private Integer js;
/**
* 页数
*/
@ApiModelProperty(name = "ys", value = "页数")
private BigDecimal ys;
private Integer ys;
/**
* 保管期限
......@@ -122,6 +125,8 @@ public class AddDgArchivesRequest implements Serializable {
* 创建日期
*/
@ApiModelProperty(name = "cjrq", value = "创建日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date cjrq;
/**
......@@ -140,13 +145,13 @@ public class AddDgArchivesRequest implements Serializable {
* 扫描状态
*/
@ApiModelProperty(name = "smzt", value = "扫描状态")
private BigDecimal smzt;
private Integer smzt;
/**
* 档案状态
*/
@ApiModelProperty(name = "dazt", value = "档案状态")
private BigDecimal dazt;
private Integer dazt;
/**
* 存档机构编码
......
......@@ -65,19 +65,19 @@ public class DgArchivesDetailVO implements Serializable {
* 年度
*/
@ApiModelProperty(name = "nd", value = "年度")
private BigDecimal nd;
private Integer nd;
/**
* 件数
*/
@ApiModelProperty(name = "js", value = "件数")
private BigDecimal js;
private Integer js;
/**
* 页数
*/
@ApiModelProperty(name = "ys", value = "页数")
private BigDecimal ys;
private Integer ys;
/**
* 保管期限
......@@ -143,13 +143,13 @@ public class DgArchivesDetailVO implements Serializable {
* 扫描状态
*/
@ApiModelProperty(name = "smzt", value = "扫描状态")
private BigDecimal smzt;
private Integer smzt;
/**
* 档案状态
*/
@ApiModelProperty(name = "dazt", value = "档案状态")
private BigDecimal dazt;
private Integer dazt;
/**
* 存档机构编码
......
package com.pashanhoo.archive.entity.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -66,19 +63,19 @@ public class DgArchivesListVO implements Serializable {
* 年度
*/
@ApiModelProperty(name = "nd", value = "年度")
private BigDecimal nd;
private Integer nd;
/**
* 件数
*/
@ApiModelProperty(name = "js", value = "件数")
private BigDecimal js;
private Integer js;
/**
* 页数
*/
@ApiModelProperty(name = "ys", value = "页数")
private BigDecimal ys;
private Integer ys;
/**
* 保管期限
......@@ -144,13 +141,13 @@ public class DgArchivesListVO implements Serializable {
* 扫描状态
*/
@ApiModelProperty(name = "smzt", value = "扫描状态")
private BigDecimal smzt;
private Integer smzt;
/**
* 档案状态
*/
@ApiModelProperty(name = "dazt", value = "档案状态")
private BigDecimal dazt;
private Integer dazt;
/**
* 存档机构编码
......
package com.pashanhoo.archive.entity.vo;
import java.math.BigDecimal;
import java.util.Date;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
......@@ -65,19 +64,19 @@ public class DgArchivesSearchRequest extends PageInfo implements Serializable {
* 年度
*/
@ApiModelProperty(name = "nd", value = "年度")
private BigDecimal nd;
private Integer nd;
/**
* 件数
*/
@ApiModelProperty(name = "js", value = "件数")
private BigDecimal js;
private Integer js;
/**
* 页数
*/
@ApiModelProperty(name = "ys", value = "页数")
private BigDecimal ys;
private Integer ys;
/**
* 保管期限
......@@ -143,13 +142,13 @@ public class DgArchivesSearchRequest extends PageInfo implements Serializable {
* 扫描状态
*/
@ApiModelProperty(name = "smzt", value = "扫描状态")
private BigDecimal smzt;
private Integer smzt;
/**
* 档案状态
*/
@ApiModelProperty(name = "dazt", value = "档案状态")
private BigDecimal dazt;
private Integer dazt;
/**
* 存档机构编码
......
package com.pashanhoo.archive.entity.vo;
import java.math.BigDecimal;
import java.util.Date;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
......@@ -63,19 +62,19 @@ public class UpdateDgArchivesRequest implements Serializable {
* 年度
*/
@ApiModelProperty(name = "nd", value = "年度")
private BigDecimal nd;
private Integer nd;
/**
* 件数
*/
@ApiModelProperty(name = "js", value = "件数")
private BigDecimal js;
private Integer js;
/**
* 页数
*/
@ApiModelProperty(name = "ys", value = "页数")
private BigDecimal ys;
private Integer ys;
/**
* 保管期限
......@@ -141,13 +140,13 @@ public class UpdateDgArchivesRequest implements Serializable {
* 扫描状态
*/
@ApiModelProperty(name = "smzt", value = "扫描状态")
private BigDecimal smzt;
private Integer smzt;
/**
* 档案状态
*/
@ApiModelProperty(name = "dazt", value = "档案状态")
private BigDecimal dazt;
private Integer dazt;
/**
* 存档机构编码
......
......@@ -25,4 +25,6 @@ public interface DgBdcdyConverter{
List<DgBdcdyListVO> doList2ListVOList(List<DgBdcdyDO> dgbdcdyDOList);
List<DgBdcdyDO> addRequestListDO(List<AddDgBdcdyRequest> request);
List<DgBdcdyDO> voList2DoList(List<UpdateDgBdcdyRequest> requests);
}
......
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -66,6 +67,13 @@ public class DgBusinessDO implements Serializable {
*/
@TableField("DJJGMC")
private String djjgmc;
/**
* 登记业务名称
*/
@TableField("DJYWMC")
private String djywmc;
/**
* 注销业务号
*/
......@@ -77,5 +85,15 @@ public class DgBusinessDO implements Serializable {
@TableField("ZXLX")
private String zxlx;
/**
* 收件时间
*/
@TableField("SJSJ")
private Date sjsj;
/**
* 原业务标识码
*/
@TableField("BSM_YW")
private String bsmYw;
}
......
package com.pashanhoo.business.entity.vo;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -68,4 +71,22 @@ public class AddDgBusinessRequest implements Serializable {
@ApiModelProperty(name = "zxlx", value = "注销类型")
private String zxlx;
/**
* 登记业务名称
*/
@ApiModelProperty(name = "djywmc", value = "登记业务名称")
private String djywmc;
/**
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
private Date sjsj;
/**
* 原业务标识码
*/
@ApiModelProperty(name = "bsmYw", value = "原业务标识码")
private String bsmYw;
}
......
package com.pashanhoo.business.entity.vo;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -64,4 +66,21 @@ public class DgBusinessDetailVO implements Serializable {
private String djjgmc;
/**
* 登记业务名称
*/
@ApiModelProperty(name = "djywmc", value = "登记业务名称")
private String djywmc;
/**
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
private Date sjsj;
/**
* 原业务标识码
*/
@ApiModelProperty(name = "bsmYw", value = "原业务标识码")
private String bsmYw;
}
......
package com.pashanhoo.business.entity.vo;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -65,4 +67,21 @@ public class DgBusinessListVO implements Serializable {
private String djjgmc;
/**
* 登记业务名称
*/
@ApiModelProperty(name = "djywmc", value = "登记业务名称")
private String djywmc;
/**
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
private Date sjsj;
/**
* 原业务标识码
*/
@ApiModelProperty(name = "bsmYw", value = "原业务标识码")
private String bsmYw;
}
......
package com.pashanhoo.business.entity.vo;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -74,4 +76,22 @@ public class DgBusinessSearchRequest extends PageInfo implements Serializable {
@ApiModelProperty(name = "zxlx", value = "注销类型")
private String zxlx;
/**
* 登记业务名称
*/
@ApiModelProperty(name = "djywmc", value = "登记业务名称")
private String djywmc;
/**
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
private Date sjsj;
/**
* 原业务标识码
*/
@ApiModelProperty(name = "bsmYw", value = "原业务标识码")
private String bsmYw;
}
......
package com.pashanhoo.business.entity.vo;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -64,4 +66,21 @@ public class UpdateDgBusinessRequest implements Serializable {
private String djjgmc;
/**
* 登记业务名称
*/
@ApiModelProperty(name = "djywmc", value = "登记业务名称")
private String djywmc;
/**
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
private Date sjsj;
/**
* 原业务标识码
*/
@ApiModelProperty(name = "bsmYw", value = "原业务标识码")
private String bsmYw;
}
......
......@@ -8,9 +8,13 @@ import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import org.xmlpull.v1.XmlPullParserException;
import javax.annotation.PostConstruct;
import java.io.IOException;
import java.io.InputStream;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.*;
/**
......@@ -98,7 +102,37 @@ public class MinioUtil {
}
/**
* 通过输入流上传到minio
* @param inputStream 文件输入流
* @param fileName 文件名,去除后缀名
* @param expandName 带.后缀名
* @param fileSize 文件大小
* @return
* @throws IOException
*/
public FileAttribute transferToMinio(InputStream inputStream, String fileName, String expandName,String fileSize) throws IOException {
String savePath = FileAttachmentUtil.getSavePath(UUID.randomUUID().toString());
String contentType = contentTypeMap.get(expandName.toLowerCase());
// 下载地址
String saveUrl = savePath + "/" + fileName + expandName;
// 浏览器直接预览地址，针对图片
String pUrl = minioConfig.getType() + minioConfig.getEndpoint() + "/file/" + saveUrl;
try {
minioClient.putObject(minioConfig.getBucket(), saveUrl, inputStream, contentType);
} catch (Exception e) {
e.printStackTrace();
}
FileAttribute fileAttribute = new FileAttribute();
fileAttribute.setFileName(fileName);
fileAttribute.setFileSize(fileSize);
fileAttribute.setSaveUrl(saveUrl);
fileAttribute.setPreviewUrl(pUrl);
return fileAttribute;
}
/**
* 根据存储路径组装下载预览路径
*
* @param saveUrl
* @return
*/
......
......@@ -69,7 +69,7 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest
@Override
public Result showArchivesForDestruction(DgArchivesSearchRequest request) {
request.setDazt(new BigDecimal("4"));
request.setDazt(4);
return Result.ok(archivesService.searchDgArchivesList(request));
}
......
......@@ -100,8 +100,8 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive
//新增档案表基础信息
AddDgArchivesRequest archivesRequest=new AddDgArchivesRequest();
String bsm_archives= IdWorker.get32UUID();
archivesRequest.setBsm_archives(bsm_archives);
archivesRequest.setDazt(new BigDecimal("1"));
archivesRequest.setBsmArchives(bsm_archives);
archivesRequest.setDazt(1);
archivesService.insertDgArchives(archivesRequest);
//新增接收表和档案表关联关系表
AddDgReceiveRelationRequest relationRequest=new AddDgReceiveRelationRequest();
......@@ -117,8 +117,8 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive
//组装档案表基础信息
String bsm_archives= IdWorker.get32UUID();
request1=new AddDgArchivesRequest();
request1.setBsm_archives(bsm_archives);
request1.setDazt(new BigDecimal("1"));
request1.setBsmArchives(bsm_archives);
request1.setDazt(1);
archivesRequest.add(request1);
//组装接收表和档案表关联关系表
receiveRelationRequest=new AddDgReceiveRelationRequest();
......
......@@ -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>
......@@ -19,7 +22,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("DG_ARCHIVES_REPLENISH")
@TableName("DG_REPLENISH")
public class DgArchivesReplenishDO implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -43,7 +46,7 @@ public class DgArchivesReplenishDO implements Serializable {
private String blbh;
/**
* 修改时间
* 创建时间
*/
@TableField("CREATETIME")
private Date createTime;
......@@ -60,5 +63,19 @@ public class DgArchivesReplenishDO implements Serializable {
@TableField("BZ")
private String bz;
/**
* 状态1:补录中,2:已归档
*/
@TableField("STATE")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String state;
/**
* 归档时间
*/
@TableField("GDSJ")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date gdsj;
}
......
package com.pashanhoo.replenish.entity.vo;
import java.util.Date;
import java.io.Serializable;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
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;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
......@@ -25,38 +26,21 @@ public class AddDgArchivesReplenishRequest implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 档案标识码
*/
@ApiModelProperty(name = "bsmArchives", value = "档案标识码")
private String bsmArchives;
/**
* 原档案信息
*/
@ApiModelProperty(name = "blbh", value = "原档案信息")
private String blbh;
/**
*补录人
* 新增案卷基本信息
*/
@ApiModelProperty(name = "creater", value = "补录人")
private String creater;
@ApiModelProperty(name = "addDgArchivesRequest", value = "新增案卷基本信息")
private AddDgArchivesRequest addDgArchivesRequest;
/**
* 补录时间
* 新增业务信息
*/
@ApiModelProperty(name = "createTime", value = "补录时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(name = "addDgBusinessRequest",value = "新增业务信息")
private AddDgBusinessRequest addDgBusinessRequest;
/**
* 备注
*/
@ApiModelProperty(name = "bz", value = "备注")
private String bz;
* 新增不动产单元信息
*/
@ApiModelProperty(name = "addDgBdcdyRequests",value = "新增不动产单元信息")
private List<AddDgBdcdyRequest> addDgBdcdyRequests;
}
......
......@@ -3,6 +3,7 @@ package com.pashanhoo.replenish.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;
......@@ -50,9 +51,9 @@ public class DgArchivesReplenishDetailVO implements Serializable {
private String creater;
/**
* 补录时间
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "补录时间")
@ApiModelProperty(name = "createTime", value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
......@@ -63,5 +64,19 @@ public class DgArchivesReplenishDetailVO implements Serializable {
@ApiModelProperty(name = "bz", value = "备注")
private String bz;
/**
* 状态1:补录中,2:已归档
*/
@TableField("STATE")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String state;
/**
* 归档时间
*/
@TableField("GDSJ")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date gdsj;
}
......
......@@ -3,6 +3,7 @@ package com.pashanhoo.replenish.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;
......@@ -81,9 +82,9 @@ public class DgArchivesReplenishListVO implements Serializable {
private String bdcqzh;
/**
* 补录时间
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "补录时间")
@ApiModelProperty(name = "createTime", value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
......@@ -100,4 +101,19 @@ public class DgArchivesReplenishListVO implements Serializable {
@ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
private String bdcdyh;
/**
* 状态1:补录中,2:已归档
*/
@TableField("STATE")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String state;
/**
* 归档时间
*/
@TableField("GDSJ")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date gdsj;
}
......
......@@ -3,6 +3,7 @@ package com.pashanhoo.replenish.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;
......@@ -51,11 +52,26 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial
private String creater;
/**
* 补录时间
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "补录时间")
@ApiModelProperty(name = "createTime", value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
/**
* 状态1:补录中,2:已归档
*/
@TableField("STATE")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String state;
/**
* 归档时间
*/
@TableField("GDSJ")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date gdsj;
}
......
package com.pashanhoo.replenish.entity.vo;
import java.util.Date;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
......@@ -20,48 +24,26 @@ import org.springframework.format.annotation.DateTimeFormat;
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="档案补录信息修改请求实体")
@ApiModel(value = "档案补录信息修改请求实体")
public class UpdateDgArchivesReplenishRequest implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 修改标识码
*/
@ApiModelProperty(name = "bsmModify", value = "修改标识码")
private String bsmModify;
/**
* 档案标识码
*/
@ApiModelProperty(name = "bsmArchives", value = "档案标识码")
private String bsmArchives;
/**
* 原档案信息
*/
@ApiModelProperty(name = "blbh", value = "原档案信息")
private String blbh;
/**
*补录人
* 更新案卷基本信息
*/
@ApiModelProperty(name = "creater", value = "补录人")
private String creater;
@ApiModelProperty(name = "updateDgArchivesRequest", value = "更新案卷基本信息")
private UpdateDgArchivesRequest updateDgArchivesRequest;
/**
* 补录时间
* 更新业务信息
*/
@ApiModelProperty(name = "createTime", value = "补录时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(name = "updateDgBusinessRequest", value = "更新业务信息")
private UpdateDgBusinessRequest updateDgBusinessRequest;
/**
* 备注
* 更新不动产单元信息
*/
@ApiModelProperty(name = "bz", value = "备注")
private String bz;
@ApiModelProperty(name = "updateDgBdcdyRequests", value = "更新不动产单元信息")
private List<UpdateDgBdcdyRequest> updateDgBdcdyRequests;
}
......
package com.pashanhoo.replenish.service.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
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.common.Result;
import com.pashanhoo.common.util.SysCode.SysCodeUtil;
import com.pashanhoo.common.util.SysCode.SysCodeVO;
import com.pashanhoo.replenish.entity.DgArchivesReplenishConverter;
import com.pashanhoo.replenish.entity.DgArchivesReplenishDO;
import com.pashanhoo.replenish.entity.vo.*;
......@@ -14,7 +35,9 @@ import com.pashanhoo.replenish.mapper.DgArchivesReplenishMapper;
import com.pashanhoo.replenish.service.DgArchivesReplenishService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
......@@ -34,6 +57,32 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
@Autowired
private DgArchivesReplenishMapper dgarchivesreplenishMapper;
@Autowired
private DgArchivesService dgArchivesService;
@Autowired
private DgArchivesConverter dgArchivesConverter;
@Autowired
private DgBusinessService dgBusinessService;
@Autowired
private DgBusinessConverter dgBusinessConverter;
@Autowired
private DgBdcdyService dgBdcdyService;
@Autowired
private DgBdcdyConverter dgBdcdyConverter;
@Autowired
SysCodeUtil sysCodeUtil;
/**
* 案卷基本信息状态补录中
*/
private final Integer REPLENISHING = 2;
/**
* 新增记录
*
......@@ -41,9 +90,51 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean insertDgArchivesReplenish(AddDgArchivesReplenishRequest request) {
DgArchivesReplenishDO dgarchivesreplenishDO = dgarchivesreplenishConverter.addRequest2DO(request);
return this.save(dgarchivesreplenishDO);
//生成案卷标识码
String bsmArchive = IdWorker.get32UUID();
//案卷基本信息
AddDgArchivesRequest addDgArchivesRequest = request.getAddDgArchivesRequest();
addDgArchivesRequest.setBsmArchives(bsmArchive);
addDgArchivesRequest.setDazt(REPLENISHING);
DgArchivesDO dgArchivesDO = dgArchivesConverter.addRequest2DO(addDgArchivesRequest);
dgArchivesService.save(dgArchivesDO);
//业务信息
AddDgBusinessRequest addDgBusinessRequest = request.getAddDgBusinessRequest();
addDgBusinessRequest.setBsmArchives(bsmArchive);
DgBusinessDO dgBusinessDO = dgBusinessConverter.addRequest2DO(addDgBusinessRequest);
dgBusinessService.save(dgBusinessDO);
//不动产单元信息
List<AddDgBdcdyRequest> addDgBdcdyRequests = request.getAddDgBdcdyRequests();
for (AddDgBdcdyRequest addDgBdcdyRequest : addDgBdcdyRequests) {
addDgBdcdyRequest.setBsmArchives(bsmArchive);
}
List<DgBdcdyDO> dgBdcdyDOS = dgBdcdyConverter.addRequestListDO(addDgBdcdyRequests);
dgBdcdyService.saveBatch(dgBdcdyDOS);
//档案补录记录
DgArchivesReplenishDO dgArchivesReplenishDO = new DgArchivesReplenishDO();
dgArchivesReplenishDO.setBsmArchives(bsmArchive);
//获取补录编号
SysCodeVO sysCodeVO = new SysCodeVO();
sysCodeVO.setTaskno("BL" + DateUtil.year(DateUtil.date()));
sysCodeVO.setCtype("sequence");
sysCodeVO.setTaskname("补录序列号");
sysCodeVO.setTaskchild(5);
String blbh = sysCodeUtil.getSequence(sysCodeVO);
dgArchivesReplenishDO.setBlbh(blbh);
/******************************************************/
dgArchivesReplenishDO.setCreateTime(DateTime.now());
dgArchivesReplenishDO.setCreater(null);
dgArchivesReplenishDO.setBz(null);
dgArchivesReplenishDO.setState("1");
dgArchivesReplenishDO.setGdsj(null);
return this.save(dgArchivesReplenishDO);
}
/**
......@@ -65,9 +156,32 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateDgArchivesReplenish(UpdateDgArchivesReplenishRequest request) {
DgArchivesReplenishDO dgarchivesreplenishDO = dgarchivesreplenishConverter.updateRequest2DO(request);
return this.updateById(dgarchivesreplenishDO);
//修改案卷基本信息
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);
}
/**
......
......@@ -60,8 +60,9 @@ management:
logging:
level:
rent:
mapper: debug
root: debug
com:
mapper:
config: "classpath:logback-spring.xml"
minio:
......
......@@ -115,7 +115,7 @@
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<logger name="house.platform.mapper" level="DEBUG" />
<logger name="com.pashanhoo.mapper" level="DEBUG" />
<!-- 时间滚动输出 level为 ERROR 日志 -->
<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
......@@ -171,7 +171,7 @@
<!--开发环境:打印控制台-->
<springProfile name="dev">
<logger name="com.house" level="info"/>
<logger name="com.pashanhoo" level="info"/>
</springProfile>
<root level="INFO">
......