配农网下“审定单，

     咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书”可提交压缩文件

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -1763,7 +1763,21 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			relateInfo.setAttachType(mainDict.getValue());
 			switch (mainDict.getValue()) {
 				case "11":
-					projectcontentinfo.setFileAttachmentList(this.getProjectTemplate(relateInfo,requiredStageList));
+					List<ProjectTemplateInfo> fileAttachmentList = this.getProjectTemplate(relateInfo,requiredStageList);
+					for (ProjectTemplateInfo info: fileAttachmentList) {
+						info.setAttachTypes(info.getAttachTypes().toLowerCase());
+						if(engineeringId.equals(projectRecords.getEngineeringType())){
+							if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+								if(!info.getAttachTypes().contains("zip")){
+									info.setAttachTypes(info.getAttachTypes()+",zip");
+								}
+								if(!info.getAttachTypes().contains("rar")){
+									info.setAttachTypes(info.getAttachTypes()+",rar");
+								}
+							}
+						}
+					}
+					projectcontentinfo.setFileAttachmentList(fileAttachmentList);
 					break;
 				case "12":
 					List<ProjectTemplateInfo> projectTemplateList = this.getProjectTemplate(relateInfo, requiredStageList);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -1047,7 +1047,21 @@ public class RuralCostProjectMessageController extends BaseController {
                 relateInfo.setAttachType(mainDict.getValue());
                 switch (mainDict.getValue()) {
                     case "11":
-                        projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                        for (ProjectTemplateInfo info: fileAttachmentList) {
+                            info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                            if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                                if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                    if(!info.getAttachTypes().contains("zip")){
+                                        info.setAttachTypes(info.getAttachTypes()+",zip");
+                                    }
+                                    if(!info.getAttachTypes().contains("rar")){
+                                        info.setAttachTypes(info.getAttachTypes()+",rar");
+                                    }
+                                }
+                            }
+                        }
+                        projectReportRecord.setFileAttachmentList(fileAttachmentList);
                         break;
                     case "12":
                         List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
@@ -1167,7 +1181,21 @@ public class RuralCostProjectMessageController extends BaseController {
                 relateInfo.setAttachType(mainDict.getValue());
                 switch (mainDict.getValue()) {
                     case "11":
-                        projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                        for (ProjectTemplateInfo info: fileAttachmentList) {
+                            info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                            if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                                if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                    if(!info.getAttachTypes().contains("zip")){
+                                        info.setAttachTypes(info.getAttachTypes()+",zip");
+                                    }
+                                    if(!info.getAttachTypes().contains("rar")){
+                                        info.setAttachTypes(info.getAttachTypes()+",rar");
+                                    }
+                                }
+                            }
+                        }
+                        projectReportRecord.setFileAttachmentList(fileAttachmentList);
                         break;
                     case "12":
                         List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -168,7 +168,21 @@ public class RuralCostProjectMessageNewController extends BaseController {
             relateInfo.setAttachType(mainDict.getValue());
             switch (mainDict.getValue()) {
                 case "11":
-                    projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: fileAttachmentList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(records.getEngineeringType())){
+                            if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
+                                }
+                            }
+                        }
+                    }
+                    projectcontentinfo.setFileAttachmentList(fileAttachmentList);
                     break;
                 case "12":
                     List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
@@ -388,7 +402,21 @@ public class RuralCostProjectMessageNewController extends BaseController {
             relateInfo.setAttachType(mainDict.getValue());
             switch (mainDict.getValue()) {
                 case "11":
-                    projectcontent.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: fileAttachmentList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                            if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
+                                }
+                            }
+                        }
+                    }
+                    projectcontentinfo.setFileAttachmentList(fileAttachmentList);
                     break;
                 case "12":
                     List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -1075,7 +1075,21 @@ public class RuralProjectMessageController extends BaseController {
                 relateInfo.setAttachType(mainDict.getValue());
                 switch (mainDict.getValue()) {
                     case "11":
-                        projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                        for (ProjectTemplateInfo info: fileAttachmentList) {
+                            info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                            if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                                if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                    if(!info.getAttachTypes().contains("zip")){
+                                        info.setAttachTypes(info.getAttachTypes()+",zip");
+                                    }
+                                    if(!info.getAttachTypes().contains("rar")){
+                                        info.setAttachTypes(info.getAttachTypes()+",rar");
+                                    }
+                                }
+                            }
+                        }
+                        projectReportRecord.setFileAttachmentList(fileAttachmentList);
                         break;
                     case "12":
                         List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
