fix 会议，活动，通知修改好

ruoyi-system/src/main/java/com/ruoyi/system/domain/activity/ZxActivity.java

@@ -78,7 +78,7 @@ public class ZxActivity extends BaseEntity
     /**
      * 附件
      */
-    private List<ZxFj> zxFjListFj;
+    private List<ZxFj> zxFjList;
 
     /** 是否参会 N:不参加 Y：参加 不在数据库中*/
     private String isJoin;
@@ -91,12 +91,12 @@ public class ZxActivity extends BaseEntity
         this.isJoin = isJoin;
     }
 
-    public List<ZxFj> getZxFjListFj() {
-        return zxFjListFj;
+    public List<ZxFj> getZxFjList() {
+        return zxFjList;
     }
 
-    public void setZxFjListFj(List<ZxFj> zxFjListFj) {
-        this.zxFjListFj = zxFjListFj;
+    public void setZxFjList(List<ZxFj> zxFjList) {
+        this.zxFjList = zxFjList;
     }
 
     public Long getUserId() {

ruoyi-system/src/main/java/com/ruoyi/system/domain/conference/ZxConference.java

@@ -70,7 +70,7 @@ public class ZxConference extends BaseEntity
     /**
      * 附件
      */
-    private List<ZxFj> zxFjListFj;
+    private List<ZxFj> zxFjList;
 
     /** 是否参会 N:不参加 Y：参加 不在数据库中*/
     private String isJoin;
@@ -83,13 +83,14 @@ public class ZxConference extends BaseEntity
         this.isJoin = isJoin;
     }
 
-    public List<ZxFj> getZxFjListFj() {
-        return zxFjListFj;
+    public List<ZxFj> getZxFjList() {
+        return zxFjList;
     }
 
-    public void setZxFjListFj(List<ZxFj> zxFjListFj) {
-        this.zxFjListFj = zxFjListFj;
+    public void setZxFjList(List<ZxFj> zxFjList) {
+        this.zxFjList = zxFjList;
     }
+
     public String getConferenceType() {
         return conferenceType;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/notice/ZxNotice.java

@@ -70,7 +70,7 @@ public class ZxNotice extends BaseEntity
     /**
      * 附件
      */
-    private List<ZxFj> zxFjListFj;
+    private List<ZxFj> zxFjList;
 
     public Long getUserId() {
         return userId;
@@ -80,12 +80,12 @@ public class ZxNotice extends BaseEntity
         this.userId = userId;
     }
 
-    public List<ZxFj> getZxFjListFj() {
-        return zxFjListFj;
+    public List<ZxFj> getZxFjList() {
+        return zxFjList;
     }
 
-    public void setZxFjListFj(List<ZxFj> zxFjListFj) {
-        this.zxFjListFj = zxFjListFj;
+    public void setZxFjList(List<ZxFj> zxFjList) {
+        this.zxFjList = zxFjList;
     }
 
     public String getType() {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxActivityServiceImpl.java

@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import static com.ruoyi.common.constant.CommonConstants.FIV;
 import static com.ruoyi.common.constant.CommonConstants.THR;
 
 /**
@@ -310,14 +311,14 @@ public class ZxActivityServiceImpl implements IZxActivityService {
      */
     public void insertZxFj(ZxActivity zxActivity)
     {
-        List<ZxFj> zxFjListFj = zxActivity.getZxFjListFj();
+        List<ZxFj> zxFjListFj = zxActivity.getZxFjList();
         Long activityId = zxActivity.getActivityId();
         if (StringUtils.isNotNull(zxFjListFj))
         {
             List<ZxFj> list = new ArrayList<ZxFj>();
             for (ZxFj zxFj : zxFjListFj)
             {
-                zxFj.setType(THR);
+                zxFj.setType(FIV);
                 zxFj.setMainId(activityId);
                 zxFj.setSourceId(activityId);
                 list.add(zxFj);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxConferenceServiceImpl.java

@@ -302,7 +302,7 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
      */
     public void insertZxFj(ZxConference zxConference)
     {
-        List<ZxFj> zxFjListFj = zxConference.getZxFjListFj();
+        List<ZxFj> zxFjListFj = zxConference.getZxFjList();
         Long conferenceId = zxConference.getConferenceId();
         if (StringUtils.isNotNull(zxFjListFj))
         {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxNoticeServiceImpl.java

@@ -174,7 +174,7 @@ public class ZxNoticeServiceImpl implements IZxNoticeService
      */
     public void insertZxFj(ZxNotice zxNotice)
     {
-        List<ZxFj> zxFjListFj = zxNotice.getZxFjListFj();
+        List<ZxFj> zxFjListFj = zxNotice.getZxFjList();
         Long zxNoticeId = zxNotice.getZxNoticeId();
         if (StringUtils.isNotNull(zxFjListFj))
         {