答复委员附件

ruoyi-system/src/main/java/com/ruoyi/system/domain/ProposalInfo.java

@@ -168,6 +168,8 @@ public class ProposalInfo extends BaseEntity
     private List<ProposalUser> proposalUserList;
     /** 附件 */
     private List<ZxFj> zxFjList;
+    /** 答复委员附件附件 */
+    private List<ZxFj> dfFjList;
     /** 单位回复 */
     private List<ProposalUnitReply> proposalUnitReplyList;
     /**主办单位*/
@@ -195,6 +197,14 @@ public class ProposalInfo extends BaseEntity
     /** 单位是否答复（0：是，1：否） */
     private String isReply;
 
+    public List<ZxFj> getDfFjList() {
+        return dfFjList;
+    }
+
+    public void setDfFjList(List<ZxFj> dfFjList) {
+        this.dfFjList = dfFjList;
+    }
+
     public String getIsReply() {
         return isReply;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/sqmy/SqmyInfo.java

@@ -136,6 +136,8 @@ public class SqmyInfo extends BaseEntity
 
     /** 附件 */
     private List<ZxFj> zxFjList;
+    /** 答复委员附件附件 */
+    private List<ZxFj> dfFjList;
     /** 单位回复 */
     private List<SqmyUnitReply> sqmyUnitReplyList;
     /**主办单位*/
@@ -154,6 +156,13 @@ public class SqmyInfo extends BaseEntity
     private String startTime;
 
 
+    public List<ZxFj> getDfFjList() {
+        return dfFjList;
+    }
+
+    public void setDfFjList(List<ZxFj> dfFjList) {
+        this.dfFjList = dfFjList;
+    }
 
     public String getIsReply() {
         return isReply;

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

@@ -60,14 +60,19 @@ public class ProposalInfoServiceImpl implements IProposalInfoService
         zxFj.setType("1");
         List<ZxFj> zxFjList = zxFjMapper.selectZxFjList(zxFj);
         List<ZxFj> fjList = new ArrayList<>();
+        List<ZxFj> dfwyFjList = new ArrayList<>();
         if(zxFjList!=null && zxFjList.size()>0){
             for (ZxFj fj : zxFjList) {
                 if("4".equals(fj.getStytle())){
                     fjList.add(fj);
                 }
+                if("5".equals(fj.getStytle())){
+                    dfwyFjList.add(fj);
+                }
             }
 
             proposalInfo.setZxFjList(fjList);
+            proposalInfo.setDfFjList(dfwyFjList);
         }
         //查询人员
         ProposalUser proposalUser = new ProposalUser();

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

@@ -55,13 +55,18 @@ public class SqmyInfoServiceImpl implements ISqmyInfoService
         zxFj.setType("2");
         List<ZxFj> zxFjList = zxFjMapper.selectZxFjList(zxFj);
         List<ZxFj> fjList = new ArrayList<>();
+        List<ZxFj> dfwyFjList = new ArrayList<>();
         if(zxFjList!=null && zxFjList.size()>0){
             for (ZxFj fj : zxFjList) {
                 if("4".equals(fj.getStytle())){
                     fjList.add(fj);
                 }
+                if("5".equals(fj.getStytle())){
+                    dfwyFjList.add(fj);
+                }
             }
             sqmyInfo.setZxFjList(fjList);
+            sqmyInfo.setDfFjList(dfwyFjList);
         }
         //查询答复
         SqmyUnitReply sqmyUnitReply = new SqmyUnitReply();