@@ -1194,7 +1208,21 @@ public class RuralProjectMessageController extends BaseController {
                 relateInfo.setAttachType(mainDict.getValue());
                 switch (mainDict.getValue()) {
                     case "11":
-                        projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                        for (ProjectTemplateInfo info: fileAttachmentList) {
+                            info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                            if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                                if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                    if(!info.getAttachTypes().contains("zip")){
+                                        info.setAttachTypes(info.getAttachTypes()+",zip");
+                                    }
+                                    if(!info.getAttachTypes().contains("rar")){
+                                        info.setAttachTypes(info.getAttachTypes()+",rar");
+                                    }
+                                }
+                            }
+                        }
+                        projectReportRecord.setFileAttachmentList(fileAttachmentList);
                         break;
                     case "12":
                         List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java

@@ -175,7 +175,21 @@ public class RuralProjectMessageNewController extends BaseController {
             relateInfo.setAttachType(mainDict.getValue());
             switch (mainDict.getValue()) {
                 case "11":
-                    projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: fileAttachmentList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(records.getEngineeringType())){
+                            if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
+                                }
+                            }
+                        }
+                    }
+                    projectcontentinfo.setFileAttachmentList(fileAttachmentList);
                     break;
                 case "12":
                     List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
@@ -394,7 +408,21 @@ public class RuralProjectMessageNewController extends BaseController {
             relateInfo.setAttachType(mainDict.getValue());
             switch (mainDict.getValue()) {
                 case "11":
-                    projectcontent.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: fileAttachmentList) {
+                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
+                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+                            if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+                                if(!info.getAttachTypes().contains("zip")){
+                                    info.setAttachTypes(info.getAttachTypes()+",zip");
+                                }
+                                if(!info.getAttachTypes().contains("rar")){
+                                    info.setAttachTypes(info.getAttachTypes()+",rar");
+                                }
+                            }
+                        }
+                    }
+                    projectcontentinfo.setFileAttachmentList(fileAttachmentList);
                     break;
                 case "12":
                     List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2436,7 +2436,21 @@ public class WorkProjectNotifyController extends BaseController {
 						relateInfo.setAttachType(mainDict.getValue());
 						switch (mainDict.getValue()) {
 							case "11":
-								projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+								List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+								for (ProjectTemplateInfo info: fileAttachmentList) {
+									info.setAttachTypes(info.getAttachTypes().toLowerCase());
+									if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+										if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+											if(!info.getAttachTypes().contains("zip")){
+												info.setAttachTypes(info.getAttachTypes()+",zip");
+											}
+											if(!info.getAttachTypes().contains("rar")){
+												info.setAttachTypes(info.getAttachTypes()+",rar");
+											}
+										}
+									}
+								}
+								projectcontentinfo.setFileAttachmentList(fileAttachmentList);
 								break;
 							case "12":
 								List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
@@ -2899,7 +2913,21 @@ public class WorkProjectNotifyController extends BaseController {
 							relateInfo.setAttachType(mainDict.getValue());
 							switch (mainDict.getValue()) {
 								case "11":
-									projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateListByArchive(relateInfo));
+									List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
+									for (ProjectTemplateInfo info: fileAttachmentList) {
+										info.setAttachTypes(info.getAttachTypes().toLowerCase());
+										if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
+											if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
+												if(!info.getAttachTypes().contains("zip")){
+													info.setAttachTypes(info.getAttachTypes()+",zip");
+												}
+												if(!info.getAttachTypes().contains("rar")){
+													info.setAttachTypes(info.getAttachTypes()+",rar");
+												}
+											}
+										}
+									}
+									projectReportRecord.setFileAttachmentList(fileAttachmentList);
 									break;
 								case "12":
 									List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);