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 420 additions and 124 deletions
1 package com.pashanhoo.archive.entity; 1 package com.pashanhoo.archive.entity;
2 2
3 import java.math.BigDecimal;
4 import com.baomidou.mybatisplus.annotation.TableName; 3 import com.baomidou.mybatisplus.annotation.TableName;
5 import com.baomidou.mybatisplus.annotation.IdType; 4 import com.baomidou.mybatisplus.annotation.IdType;
6 import java.util.Date; 5 import java.util.Date;
...@@ -65,19 +64,19 @@ public class DgArchivesDO implements Serializable { ...@@ -65,19 +64,19 @@ public class DgArchivesDO implements Serializable {
65 * 年度 64 * 年度
66 */ 65 */
67 @TableField("ND") 66 @TableField("ND")
68 private BigDecimal nd; 67 private Integer nd;
69 68
70 /** 69 /**
71 * 件数 70 * 件数
72 */ 71 */
73 @TableField("JS") 72 @TableField("JS")
74 private BigDecimal js; 73 private Integer js;
75 74
76 /** 75 /**
77 * 页数 76 * 页数
78 */ 77 */
79 @TableField("YS") 78 @TableField("YS")
80 private BigDecimal ys; 79 private Integer ys;
81 80
82 /** 81 /**
83 * 保管期限 82 * 保管期限
...@@ -143,13 +142,13 @@ public class DgArchivesDO implements Serializable { ...@@ -143,13 +142,13 @@ public class DgArchivesDO implements Serializable {
143 * 扫描状态 142 * 扫描状态
144 */ 143 */
145 @TableField("SMZT") 144 @TableField("SMZT")
146 private BigDecimal smzt; 145 private Integer smzt;
147 146
148 /** 147 /**
149 * 档案状态 148 * 档案状态
150 */ 149 */
151 @TableField("DAZT") 150 @TableField("DAZT")
152 private BigDecimal dazt; 151 private Integer dazt;
153 152
154 /** 153 /**
155 * 存档机构编码 154 * 存档机构编码
......
...@@ -3,10 +3,13 @@ package com.pashanhoo.archive.entity.vo; ...@@ -3,10 +3,13 @@ package com.pashanhoo.archive.entity.vo;
3 import java.math.BigDecimal; 3 import java.math.BigDecimal;
4 import java.util.Date; 4 import java.util.Date;
5 import java.io.Serializable; 5 import java.io.Serializable;
6
7 import com.fasterxml.jackson.annotation.JsonFormat;
6 import io.swagger.annotations.ApiModel; 8 import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty; 9 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 10 import lombok.Data;
9 import lombok.EqualsAndHashCode; 11 import lombok.EqualsAndHashCode;
12 import org.springframework.format.annotation.DateTimeFormat;
10 13
11 /** 14 /**
12 * <p> 15 * <p>
...@@ -26,8 +29,8 @@ public class AddDgArchivesRequest implements Serializable { ...@@ -26,8 +29,8 @@ public class AddDgArchivesRequest implements Serializable {
26 /** 29 /**
27 * 案卷标识码 30 * 案卷标识码
28 */ 31 */
29 @ApiModelProperty(name = "bsm_archives", value = "案卷标识码") 32 @ApiModelProperty(name = "bsmArchives", value = "案卷标识码")
30 private String bsm_archives; 33 private String bsmArchives;
31 /** 34 /**
32 * 案卷标题 35 * 案卷标题
33 */ 36 */
...@@ -62,19 +65,19 @@ public class AddDgArchivesRequest implements Serializable { ...@@ -62,19 +65,19 @@ public class AddDgArchivesRequest implements Serializable {
62 * 年度 65 * 年度
63 */ 66 */
64 @ApiModelProperty(name = "nd", value = "年度") 67 @ApiModelProperty(name = "nd", value = "年度")
65 private BigDecimal nd; 68 private Integer nd;
66 69
67 /** 70 /**
68 * 件数 71 * 件数
69 */ 72 */
70 @ApiModelProperty(name = "js", value = "件数") 73 @ApiModelProperty(name = "js", value = "件数")
71 private BigDecimal js; 74 private Integer js;
72 75
73 /** 76 /**
74 * 页数 77 * 页数
75 */ 78 */
76 @ApiModelProperty(name = "ys", value = "页数") 79 @ApiModelProperty(name = "ys", value = "页数")
77 private BigDecimal ys; 80 private Integer ys;
78 81
79 /** 82 /**
80 * 保管期限 83 * 保管期限
...@@ -122,6 +125,8 @@ public class AddDgArchivesRequest implements Serializable { ...@@ -122,6 +125,8 @@ public class AddDgArchivesRequest implements Serializable {
122 * 创建日期 125 * 创建日期
123 */ 126 */
124 @ApiModelProperty(name = "cjrq", value = "创建日期") 127 @ApiModelProperty(name = "cjrq", value = "创建日期")
128 @DateTimeFormat(pattern = "yyyy-MM-dd")
129 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
125 private Date cjrq; 130 private Date cjrq;
126 131
127 /** 132 /**
...@@ -140,13 +145,13 @@ public class AddDgArchivesRequest implements Serializable { ...@@ -140,13 +145,13 @@ public class AddDgArchivesRequest implements Serializable {
140 * 扫描状态 145 * 扫描状态
141 */ 146 */
142 @ApiModelProperty(name = "smzt", value = "扫描状态") 147 @ApiModelProperty(name = "smzt", value = "扫描状态")
143 private BigDecimal smzt; 148 private Integer smzt;
144 149
145 /** 150 /**
146 * 档案状态 151 * 档案状态
147 */ 152 */
148 @ApiModelProperty(name = "dazt", value = "档案状态") 153 @ApiModelProperty(name = "dazt", value = "档案状态")
149 private BigDecimal dazt; 154 private Integer dazt;
150 155
151 /** 156 /**
152 * 存档机构编码 157 * 存档机构编码
......
...@@ -65,19 +65,19 @@ public class DgArchivesDetailVO implements Serializable { ...@@ -65,19 +65,19 @@ public class DgArchivesDetailVO implements Serializable {
65 * 年度 65 * 年度
66 */ 66 */
67 @ApiModelProperty(name = "nd", value = "年度") 67 @ApiModelProperty(name = "nd", value = "年度")
68 private BigDecimal nd; 68 private Integer nd;
69 69
70 /** 70 /**
71 * 件数 71 * 件数
72 */ 72 */
73 @ApiModelProperty(name = "js", value = "件数") 73 @ApiModelProperty(name = "js", value = "件数")
74 private BigDecimal js; 74 private Integer js;
75 75
76 /** 76 /**
77 * 页数 77 * 页数
78 */ 78 */
79 @ApiModelProperty(name = "ys", value = "页数") 79 @ApiModelProperty(name = "ys", value = "页数")
80 private BigDecimal ys; 80 private Integer ys;
81 81
82 /** 82 /**
83 * 保管期限 83 * 保管期限
...@@ -143,13 +143,13 @@ public class DgArchivesDetailVO implements Serializable { ...@@ -143,13 +143,13 @@ public class DgArchivesDetailVO implements Serializable {
143 * 扫描状态 143 * 扫描状态
144 */ 144 */
145 @ApiModelProperty(name = "smzt", value = "扫描状态") 145 @ApiModelProperty(name = "smzt", value = "扫描状态")
146 private BigDecimal smzt; 146 private Integer smzt;
147 147
148 /** 148 /**
149 * 档案状态 149 * 档案状态
150 */ 150 */
151 @ApiModelProperty(name = "dazt", value = "档案状态") 151 @ApiModelProperty(name = "dazt", value = "档案状态")
152 private BigDecimal dazt; 152 private Integer dazt;
153 153
154 /** 154 /**
155 * 存档机构编码 155 * 存档机构编码
......
1 package com.pashanhoo.archive.entity.vo; 1 package com.pashanhoo.archive.entity.vo;
2 2
3 import java.math.BigDecimal;
4 import java.util.Date; 3 import java.util.Date;
5 import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableField;
7 import java.io.Serializable; 4 import java.io.Serializable;
8 import io.swagger.annotations.ApiModel; 5 import io.swagger.annotations.ApiModel;
9 import io.swagger.annotations.ApiModelProperty; 6 import io.swagger.annotations.ApiModelProperty;
...@@ -66,19 +63,19 @@ public class DgArchivesListVO implements Serializable { ...@@ -66,19 +63,19 @@ public class DgArchivesListVO implements Serializable {
66 * 年度 63 * 年度
67 */ 64 */
68 @ApiModelProperty(name = "nd", value = "年度") 65 @ApiModelProperty(name = "nd", value = "年度")
69 private BigDecimal nd; 66 private Integer nd;
70 67
71 /** 68 /**
72 * 件数 69 * 件数
73 */ 70 */
74 @ApiModelProperty(name = "js", value = "件数") 71 @ApiModelProperty(name = "js", value = "件数")
75 private BigDecimal js; 72 private Integer js;
76 73
77 /** 74 /**
78 * 页数 75 * 页数
79 */ 76 */
80 @ApiModelProperty(name = "ys", value = "页数") 77 @ApiModelProperty(name = "ys", value = "页数")
81 private BigDecimal ys; 78 private Integer ys;
82 79
83 /** 80 /**
84 * 保管期限 81 * 保管期限
...@@ -144,13 +141,13 @@ public class DgArchivesListVO implements Serializable { ...@@ -144,13 +141,13 @@ public class DgArchivesListVO implements Serializable {
144 * 扫描状态 141 * 扫描状态
145 */ 142 */
146 @ApiModelProperty(name = "smzt", value = "扫描状态") 143 @ApiModelProperty(name = "smzt", value = "扫描状态")
147 private BigDecimal smzt; 144 private Integer smzt;
148 145
149 /** 146 /**
150 * 档案状态 147 * 档案状态
151 */ 148 */
152 @ApiModelProperty(name = "dazt", value = "档案状态") 149 @ApiModelProperty(name = "dazt", value = "档案状态")
153 private BigDecimal dazt; 150 private Integer dazt;
154 151
155 /** 152 /**
156 * 存档机构编码 153 * 存档机构编码
......
1 package com.pashanhoo.archive.entity.vo; 1 package com.pashanhoo.archive.entity.vo;
2 2
3 import java.math.BigDecimal;
4 import java.util.Date; 3 import java.util.Date;
5 import java.io.Serializable; 4 import java.io.Serializable;
6 import io.swagger.annotations.ApiModel; 5 import io.swagger.annotations.ApiModel;
...@@ -65,19 +64,19 @@ public class DgArchivesSearchRequest extends PageInfo implements Serializable { ...@@ -65,19 +64,19 @@ public class DgArchivesSearchRequest extends PageInfo implements Serializable {
65 * 年度 64 * 年度
66 */ 65 */
67 @ApiModelProperty(name = "nd", value = "年度") 66 @ApiModelProperty(name = "nd", value = "年度")
68 private BigDecimal nd; 67 private Integer nd;
69 68
70 /** 69 /**
71 * 件数 70 * 件数
72 */ 71 */
73 @ApiModelProperty(name = "js", value = "件数") 72 @ApiModelProperty(name = "js", value = "件数")
74 private BigDecimal js; 73 private Integer js;
75 74
76 /** 75 /**
77 * 页数 76 * 页数
78 */ 77 */
79 @ApiModelProperty(name = "ys", value = "页数") 78 @ApiModelProperty(name = "ys", value = "页数")
80 private BigDecimal ys; 79 private Integer ys;
81 80
82 /** 81 /**
83 * 保管期限 82 * 保管期限
...@@ -143,13 +142,13 @@ public class DgArchivesSearchRequest extends PageInfo implements Serializable { ...@@ -143,13 +142,13 @@ public class DgArchivesSearchRequest extends PageInfo implements Serializable {
143 * 扫描状态 142 * 扫描状态
144 */ 143 */
145 @ApiModelProperty(name = "smzt", value = "扫描状态") 144 @ApiModelProperty(name = "smzt", value = "扫描状态")
146 private BigDecimal smzt; 145 private Integer smzt;
147 146
148 /** 147 /**
149 * 档案状态 148 * 档案状态
150 */ 149 */
151 @ApiModelProperty(name = "dazt", value = "档案状态") 150 @ApiModelProperty(name = "dazt", value = "档案状态")
152 private BigDecimal dazt; 151 private Integer dazt;
153 152
154 /** 153 /**
155 * 存档机构编码 154 * 存档机构编码
......
1 package com.pashanhoo.archive.entity.vo; 1 package com.pashanhoo.archive.entity.vo;
2 2
3 import java.math.BigDecimal;
4 import java.util.Date; 3 import java.util.Date;
5 import java.io.Serializable; 4 import java.io.Serializable;
6 import io.swagger.annotations.ApiModel; 5 import io.swagger.annotations.ApiModel;
...@@ -63,19 +62,19 @@ public class UpdateDgArchivesRequest implements Serializable { ...@@ -63,19 +62,19 @@ public class UpdateDgArchivesRequest implements Serializable {
63 * 年度 62 * 年度
64 */ 63 */
65 @ApiModelProperty(name = "nd", value = "年度") 64 @ApiModelProperty(name = "nd", value = "年度")
66 private BigDecimal nd; 65 private Integer nd;
67 66
68 /** 67 /**
69 * 件数 68 * 件数
70 */ 69 */
71 @ApiModelProperty(name = "js", value = "件数") 70 @ApiModelProperty(name = "js", value = "件数")
72 private BigDecimal js; 71 private Integer js;
73 72
74 /** 73 /**
75 * 页数 74 * 页数
76 */ 75 */
77 @ApiModelProperty(name = "ys", value = "页数") 76 @ApiModelProperty(name = "ys", value = "页数")
78 private BigDecimal ys; 77 private Integer ys;
79 78
80 /** 79 /**
81 * 保管期限 80 * 保管期限
...@@ -141,13 +140,13 @@ public class UpdateDgArchivesRequest implements Serializable { ...@@ -141,13 +140,13 @@ public class UpdateDgArchivesRequest implements Serializable {
141 * 扫描状态 140 * 扫描状态
142 */ 141 */
143 @ApiModelProperty(name = "smzt", value = "扫描状态") 142 @ApiModelProperty(name = "smzt", value = "扫描状态")
144 private BigDecimal smzt; 143 private Integer smzt;
145 144
146 /** 145 /**
147 * 档案状态 146 * 档案状态
148 */ 147 */
149 @ApiModelProperty(name = "dazt", value = "档案状态") 148 @ApiModelProperty(name = "dazt", value = "档案状态")
150 private BigDecimal dazt; 149 private Integer dazt;
151 150
152 /** 151 /**
153 * 存档机构编码 152 * 存档机构编码
......
...@@ -25,4 +25,6 @@ public interface DgBdcdyConverter{ ...@@ -25,4 +25,6 @@ public interface DgBdcdyConverter{
25 List<DgBdcdyListVO> doList2ListVOList(List<DgBdcdyDO> dgbdcdyDOList); 25 List<DgBdcdyListVO> doList2ListVOList(List<DgBdcdyDO> dgbdcdyDOList);
26 26
27 List<DgBdcdyDO> addRequestListDO(List<AddDgBdcdyRequest> request); 27 List<DgBdcdyDO> addRequestListDO(List<AddDgBdcdyRequest> request);
28
29 List<DgBdcdyDO> voList2DoList(List<UpdateDgBdcdyRequest> requests);
28 } 30 }
......
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
5 import com.baomidou.mybatisplus.annotation.TableId; 5 import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableField; 6 import com.baomidou.mybatisplus.annotation.TableField;
7 import java.io.Serializable; 7 import java.io.Serializable;
8 import java.util.Date;
8 9
9 import io.swagger.annotations.ApiModelProperty; 10 import io.swagger.annotations.ApiModelProperty;
10 import lombok.Data; 11 import lombok.Data;
...@@ -66,6 +67,13 @@ public class DgBusinessDO implements Serializable { ...@@ -66,6 +67,13 @@ public class DgBusinessDO implements Serializable {
66 */ 67 */
67 @TableField("DJJGMC") 68 @TableField("DJJGMC")
68 private String djjgmc; 69 private String djjgmc;
70
71 /**
72 * 登记业务名称
73 */
74 @TableField("DJYWMC")
75 private String djywmc;
76
69 /** 77 /**
70 * 注销业务号 78 * 注销业务号
71 */ 79 */
...@@ -77,5 +85,15 @@ public class DgBusinessDO implements Serializable { ...@@ -77,5 +85,15 @@ public class DgBusinessDO implements Serializable {
77 @TableField("ZXLX") 85 @TableField("ZXLX")
78 private String zxlx; 86 private String zxlx;
79 87
88 /**
89 * 收件时间
90 */
91 @TableField("SJSJ")
92 private Date sjsj;
80 93
94 /**
95 * 原业务标识码
96 */
97 @TableField("BSM_YW")
98 private String bsmYw;
81 } 99 }
......
1 package com.pashanhoo.business.entity.vo; 1 package com.pashanhoo.business.entity.vo;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.Date;
5
6 import com.baomidou.mybatisplus.annotation.TableField;
4 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
5 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
6 import lombok.Data; 9 import lombok.Data;
...@@ -68,4 +71,22 @@ public class AddDgBusinessRequest implements Serializable { ...@@ -68,4 +71,22 @@ public class AddDgBusinessRequest implements Serializable {
68 @ApiModelProperty(name = "zxlx", value = "注销类型") 71 @ApiModelProperty(name = "zxlx", value = "注销类型")
69 private String zxlx; 72 private String zxlx;
70 73
74
75 /**
76 * 登记业务名称
77 */
78 @ApiModelProperty(name = "djywmc", value = "登记业务名称")
79 private String djywmc;
80
81 /**
82 * 收件时间
83 */
84 @ApiModelProperty(name = "sjsj", value = "收件时间")
85 private Date sjsj;
86
87 /**
88 * 原业务标识码
89 */
90 @ApiModelProperty(name = "bsmYw", value = "原业务标识码")
91 private String bsmYw;
71 } 92 }
......
1 package com.pashanhoo.business.entity.vo; 1 package com.pashanhoo.business.entity.vo;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.Date;
5
4 import io.swagger.annotations.ApiModel; 6 import io.swagger.annotations.ApiModel;
5 import io.swagger.annotations.ApiModelProperty; 7 import io.swagger.annotations.ApiModelProperty;
6 import lombok.Data; 8 import lombok.Data;
...@@ -64,4 +66,21 @@ public class DgBusinessDetailVO implements Serializable { ...@@ -64,4 +66,21 @@ public class DgBusinessDetailVO implements Serializable {
64 private String djjgmc; 66 private String djjgmc;
65 67
66 68
69 /**
70 * 登记业务名称
71 */
72 @ApiModelProperty(name = "djywmc", value = "登记业务名称")
73 private String djywmc;
74
75 /**
76 * 收件时间
77 */
78 @ApiModelProperty(name = "sjsj", value = "收件时间")
79 private Date sjsj;
80
81 /**
82 * 原业务标识码
83 */
84 @ApiModelProperty(name = "bsmYw", value = "原业务标识码")
85 private String bsmYw;
67 } 86 }
......
1 package com.pashanhoo.business.entity.vo; 1 package com.pashanhoo.business.entity.vo;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.Date;
5
4 import io.swagger.annotations.ApiModel; 6 import io.swagger.annotations.ApiModel;
5 import io.swagger.annotations.ApiModelProperty; 7 import io.swagger.annotations.ApiModelProperty;
6 import lombok.Data; 8 import lombok.Data;
...@@ -65,4 +67,21 @@ public class DgBusinessListVO implements Serializable { ...@@ -65,4 +67,21 @@ public class DgBusinessListVO implements Serializable {
65 private String djjgmc; 67 private String djjgmc;
66 68
67 69
70 /**
71 * 登记业务名称
72 */
73 @ApiModelProperty(name = "djywmc", value = "登记业务名称")
74 private String djywmc;
75
76 /**
77 * 收件时间
78 */
79 @ApiModelProperty(name = "sjsj", value = "收件时间")
80 private Date sjsj;
81
82 /**
83 * 原业务标识码
84 */
85 @ApiModelProperty(name = "bsmYw", value = "原业务标识码")
86 private String bsmYw;
68 } 87 }
......
1 package com.pashanhoo.business.entity.vo; 1 package com.pashanhoo.business.entity.vo;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.Date;
5
4 import io.swagger.annotations.ApiModel; 6 import io.swagger.annotations.ApiModel;
5 import io.swagger.annotations.ApiModelProperty; 7 import io.swagger.annotations.ApiModelProperty;
6 import lombok.Data; 8 import lombok.Data;
...@@ -74,4 +76,22 @@ public class DgBusinessSearchRequest extends PageInfo implements Serializable { ...@@ -74,4 +76,22 @@ public class DgBusinessSearchRequest extends PageInfo implements Serializable {
74 @ApiModelProperty(name = "zxlx", value = "注销类型") 76 @ApiModelProperty(name = "zxlx", value = "注销类型")
75 private String zxlx; 77 private String zxlx;
76 78
79
80 /**
81 * 登记业务名称
82 */
83 @ApiModelProperty(name = "djywmc", value = "登记业务名称")
84 private String djywmc;
85
86 /**
87 * 收件时间
88 */
89 @ApiModelProperty(name = "sjsj", value = "收件时间")
90 private Date sjsj;
91
92 /**
93 * 原业务标识码
94 */
95 @ApiModelProperty(name = "bsmYw", value = "原业务标识码")
96 private String bsmYw;
77 } 97 }
......
1 package com.pashanhoo.business.entity.vo; 1 package com.pashanhoo.business.entity.vo;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.Date;
5
4 import io.swagger.annotations.ApiModel; 6 import io.swagger.annotations.ApiModel;
5 import io.swagger.annotations.ApiModelProperty; 7 import io.swagger.annotations.ApiModelProperty;
6 import lombok.Data; 8 import lombok.Data;
...@@ -64,4 +66,21 @@ public class UpdateDgBusinessRequest implements Serializable { ...@@ -64,4 +66,21 @@ public class UpdateDgBusinessRequest implements Serializable {
64 private String djjgmc; 66 private String djjgmc;
65 67
66 68
69 /**
70 * 登记业务名称
71 */
72 @ApiModelProperty(name = "djywmc", value = "登记业务名称")
73 private String djywmc;
74
75 /**
76 * 收件时间
77 */
78 @ApiModelProperty(name = "sjsj", value = "收件时间")
79 private Date sjsj;
80
81 /**
82 * 原业务标识码
83 */
84 @ApiModelProperty(name = "bsmYw", value = "原业务标识码")
85 private String bsmYw;
67 } 86 }
......
...@@ -8,9 +8,13 @@ import org.springframework.stereotype.Component; ...@@ -8,9 +8,13 @@ import org.springframework.stereotype.Component;
8 import org.springframework.util.Assert; 8 import org.springframework.util.Assert;
9 import org.springframework.util.StringUtils; 9 import org.springframework.util.StringUtils;
10 import org.springframework.web.multipart.MultipartFile; 10 import org.springframework.web.multipart.MultipartFile;
11 import org.xmlpull.v1.XmlPullParserException;
11 12
12 import javax.annotation.PostConstruct; 13 import javax.annotation.PostConstruct;
13 import java.io.IOException; 14 import java.io.IOException;
15 import java.io.InputStream;
16 import java.security.InvalidKeyException;
17 import java.security.NoSuchAlgorithmException;
14 import java.util.*; 18 import java.util.*;
15 19
16 /** 20 /**
...@@ -98,7 +102,37 @@ public class MinioUtil { ...@@ -98,7 +102,37 @@ public class MinioUtil {
98 } 102 }
99 103
100 /** 104 /**
105 * 通过输入流上传到minio
106 * @param inputStream 文件输入流
107 * @param fileName 文件名,去除后缀名
108 * @param expandName 带.后缀名
109 * @param fileSize 文件大小
110 * @return
111 * @throws IOException
112 */
113 public FileAttribute transferToMinio(InputStream inputStream, String fileName, String expandName,String fileSize) throws IOException {
114 String savePath = FileAttachmentUtil.getSavePath(UUID.randomUUID().toString());
115 String contentType = contentTypeMap.get(expandName.toLowerCase());
116 // 下载地址
117 String saveUrl = savePath + "/" + fileName + expandName;
118 // 浏览器直接预览地址，针对图片
119 String pUrl = minioConfig.getType() + minioConfig.getEndpoint() + "/file/" + saveUrl;
120 try {
121 minioClient.putObject(minioConfig.getBucket(), saveUrl, inputStream, contentType);
122 } catch (Exception e) {
123 e.printStackTrace();
124 }
125 FileAttribute fileAttribute = new FileAttribute();
126 fileAttribute.setFileName(fileName);
127 fileAttribute.setFileSize(fileSize);
128 fileAttribute.setSaveUrl(saveUrl);
129 fileAttribute.setPreviewUrl(pUrl);
130 return fileAttribute;
131 }
132
133 /**
101 * 根据存储路径组装下载预览路径 134 * 根据存储路径组装下载预览路径
135 *
102 * @param saveUrl 136 * @param saveUrl
103 * @return 137 * @return
104 */ 138 */
......
...@@ -69,7 +69,7 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest ...@@ -69,7 +69,7 @@ public class DgArchivesDestructionServiceImpl extends ServiceImpl<DgArchivesDest
69 69
70 @Override 70 @Override
71 public Result showArchivesForDestruction(DgArchivesSearchRequest request) { 71 public Result showArchivesForDestruction(DgArchivesSearchRequest request) {
72 request.setDazt(new BigDecimal("4")); 72 request.setDazt(4);
73 return Result.ok(archivesService.searchDgArchivesList(request)); 73 return Result.ok(archivesService.searchDgArchivesList(request));
74 } 74 }
75 75
......
...@@ -100,8 +100,8 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive ...@@ -100,8 +100,8 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive
100 //新增档案表基础信息 100 //新增档案表基础信息
101 AddDgArchivesRequest archivesRequest=new AddDgArchivesRequest(); 101 AddDgArchivesRequest archivesRequest=new AddDgArchivesRequest();
102 String bsm_archives= IdWorker.get32UUID(); 102 String bsm_archives= IdWorker.get32UUID();
103 archivesRequest.setBsm_archives(bsm_archives); 103 archivesRequest.setBsmArchives(bsm_archives);
104 archivesRequest.setDazt(new BigDecimal("1")); 104 archivesRequest.setDazt(1);
105 archivesService.insertDgArchives(archivesRequest); 105 archivesService.insertDgArchives(archivesRequest);
106 //新增接收表和档案表关联关系表 106 //新增接收表和档案表关联关系表
107 AddDgReceiveRelationRequest relationRequest=new AddDgReceiveRelationRequest(); 107 AddDgReceiveRelationRequest relationRequest=new AddDgReceiveRelationRequest();
...@@ -117,8 +117,8 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive ...@@ -117,8 +117,8 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive
117 //组装档案表基础信息 117 //组装档案表基础信息
118 String bsm_archives= IdWorker.get32UUID(); 118 String bsm_archives= IdWorker.get32UUID();
119 request1=new AddDgArchivesRequest(); 119 request1=new AddDgArchivesRequest();
120 request1.setBsm_archives(bsm_archives); 120 request1.setBsmArchives(bsm_archives);
121 request1.setDazt(new BigDecimal("1")); 121 request1.setDazt(1);
122 archivesRequest.add(request1); 122 archivesRequest.add(request1);
123 //组装接收表和档案表关联关系表 123 //组装接收表和档案表关联关系表
124 receiveRelationRequest=new AddDgReceiveRelationRequest(); 124 receiveRelationRequest=new AddDgReceiveRelationRequest();
......
...@@ -6,8 +6,11 @@ import java.util.Date; ...@@ -6,8 +6,11 @@ import java.util.Date;
6 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableField; 7 import com.baomidou.mybatisplus.annotation.TableField;
8 import java.io.Serializable; 8 import java.io.Serializable;
9
10 import com.fasterxml.jackson.annotation.JsonFormat;
9 import lombok.Data; 11 import lombok.Data;
10 import lombok.EqualsAndHashCode; 12 import lombok.EqualsAndHashCode;
13 import org.springframework.format.annotation.DateTimeFormat;
11 14
12 /** 15 /**
13 * <p> 16 * <p>
...@@ -19,7 +22,7 @@ import lombok.EqualsAndHashCode; ...@@ -19,7 +22,7 @@ import lombok.EqualsAndHashCode;
19 */ 22 */
20 @Data 23 @Data
21 @EqualsAndHashCode(callSuper = false) 24 @EqualsAndHashCode(callSuper = false)
22 @TableName("DG_ARCHIVES_REPLENISH") 25 @TableName("DG_REPLENISH")
23 public class DgArchivesReplenishDO implements Serializable { 26 public class DgArchivesReplenishDO implements Serializable {
24 27
25 private static final long serialVersionUID = 1L; 28 private static final long serialVersionUID = 1L;
...@@ -43,7 +46,7 @@ public class DgArchivesReplenishDO implements Serializable { ...@@ -43,7 +46,7 @@ public class DgArchivesReplenishDO implements Serializable {
43 private String blbh; 46 private String blbh;
44 47
45 /** 48 /**
46 * 修改时间 49 * 创建时间
47 */ 50 */
48 @TableField("CREATETIME") 51 @TableField("CREATETIME")
49 private Date createTime; 52 private Date createTime;
...@@ -60,5 +63,19 @@ public class DgArchivesReplenishDO implements Serializable { ...@@ -60,5 +63,19 @@ public class DgArchivesReplenishDO implements Serializable {
60 @TableField("BZ") 63 @TableField("BZ")
61 private String bz; 64 private String bz;
62 65
66 /**
67 * 状态1:补录中,2:已归档
68 */
69 @TableField("STATE")
70 @DateTimeFormat(pattern = "yyyy-MM-dd")
71 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
72 private String state;
63 73
74 /**
75 * 归档时间
76 */
77 @TableField("GDSJ")
78 @DateTimeFormat(pattern = "yyyy-MM-dd")
79 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
80 private Date gdsj;
64 } 81 }
......
1 package com.pashanhoo.replenish.entity.vo; 1 package com.pashanhoo.replenish.entity.vo;
2 2
3 import java.util.Date;
4 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.List;
5 5
6 import com.fasterxml.jackson.annotation.JsonFormat; 6 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
7 import com.pashanhoo.bdcdy.entity.vo.AddDgBdcdyRequest;
8 import com.pashanhoo.business.entity.vo.AddDgBusinessRequest;
7 import io.swagger.annotations.ApiModel; 9 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 10 import io.swagger.annotations.ApiModelProperty;
9 import lombok.Data; 11 import lombok.Data;
10 import lombok.EqualsAndHashCode; 12 import lombok.EqualsAndHashCode;
11 import org.springframework.format.annotation.DateTimeFormat;
12 13
13 /** 14 /**
14 * <p> 15 * <p>
...@@ -25,38 +26,21 @@ public class AddDgArchivesReplenishRequest implements Serializable { ...@@ -25,38 +26,21 @@ public class AddDgArchivesReplenishRequest implements Serializable {
25 26
26 private static final long serialVersionUID = 1L; 27 private static final long serialVersionUID = 1L;
27 28
28
29 /** 29 /**
30 * 档案标识码 30 * 新增案卷基本信息
31 */ 31 */
32 @ApiModelProperty(name = "bsmArchives", value = "档案标识码") 32 @ApiModelProperty(name = "addDgArchivesRequest", value = "新增案卷基本信息")
33 private String bsmArchives; 33 private AddDgArchivesRequest addDgArchivesRequest;
34 34
35 /** 35 /**
36 * 原档案信息 36 * 新增业务信息
37 */ 37 */
38 @ApiModelProperty(name = "blbh", value = "原档案信息") 38 @ApiModelProperty(name = "addDgBusinessRequest",value = "新增业务信息")
39 private String blbh; 39 private AddDgBusinessRequest addDgBusinessRequest;
40 40
41 /** 41 /**
42 *补录人 42 * 新增不动产单元信息
43 */ 43 */
44 @ApiModelProperty(name = "creater", value = "补录人") 44 @ApiModelProperty(name = "addDgBdcdyRequests",value = "新增不动产单元信息")
45 private String creater; 45 private List<AddDgBdcdyRequest> addDgBdcdyRequests;
46
47 /**
48 * 补录时间
49 */
50 @ApiModelProperty(name = "createTime", value = "补录时间")
51 @DateTimeFormat(pattern = "yyyy-MM-dd")
52 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
53 private Date createTime;
54
55 /**
56 * 备注
57 */
58 @ApiModelProperty(name = "bz", value = "备注")
59 private String bz;
60
61
62 } 46 }
......
...@@ -3,6 +3,7 @@ package com.pashanhoo.replenish.entity.vo; ...@@ -3,6 +3,7 @@ package com.pashanhoo.replenish.entity.vo;
3 import java.util.Date; 3 import java.util.Date;
4 import java.io.Serializable; 4 import java.io.Serializable;
5 5
6 import com.baomidou.mybatisplus.annotation.TableField;
6 import com.fasterxml.jackson.annotation.JsonFormat; 7 import com.fasterxml.jackson.annotation.JsonFormat;
7 import io.swagger.annotations.ApiModel; 8 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 9 import io.swagger.annotations.ApiModelProperty;
...@@ -50,9 +51,9 @@ public class DgArchivesReplenishDetailVO implements Serializable { ...@@ -50,9 +51,9 @@ public class DgArchivesReplenishDetailVO implements Serializable {
50 private String creater; 51 private String creater;
51 52
52 /** 53 /**
53 * 补录时间 54 * 创建时间
54 */ 55 */
55 @ApiModelProperty(name = "createTime", value = "补录时间") 56 @ApiModelProperty(name = "createTime", value = "创建时间")
56 @DateTimeFormat(pattern = "yyyy-MM-dd") 57 @DateTimeFormat(pattern = "yyyy-MM-dd")
57 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") 58 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
58 private Date createTime; 59 private Date createTime;
...@@ -63,5 +64,19 @@ public class DgArchivesReplenishDetailVO implements Serializable { ...@@ -63,5 +64,19 @@ public class DgArchivesReplenishDetailVO implements Serializable {
63 @ApiModelProperty(name = "bz", value = "备注") 64 @ApiModelProperty(name = "bz", value = "备注")
64 private String bz; 65 private String bz;
65 66
67 /**
68 * 状态1:补录中,2:已归档
69 */
70 @TableField("STATE")
71 @DateTimeFormat(pattern = "yyyy-MM-dd")
72 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
73 private String state;
66 74
75 /**
76 * 归档时间
77 */
78 @TableField("GDSJ")
79 @DateTimeFormat(pattern = "yyyy-MM-dd")
80 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
81 private Date gdsj;
67 } 82 }
......
...@@ -3,6 +3,7 @@ package com.pashanhoo.replenish.entity.vo; ...@@ -3,6 +3,7 @@ package com.pashanhoo.replenish.entity.vo;
3 import java.util.Date; 3 import java.util.Date;
4 import java.io.Serializable; 4 import java.io.Serializable;
5 5
6 import com.baomidou.mybatisplus.annotation.TableField;
6 import com.fasterxml.jackson.annotation.JsonFormat; 7 import com.fasterxml.jackson.annotation.JsonFormat;
7 import io.swagger.annotations.ApiModel; 8 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 9 import io.swagger.annotations.ApiModelProperty;
...@@ -81,9 +82,9 @@ public class DgArchivesReplenishListVO implements Serializable { ...@@ -81,9 +82,9 @@ public class DgArchivesReplenishListVO implements Serializable {
81 private String bdcqzh; 82 private String bdcqzh;
82 83
83 /** 84 /**
84 * 补录时间 85 * 创建时间
85 */ 86 */
86 @ApiModelProperty(name = "createTime", value = "补录时间") 87 @ApiModelProperty(name = "createTime", value = "创建时间")
87 @DateTimeFormat(pattern = "yyyy-MM-dd") 88 @DateTimeFormat(pattern = "yyyy-MM-dd")
88 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") 89 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
89 private Date createTime; 90 private Date createTime;
...@@ -100,4 +101,19 @@ public class DgArchivesReplenishListVO implements Serializable { ...@@ -100,4 +101,19 @@ public class DgArchivesReplenishListVO implements Serializable {
100 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号") 101 @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
101 private String bdcdyh; 102 private String bdcdyh;
102 103
104 /**
105 * 状态1:补录中,2:已归档
106 */
107 @TableField("STATE")
108 @DateTimeFormat(pattern = "yyyy-MM-dd")
109 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
110 private String state;
111
112 /**
113 * 归档时间
114 */
115 @TableField("GDSJ")
116 @DateTimeFormat(pattern = "yyyy-MM-dd")
117 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
118 private Date gdsj;
103 } 119 }
......
...@@ -3,6 +3,7 @@ package com.pashanhoo.replenish.entity.vo; ...@@ -3,6 +3,7 @@ package com.pashanhoo.replenish.entity.vo;
3 import java.util.Date; 3 import java.util.Date;
4 import java.io.Serializable; 4 import java.io.Serializable;
5 5
6 import com.baomidou.mybatisplus.annotation.TableField;
6 import com.fasterxml.jackson.annotation.JsonFormat; 7 import com.fasterxml.jackson.annotation.JsonFormat;
7 import io.swagger.annotations.ApiModel; 8 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 9 import io.swagger.annotations.ApiModelProperty;
...@@ -51,11 +52,26 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial ...@@ -51,11 +52,26 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial
51 private String creater; 52 private String creater;
52 53
53 /** 54 /**
54 * 补录时间 55 * 创建时间
55 */ 56 */
56 @ApiModelProperty(name = "createTime", value = "补录时间") 57 @ApiModelProperty(name = "createTime", value = "创建时间")
57 @DateTimeFormat(pattern = "yyyy-MM-dd") 58 @DateTimeFormat(pattern = "yyyy-MM-dd")
58 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") 59 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
59 private Date createTime; 60 private Date createTime;
60 61
62 /**
63 * 状态1:补录中,2:已归档
64 */
65 @TableField("STATE")
66 @DateTimeFormat(pattern = "yyyy-MM-dd")
67 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
68 private String state;
69
70 /**
71 * 归档时间
72 */
73 @TableField("GDSJ")
74 @DateTimeFormat(pattern = "yyyy-MM-dd")
75 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
76 private Date gdsj;
61 } 77 }
......
1 package com.pashanhoo.replenish.entity.vo; 1 package com.pashanhoo.replenish.entity.vo;
2 2
3 import java.util.Date;
4 import java.io.Serializable; 3 import java.io.Serializable;
5 4 import java.util.List;
6 import com.fasterxml.jackson.annotation.JsonFormat; 5
6 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
7 import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
8 import com.pashanhoo.bdcdy.entity.vo.AddDgBdcdyRequest;
9 import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest;
10 import com.pashanhoo.business.entity.vo.AddDgBusinessRequest;
11 import com.pashanhoo.business.entity.vo.UpdateDgBusinessRequest;
7 import io.swagger.annotations.ApiModel; 12 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 13 import io.swagger.annotations.ApiModelProperty;
9 import lombok.Data; 14 import lombok.Data;
10 import lombok.EqualsAndHashCode; 15 import lombok.EqualsAndHashCode;
11 import org.springframework.format.annotation.DateTimeFormat;
12 16
13 /** 17 /**
14 * <p> 18 * <p>
...@@ -20,48 +24,26 @@ import org.springframework.format.annotation.DateTimeFormat; ...@@ -20,48 +24,26 @@ import org.springframework.format.annotation.DateTimeFormat;
20 */ 24 */
21 @Data 25 @Data
22 @EqualsAndHashCode(callSuper = false) 26 @EqualsAndHashCode(callSuper = false)
23 @ApiModel(value="档案补录信息修改请求实体") 27 @ApiModel(value = "档案补录信息修改请求实体")
24 public class UpdateDgArchivesReplenishRequest implements Serializable { 28 public class UpdateDgArchivesReplenishRequest implements Serializable {
25 29
26 private static final long serialVersionUID = 1L; 30 private static final long serialVersionUID = 1L;
27 31
28 /** 32 /**
29 * 修改标识码 33 * 更新案卷基本信息
30 */
31 @ApiModelProperty(name = "bsmModify", value = "修改标识码")
32 private String bsmModify;
33
34 /**
35 * 档案标识码
36 */
37 @ApiModelProperty(name = "bsmArchives", value = "档案标识码")
38 private String bsmArchives;
39
40 /**
41 * 原档案信息
42 */
43 @ApiModelProperty(name = "blbh", value = "原档案信息")
44 private String blbh;
45
46 /**
47 *补录人
48 */ 34 */
49 @ApiModelProperty(name = "creater", value = "补录人") 35 @ApiModelProperty(name = "updateDgArchivesRequest", value = "更新案卷基本信息")
50 private String creater; 36 private UpdateDgArchivesRequest updateDgArchivesRequest;
51 37
52 /** 38 /**
53 * 补录时间 39 * 更新业务信息
54 */ 40 */
55 @ApiModelProperty(name = "createTime", value = "补录时间") 41 @ApiModelProperty(name = "updateDgBusinessRequest", value = "更新业务信息")
56 @DateTimeFormat(pattern = "yyyy-MM-dd") 42 private UpdateDgBusinessRequest updateDgBusinessRequest;
57 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
58 private Date createTime;
59 43
60 /** 44 /**
61 * 备注 45 * 更新不动产单元信息
62 */ 46 */
63 @ApiModelProperty(name = "bz", value = "备注") 47 @ApiModelProperty(name = "updateDgBdcdyRequests", value = "更新不动产单元信息")
64 private String bz; 48 private List<UpdateDgBdcdyRequest> updateDgBdcdyRequests;
65
66
67 } 49 }
......
1 package com.pashanhoo.replenish.service.impl; 1 package com.pashanhoo.replenish.service.impl;
2 2
3 3
4 import cn.hutool.core.date.DateTime;
5 import cn.hutool.core.date.DateUtil;
6 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 import com.baomidou.mybatisplus.core.metadata.IPage; 7 import com.baomidou.mybatisplus.core.metadata.IPage;
8 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 9 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 10 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 import com.github.pagehelper.PageHelper; 11 import com.github.pagehelper.PageHelper;
8 import com.github.pagehelper.PageInfo; 12 import com.github.pagehelper.PageInfo;
13 import com.pashanhoo.archive.entity.DgArchivesConverter;
14 import com.pashanhoo.archive.entity.DgArchivesDO;
15 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
16 import com.pashanhoo.archive.entity.vo.UpdateDgArchivesRequest;
17 import com.pashanhoo.archive.service.DgArchivesService;
18 import com.pashanhoo.bdcdy.entity.DgBdcdyConverter;
19 import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
20 import com.pashanhoo.bdcdy.entity.vo.AddDgBdcdyRequest;
21 import com.pashanhoo.bdcdy.entity.vo.UpdateDgBdcdyRequest;
22 import com.pashanhoo.bdcdy.service.DgBdcdyService;
23 import com.pashanhoo.business.entity.DgBusinessConverter;
24 import com.pashanhoo.business.entity.DgBusinessDO;
25 import com.pashanhoo.business.entity.vo.AddDgBusinessRequest;
26 import com.pashanhoo.business.entity.vo.UpdateDgBusinessRequest;
27 import com.pashanhoo.business.service.DgBusinessService;
9 import com.pashanhoo.common.Result; 28 import com.pashanhoo.common.Result;
29 import com.pashanhoo.common.util.SysCode.SysCodeUtil;
30 import com.pashanhoo.common.util.SysCode.SysCodeVO;
10 import com.pashanhoo.replenish.entity.DgArchivesReplenishConverter; 31 import com.pashanhoo.replenish.entity.DgArchivesReplenishConverter;
11 import com.pashanhoo.replenish.entity.DgArchivesReplenishDO; 32 import com.pashanhoo.replenish.entity.DgArchivesReplenishDO;
12 import com.pashanhoo.replenish.entity.vo.*; 33 import com.pashanhoo.replenish.entity.vo.*;
...@@ -14,7 +35,9 @@ import com.pashanhoo.replenish.mapper.DgArchivesReplenishMapper; ...@@ -14,7 +35,9 @@ import com.pashanhoo.replenish.mapper.DgArchivesReplenishMapper;
14 import com.pashanhoo.replenish.service.DgArchivesReplenishService; 35 import com.pashanhoo.replenish.service.DgArchivesReplenishService;
15 import org.springframework.beans.factory.annotation.Autowired; 36 import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.stereotype.Service; 37 import org.springframework.stereotype.Service;
38 import org.springframework.transaction.annotation.Transactional;
17 39
40 import java.util.Date;
18 import java.util.List; 41 import java.util.List;
19 42
20 /** 43 /**
...@@ -34,6 +57,32 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen ...@@ -34,6 +57,32 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
34 @Autowired 57 @Autowired
35 private DgArchivesReplenishMapper dgarchivesreplenishMapper; 58 private DgArchivesReplenishMapper dgarchivesreplenishMapper;
36 59
60 @Autowired
61 private DgArchivesService dgArchivesService;
62
63 @Autowired
64 private DgArchivesConverter dgArchivesConverter;
65
66 @Autowired
67 private DgBusinessService dgBusinessService;
68
69 @Autowired
70 private DgBusinessConverter dgBusinessConverter;
71
72 @Autowired
73 private DgBdcdyService dgBdcdyService;
74
75 @Autowired
76 private DgBdcdyConverter dgBdcdyConverter;
77
78 @Autowired
79 SysCodeUtil sysCodeUtil;
80
81 /**
82 * 案卷基本信息状态补录中
83 */
84 private final Integer REPLENISHING = 2;
85
37 /** 86 /**
38 * 新增记录 87 * 新增记录
39 * 88 *
...@@ -41,9 +90,51 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen ...@@ -41,9 +90,51 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
41 * @return 90 * @return
42 */ 91 */
43 @Override 92 @Override
93 @Transactional(rollbackFor = Exception.class)
44 public boolean insertDgArchivesReplenish(AddDgArchivesReplenishRequest request) { 94 public boolean insertDgArchivesReplenish(AddDgArchivesReplenishRequest request) {
45 DgArchivesReplenishDO dgarchivesreplenishDO = dgarchivesreplenishConverter.addRequest2DO(request); 95
46 return this.save(dgarchivesreplenishDO); 96 //生成案卷标识码
97 String bsmArchive = IdWorker.get32UUID();
98
99 //案卷基本信息
100 AddDgArchivesRequest addDgArchivesRequest = request.getAddDgArchivesRequest();
101 addDgArchivesRequest.setBsmArchives(bsmArchive);
102 addDgArchivesRequest.setDazt(REPLENISHING);
103 DgArchivesDO dgArchivesDO = dgArchivesConverter.addRequest2DO(addDgArchivesRequest);
104 dgArchivesService.save(dgArchivesDO);
105
106 //业务信息
107 AddDgBusinessRequest addDgBusinessRequest = request.getAddDgBusinessRequest();
108 addDgBusinessRequest.setBsmArchives(bsmArchive);
109 DgBusinessDO dgBusinessDO = dgBusinessConverter.addRequest2DO(addDgBusinessRequest);
110 dgBusinessService.save(dgBusinessDO);
111
112 //不动产单元信息
113 List<AddDgBdcdyRequest> addDgBdcdyRequests = request.getAddDgBdcdyRequests();
114 for (AddDgBdcdyRequest addDgBdcdyRequest : addDgBdcdyRequests) {
115 addDgBdcdyRequest.setBsmArchives(bsmArchive);
116 }
117 List<DgBdcdyDO> dgBdcdyDOS = dgBdcdyConverter.addRequestListDO(addDgBdcdyRequests);
118 dgBdcdyService.saveBatch(dgBdcdyDOS);
119
120 //档案补录记录
121 DgArchivesReplenishDO dgArchivesReplenishDO = new DgArchivesReplenishDO();
122 dgArchivesReplenishDO.setBsmArchives(bsmArchive);
123 //获取补录编号
124 SysCodeVO sysCodeVO = new SysCodeVO();
125 sysCodeVO.setTaskno("BL" + DateUtil.year(DateUtil.date()));
126 sysCodeVO.setCtype("sequence");
127 sysCodeVO.setTaskname("补录序列号");
128 sysCodeVO.setTaskchild(5);
129 String blbh = sysCodeUtil.getSequence(sysCodeVO);
130 dgArchivesReplenishDO.setBlbh(blbh);
131 /******************************************************/
132 dgArchivesReplenishDO.setCreateTime(DateTime.now());
133 dgArchivesReplenishDO.setCreater(null);
134 dgArchivesReplenishDO.setBz(null);
135 dgArchivesReplenishDO.setState("1");
136 dgArchivesReplenishDO.setGdsj(null);
137 return this.save(dgArchivesReplenishDO);
47 } 138 }
48 139
49 /** 140 /**
...@@ -65,9 +156,32 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen ...@@ -65,9 +156,32 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
65 * @return 156 * @return
66 */ 157 */
67 @Override 158 @Override
159 @Transactional(rollbackFor = Exception.class)
68 public boolean updateDgArchivesReplenish(UpdateDgArchivesReplenishRequest request) { 160 public boolean updateDgArchivesReplenish(UpdateDgArchivesReplenishRequest request) {
69 DgArchivesReplenishDO dgarchivesreplenishDO = dgarchivesreplenishConverter.updateRequest2DO(request); 161
70 return this.updateById(dgarchivesreplenishDO); 162 //修改案卷基本信息
163 UpdateDgArchivesRequest updateDgArchivesRequest = request.getUpdateDgArchivesRequest();
164 DgArchivesDO dgArchivesDO = dgArchivesConverter.updateRequest2DO(updateDgArchivesRequest);
165 String bsmArchives = dgArchivesDO.getBsmArchives();
166 dgArchivesService.updateById(dgArchivesDO);
167
168 //修改不动产信息,先删除.后插入
169 List<UpdateDgBdcdyRequest> updateDgBdcdyRequests = request.getUpdateDgBdcdyRequests();
170 List<DgBdcdyDO> dgBdcdyDOS = dgBdcdyConverter.voList2DoList(updateDgBdcdyRequests);
171 //删除
172 QueryWrapper<DgBdcdyDO> wrapper = new QueryWrapper<>();
173 wrapper.lambda().eq(DgBdcdyDO::getBsmArchives, bsmArchives);
174 dgBdcdyService.remove(wrapper);
175 //插入
176 dgBdcdyService.saveBatch(dgBdcdyDOS);
177
178 //修改业务信息
179 UpdateDgBusinessRequest updateDgBusinessRequest = request.getUpdateDgBusinessRequest();
180 DgBusinessDO dgBusinessDO = dgBusinessConverter.updateRequest2DO(updateDgBusinessRequest);
181 QueryWrapper<DgBusinessDO> queryWrapper = new QueryWrapper<>();
182 queryWrapper.lambda().eq(DgBusinessDO::getBsmArchives, bsmArchives);
183 return dgBusinessService.update(dgBusinessDO,queryWrapper);
184
71 } 185 }
72 186
73 /** 187 /**
......
...@@ -60,8 +60,9 @@ management: ...@@ -60,8 +60,9 @@ management:
60 60
61 logging: 61 logging:
62 level: 62 level:
63 rent: 63 root: debug
64 mapper: debug 64 com:
65 mapper:
65 config: "classpath:logback-spring.xml" 66 config: "classpath:logback-spring.xml"
66 67
67 minio: 68 minio:
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
115 <onMismatch>DENY</onMismatch> 115 <onMismatch>DENY</onMismatch>
116 </filter> 116 </filter>
117 </appender> 117 </appender>
118 <logger name="house.platform.mapper" level="DEBUG" /> 118 <logger name="com.pashanhoo.mapper" level="DEBUG" />
119 119
120 <!-- 时间滚动输出 level为 ERROR 日志 --> 120 <!-- 时间滚动输出 level为 ERROR 日志 -->
121 <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> 121 <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
171 171
172 <!--开发环境:打印控制台--> 172 <!--开发环境:打印控制台-->
173 <springProfile name="dev"> 173 <springProfile name="dev">
174 <logger name="com.house" level="info"/> 174 <logger name="com.pashanhoo" level="info"/>
175 </springProfile> 175 </springProfile>
176 176
177 <root level="INFO"> 177 <root level="INFO">
......