diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/AttachmentExcel.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/AttachmentExcel.java
new file mode 100644
index 00000000..7dfc55db
--- /dev/null
+++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/AttachmentExcel.java
@@ -0,0 +1,109 @@
+package com.ruoyi.project.domain;
+
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * @version 1.0
+ * @ClassName AttachmentExcel
+ * @Author yzj
+ * @Description //TODO 附件对应项目信息
+ * @Date 2022/6/20 21:16
+ **/
+public class AttachmentExcel {
+ @Excel(name = "项目编号*")
+ private String code;
+ @Excel(name = "类别*(项目/专题/课题)")
+ private String type;
+ @Excel(name = "报告电子文件名*")
+ private String filename;
+ @Excel(name = "报告标题*")
+ private String title;
+ @Excel(name = "报告密级*（机密/秘密/非密）")
+ private String secrecylevel;
+ @Excel(name = "关键词*")
+ private String keyWord;
+ @Excel(name = "报告摘要")
+ private String info;
+ @Excel(name = "备注")
+ private String remarks;
+ public AttachmentExcel() {
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getFilename() {
+ return filename;
+ }
+
+ public void setFilename(String filename) {
+ this.filename = filename;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getKeyWord() {
+ return keyWord;
+ }
+
+ public void setKeyWord(String keyWord) {
+ this.keyWord = keyWord;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+ public String getSecrecylevel() {
+ return secrecylevel;
+ }
+
+ public void setSecrecylevel(String secrecylevel) {
+ this.secrecylevel = secrecylevel;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ @Override
+ public String toString() {
+ return "AttachmentExcel{" +
+ "code='" + code + '\'' +
+ ", title='" + title + '\'' +
+ ", filename='" + filename + '\'' +
+ ", type='" + type + '\'' +
+ ", keyWord='" + keyWord + '\'' +
+ ", info='" + info + '\'' +
+ ", secrecylevel='" + secrecylevel + '\'' +
+ ", remarks='" + remarks + '\'' +
+ '}';
+ }
+}
diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/PaAttachment.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/PaAttachment.java
index 0eff9876..2a9e7a71 100644
--- a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/PaAttachment.java
+++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/PaAttachment.java
@@ -49,6 +49,43 @@ public class PaAttachment extends BaseEntity
/** $column.columnComment */
private String delFlag;
+ private String keyWord;
+ private String info;
+ private String secrecylevel;
+ private String remarks;
+
+ public String getKeyWord() {
+ return keyWord;
+ }
+
+ public void setKeyWord(String keyWord) {
+ this.keyWord = keyWord;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+ public String getSecrecylevel() {
+ return secrecylevel;
+ }
+
+ public void setSecrecylevel(String secrecylevel) {
+ this.secrecylevel = secrecylevel;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
public void setId(Long id)
{
this.id = id;
@@ -147,6 +184,10 @@ public class PaAttachment extends BaseEntity
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("delFlag", getDelFlag())
+ .append("keyWord",getKeyWord())
+ .append("info",getInfo())
+ .append("secrecylevel",getSecrecylevel())
+ .append("remarks",getRemarks())
.toString();
}
}
diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/IPaProjectInfoService.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/IPaProjectInfoService.java
index 9403fcf9..7b9526d8 100644
--- a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/IPaProjectInfoService.java
+++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/IPaProjectInfoService.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.service;
import com.ruoyi.project.domain.PaProjectInfo;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Map;
diff --git a/Rk-progect/ruoyi-project/src/main/resources/mapper/project/PaAttachmentMapper.xml b/Rk-progect/ruoyi-project/src/main/resources/mapper/project/PaAttachmentMapper.xml
index 50aee55d..75f4af4b 100644
--- a/Rk-progect/ruoyi-project/src/main/resources/mapper/project/PaAttachmentMapper.xml
+++ b/Rk-progect/ruoyi-project/src/main/resources/mapper/project/PaAttachmentMapper.xml
@@ -18,10 +18,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
- select id, project_id, title, path, filename, ext, file_size, type, create_by, create_time, update_by, update_time, del_flag from "PUBLIC"."pa_attachment"
+ select id, project_id, title, path, filename, ext, file_size, type, create_by, create_time, update_by, update_time, del_flag,
+ key_word,info,secrecy_level,remarks
+ from "PUBLIC"."pa_attachment"
@@ -57,6 +68,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
update_time,
del_flag,
+ key_word,
+ info,
+ secrecy_level,
+ remarks,
#{projectId},
@@ -71,6 +86,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateBy},
#{updateTime},
#{delFlag},
+ #{keyWord},
+ #{info},
+ #{secrecylevel},
+ #{remarks},
@@ -89,6 +108,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by = #{updateBy},
update_time = #{updateTime},
del_flag = #{delFlag},
+ key_word = #{keyWord},
+ info = #{info},
+ secrecy_level = #{secrecylevel},
+ remarks = #{remarks},
where id = #{id}
diff --git a/Rk-progect/ruoyi-project/target/classes/mapper/project/PaAttachmentMapper.xml b/Rk-progect/ruoyi-project/target/classes/mapper/project/PaAttachmentMapper.xml
index 50aee55d..75f4af4b 100644
--- a/Rk-progect/ruoyi-project/target/classes/mapper/project/PaAttachmentMapper.xml
+++ b/Rk-progect/ruoyi-project/target/classes/mapper/project/PaAttachmentMapper.xml
@@ -18,10 +18,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
- select id, project_id, title, path, filename, ext, file_size, type, create_by, create_time, update_by, update_time, del_flag from "PUBLIC"."pa_attachment"
+ select id, project_id, title, path, filename, ext, file_size, type, create_by, create_time, update_by, update_time, del_flag,
+ key_word,info,secrecy_level,remarks
+ from "PUBLIC"."pa_attachment"
@@ -57,6 +68,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
update_time,
del_flag,
+ key_word,
+ info,
+ secrecy_level,
+ remarks,
#{projectId},
@@ -71,6 +86,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateBy},
#{updateTime},
#{delFlag},
+ #{keyWord},
+ #{info},
+ #{secrecylevel},
+ #{remarks},
@@ -89,6 +108,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by = #{updateBy},
update_time = #{updateTime},
del_flag = #{delFlag},
+ key_word = #{keyWord},
+ info = #{info},
+ secrecy_level = #{secrecylevel},
+ remarks = #{remarks},
where id = #{id}