Commit 8db181df authored by huyuchen's avatar huyuchen

huych-电子档案批量导入第四次提交

parent 8a04736a
...@@ -84,9 +84,9 @@ public interface ArchiveConstants { ...@@ -84,9 +84,9 @@ public interface ArchiveConstants {
String MATERIAL_TYPE_RENEW = "续签"; String MATERIAL_TYPE_RENEW = "续签";
/** /**
* 资料类型-离职 * 资料类型-减员
*/ */
String MATERIAL_TYPE_LEAVE = "离职"; String MATERIAL_TYPE_LEAVE = "减员";
/** /**
* 处理结果-成功 * 处理结果-成功
......
...@@ -48,10 +48,10 @@ public class SingleArchiveUploadDTO { ...@@ -48,10 +48,10 @@ public class SingleArchiveUploadDTO {
private String deptName; private String deptName;
/** /**
* 资料类型(存量、新签、续签、离职 * 资料类型(存量、新签、续签、减员
*/ */
@NotBlank(message = "资料类型不能为空") @NotBlank(message = "资料类型不能为空")
@Schema(description = "资料类型(存量、新签、续签、离职)") @Schema(description = "资料类型(存量、新签、续签、减员)")
private String materialType; private String materialType;
} }
...@@ -84,11 +84,11 @@ public class TElectronicArchiveDetail extends BaseEntity { ...@@ -84,11 +84,11 @@ public class TElectronicArchiveDetail extends BaseEntity {
private String customerCode; private String customerCode;
/** /**
* 资料类型(存量、新签、续签、离职,多个用逗号分隔) * 资料类型(存量、新签、续签、减员,多个用逗号分隔)
*/ */
@ExcelAttribute(name = "资料类型") @ExcelAttribute(name = "资料类型")
@ExcelProperty("资料类型") @ExcelProperty("资料类型")
@Schema(description = "资料类型 存量、新签、续签、离职,多个用逗号分隔)") @Schema(description = "资料类型 存量、新签、续签、减员,多个用逗号分隔)")
private String materialType; private String materialType;
/** /**
...@@ -99,6 +99,14 @@ public class TElectronicArchiveDetail extends BaseEntity { ...@@ -99,6 +99,14 @@ public class TElectronicArchiveDetail extends BaseEntity {
@Schema(description = "档案所在地-省") @Schema(description = "档案所在地-省")
private Integer fileProvince; private Integer fileProvince;
/**
* 档案所在地
*/
@ExcelAttribute(name = "档案所在地")
@ExcelProperty("档案所在地")
@Schema(description = "档案所在地")
private String fileAddress;
/** /**
* 档案所在地-市 * 档案所在地-市
*/ */
......
...@@ -32,10 +32,10 @@ public class ArchiveAttachmentDeleteRequestVO { ...@@ -32,10 +32,10 @@ public class ArchiveAttachmentDeleteRequestVO {
private String taskId; private String taskId;
/** /**
* 资料类型(存量、新签、续签、离职 * 资料类型(存量、新签、续签、减员
*/ */
@NotBlank(message = "资料类型不能为空") @NotBlank(message = "资料类型不能为空")
@Schema(description = "资料类型(存量、新签、续签、离职)") @Schema(description = "资料类型(存量、新签、续签、减员)")
private String materialType; private String materialType;
/** /**
......
...@@ -32,42 +32,62 @@ public class ArchiveDownloadFeedbackVO implements Serializable { ...@@ -32,42 +32,62 @@ public class ArchiveDownloadFeedbackVO implements Serializable {
/** /**
* 身份证号码 * 身份证号码
*/ */
@ExcelProperty(value = "身份证号", index = 1) @ExcelProperty(value = "身份证号", index = 1)
@Schema(description = "身份证号") @Schema(description = "身份证号")
private String empIdcard; private String empIdcard;
/**
* 项目编码
*/
@ExcelProperty(value = "项目编码", index = 2)
@Schema(description = "项目编码")
private String deptNo;
/** /**
* 项目名称 * 项目名称
*/ */
@ExcelProperty(value = "项目名称", index = 3) @ExcelProperty(value = "项目名称", index = 3)
@Schema(description = "项目名称") @Schema(description = "项目名称")
private String deptName; private String deptName;
/**
* 客户名称
*/
@ExcelProperty(value = "客户名称", index = 4)
@Schema(description = "客户名称")
private String customerName;
/** /**
* 资料类型 * 资料类型
*/ */
@ExcelProperty(value = "资料类型", index = 4) @ExcelProperty(value = "资料类型", index = 5)
@Schema(description = "资料类型") @Schema(description = "资料类型")
private String materialType; private String materialType;
/**
* 资料类型
*/
@ExcelProperty(value = "档案所在地", index = 6)
@Schema(description = "档案所在地")
private String fileAddress;
/**
* 项目编码
*/
@ExcelProperty(value = "项目编码", index = 7)
@Schema(description = "项目编码")
private String deptNo;
/**
* 客户编码
*/
@ExcelProperty(value = "客户编码", index = 8)
@Schema(description = "客户编码")
private String customerCode;
/** /**
* 下载状态(成功/失败) * 下载状态(成功/失败)
*/ */
@ExcelProperty(value = "下载状态", index = 5) @ExcelProperty(value = "下载状态", index = 9)
@Schema(description = "下载状态") @Schema(description = "下载状态")
private String downloadStatus; private String downloadStatus;
/** /**
* 失败原因 * 失败原因
*/ */
@ExcelProperty(value = "失败原因", index = 6) @ExcelProperty(value = "失败原因", index = 10)
@Schema(description = "失败原因") @Schema(description = "失败原因")
private String failReason; private String failReason;
} }
......
...@@ -56,7 +56,7 @@ public class ArchiveFeedbackVO implements Serializable { ...@@ -56,7 +56,7 @@ public class ArchiveFeedbackVO implements Serializable {
*/ */
@ExcelAttribute(name = "资料类型") @ExcelAttribute(name = "资料类型")
@ExcelProperty(value = "资料类型", index = 4) @ExcelProperty(value = "资料类型", index = 4)
@Schema(description = "资料类型(存量、新签、续签、离职)") @Schema(description = "资料类型(存量、新签、续签、减员)")
private String materialType; private String materialType;
/** /**
......
...@@ -39,7 +39,7 @@ public class ArchiveSelectedExportRequestVO implements Serializable { ...@@ -39,7 +39,7 @@ public class ArchiveSelectedExportRequestVO implements Serializable {
* 资料类型列表(要导出的资料类型) * 资料类型列表(要导出的资料类型)
*/ */
@NotEmpty(message = "资料类型列表不能为空") @NotEmpty(message = "资料类型列表不能为空")
@Schema(description = "资料类型列表(存量、新签、续签、离职)") @Schema(description = "资料类型列表(存量、新签、续签、减员)")
private List<String> materialTypes; private List<String> materialTypes;
} }
...@@ -49,10 +49,10 @@ public class SingleArchiveUploadVO implements Serializable { ...@@ -49,10 +49,10 @@ public class SingleArchiveUploadVO implements Serializable {
private String deptName; private String deptName;
/** /**
* 资料类型(存量、新签、续签、离职 * 资料类型(存量、新签、续签、减员
*/ */
@NotBlank(message = "资料类型不能为空") @NotBlank(message = "资料类型不能为空")
@Schema(description = "资料类型(存量、新签、续签、离职)") @Schema(description = "资料类型(存量、新签、续签、减员)")
private String materialType; private String materialType;
/** /**
......
...@@ -59,10 +59,10 @@ public class TElectronicArchiveDetailVo extends RowIndex implements Serializable ...@@ -59,10 +59,10 @@ public class TElectronicArchiveDetailVo extends RowIndex implements Serializable
@ExcelProperty("客户编码") @ExcelProperty("客户编码")
private String customerCode; private String customerCode;
/** /**
* 资料类型(存量、新签、续签、离职,多个用逗号分隔) * 资料类型(存量、新签、续签、减员,多个用逗号分隔)
*/ */
@ExcelAttribute(name = "资料类型") @ExcelAttribute(name = "资料类型")
@Schema(description = "资料类型(存量、新签、续签、离职,多个用逗号分隔)") @Schema(description = "资料类型(存量、新签、续签、减员,多个用逗号分隔)")
@ExcelProperty("资料类型") @ExcelProperty("资料类型")
private String materialType; private String materialType;
/** /**
......
...@@ -45,7 +45,7 @@ public class TaskAttachmentGroupVO { ...@@ -45,7 +45,7 @@ public class TaskAttachmentGroupVO {
/** /**
* 资料类型及对应的附件列表 * 资料类型及对应的附件列表
* key: 资料类型(存量、新签、续签、离职 * key: 资料类型(存量、新签、续签、减员
* value: 该资料类型下的附件列表 * value: 该资料类型下的附件列表
*/ */
@Schema(description = "资料类型及对应的附件列表") @Schema(description = "资料类型及对应的附件列表")
......
...@@ -117,7 +117,7 @@ public class FileUploadController { ...@@ -117,7 +117,7 @@ public class FileUploadController {
* @Date 2019-08-16 * @Date 2019-08-16
* @param id domainId * @param id domainId
**/ **/
@Operation(description = "附件预览下载地址 资源类型 0 存量 1 新签 2续签 3离职") @Operation(description = "附件预览下载地址 资源类型 0 存量 1 新签 2续签 3减员")
@GetMapping("/ossFileUrl/{id}") @GetMapping("/ossFileUrl/{id}")
public R<List<TAttaInfo>> ossFileUrl(@PathVariable String id) { public R<List<TAttaInfo>> ossFileUrl(@PathVariable String id) {
List<TAttaInfo> attas = tAttaInfoService.list(Wrappers.<TAttaInfo>query().lambda().eq(TAttaInfo::getDomainId,id)); List<TAttaInfo> attas = tAttaInfoService.list(Wrappers.<TAttaInfo>query().lambda().eq(TAttaInfo::getDomainId,id));
......
...@@ -617,7 +617,7 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic ...@@ -617,7 +617,7 @@ public class TElectronicArchiveDetailServiceImpl extends ServiceImpl<TElectronic
// 2. 校验资料类型是否有效 // 2. 校验资料类型是否有效
if (isValidMaterialType(request.getMaterialType())) { if (isValidMaterialType(request.getMaterialType())) {
return R.failed("资料类型不正确,必须为:存量、新签、续签、离职"); return R.failed("资料类型不正确,必须为:存量、新签、续签、减员");
} }
// 3. 查询要删除的附件 // 3. 查询要删除的附件
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="updateBy" column="UPDATE_BY"/> <result property="updateBy" column="UPDATE_BY"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="fileAddress" column="FILE_ADRESS"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -42,7 +43,8 @@ ...@@ -42,7 +43,8 @@
a.CREATE_NAME, a.CREATE_NAME,
a.CREATE_TIME, a.CREATE_TIME,
a.UPDATE_BY, a.UPDATE_BY,
a.UPDATE_TIME a.UPDATE_TIME,
a.FILE_ADRESS
</sql> </sql>
<sql id="tElectronicArchiveDetail_where"> <sql id="tElectronicArchiveDetail_where">
<if test="tElectronicArchiveDetail != null"> <if test="tElectronicArchiveDetail != null">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment