配农网下”投标文件、中标通知书、工程承包合同（协议书记专用条款部分）、补充协议

     ，送审工程预算、结算书	“可上传rar和zip文件

src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryController.java

@@ -18,6 +18,9 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryTree;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -49,7 +52,11 @@ public class ProjectAccessoryController extends BaseController {
 	private ProjectAccessoryService projectAccessoryService;
 	@Autowired
 	private ProjectTemplateService projectTemplateService;
-	
+	@Autowired
+	private RuralProjectRecordsService projectRecordsService;
+	@Autowired
+	private ProjectEngineeringService engineeringService;
+
 	@ModelAttribute
 	public ProjectAccessoryInfo get(@RequestParam(required=false) String id) {
 		ProjectAccessoryInfo entity = null;
@@ -343,7 +350,23 @@ public class ProjectAccessoryController extends BaseController {
 	 */
 	@RequestMapping("workAttachmentForm")
 	public String workAttachmentForm(String attachmentId, String projectId,String uploadMode, Model model){
+		//查询项目信息
+		RuralProjectRecords projectRecords = projectRecordsService.getQueryProjectUsers(projectId);
+		//查询“配农网”工程类型id
+		String engineeringId = engineeringService.getEngineeringId("202");
+
 		ProjectTemplateInfo projectTemplateInfo = projectTemplateService.get(attachmentId);
+		projectTemplateInfo.setAttachTypes(projectTemplateInfo.getAttachTypes().toLowerCase());
+		if(engineeringId.equals(projectRecords.getEngineeringType())){
+			if("投标文件、中标通知书、工程承包合同（协议书记专用条款部分）、补充协议".equals(projectTemplateInfo.getAttachName()) || "送审工程预算、结算书".equals(projectTemplateInfo.getAttachName()) ){
+				if(!projectTemplateInfo.getAttachTypes().contains("zip")){
+					projectTemplateInfo.setAttachTypes(projectTemplateInfo.getAttachTypes()+",zip");
+				}
+				if(!projectTemplateInfo.getAttachTypes().contains("rar")){
+					projectTemplateInfo.setAttachTypes(projectTemplateInfo.getAttachTypes()+",rar");
+				}
+			}
+		}
 		List<WorkClientAttachment> workAttachments = projectAccessoryService.getWorkAttachments(attachmentId,projectId);
 		projectTemplateInfo.setWorkAttachments(workAttachments);
 		projectTemplateInfo.setProjectId(projectId);

src/main/java/com/jeeplus/modules/projectEngineering/dao/ProjectEngineeringInfoDao.java

@@ -31,4 +31,11 @@ public interface ProjectEngineeringInfoDao extends CrudDao<ProjectEngineeringInf
     String selectOrderNum(String parentId);
 
     List<ProjectEngineeringInfo> fingIds(@Param("parentIdSet") Set<String> parentIdSet, @Param("companyId") String companyId);
+
+    /**
+     * 根据工程类型编号查询id
+     * @param indexNum
+     * @return
+     */
+    String getEngineeringId(String indexNum);
 }

src/main/java/com/jeeplus/modules/projectEngineering/service/ProjectEngineeringService.java

@@ -143,4 +143,15 @@ public class ProjectEngineeringService extends TreeService<ProjectEngineeringInf
         return engineeringInfoDao.selectOrderNum(parentId);
     }
 
+
+
+    /**
+     * 根据工程类型编号查询id
+     * @param indexNum
+     * @return
+     */
+    public String getEngineeringId(String indexNum){
+        return engineeringInfoDao.getEngineeringId(indexNum);
+    }
+
 }

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

@@ -19,6 +19,7 @@ import com.jeeplus.modules.projectAccessory.dao.ProjectTemplateDao;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
@@ -139,6 +140,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	private ProjectAccessoryRelationService projectAccessoryRelationService;
 	@Autowired
 	private ProjectTemplateDao projectTemplateDao;
+	@Autowired
+	private ProjectEngineeringService engineeringService;
 
 	/**
 	 * 获取咨询项目类别
@@ -1686,6 +1689,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	 * @return
 	 */
 	public RuralProjectcontentinfo formAccessory(RuralProjectRecords projectRecords){
+		//查询“配农网”工程类型id
+		String engineeringId = engineeringService.getEngineeringId("202");
 		RuralProjectcontentinfo projectcontentinfo = new RuralProjectcontentinfo();
 		//获取报告信息
 		ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
@@ -1761,7 +1766,21 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 					projectcontentinfo.setFileAttachmentList(this.getProjectTemplate(relateInfo,requiredStageList));
 					break;
 				case "12":
-					projectcontentinfo.setFileGistdataList(this.getProjectTemplate(relateInfo,requiredStageList));
+					List<ProjectTemplateInfo> projectTemplateList = this.getProjectTemplate(relateInfo, requiredStageList);
+					for (ProjectTemplateInfo info: projectTemplateList) {
+						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.setFileGistdataList(projectTemplateList);
 					break;
 				case "13":
 					projectcontentinfo.setFileOtherList(this.getProjectTemplate(relateInfo,requiredStageList));

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

@@ -15,6 +15,7 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
@@ -99,6 +100,8 @@ public class RuralCostProjectMessageController extends BaseController {
     private UserService userService;
     @Autowired
     private WorkStaffBasicInfoService workStaffBasicInfoService;
+    @Autowired
+    private ProjectEngineeringService engineeringService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -956,6 +959,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "formRecord")
     public String form(ProjectReportRecord projectReportRecord, Model model) throws Exception {
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
         if (StringUtils.isBlank(projectReportRecord.getView()) || !projectReportRecord.getView().equals("view")){
             if(StringUtils.isBlank(projectReportRecord.getId())){
                 projectReportRecord.setCreateDate(new Date());
@@ -1045,7 +1050,21 @@ public class RuralCostProjectMessageController extends BaseController {
                         projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
                         break;
                     case "12":
-                        projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                        for (ProjectTemplateInfo info: projectTemplateList) {
+                            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.setFileGistdataList(projectTemplateList);
                         break;
                     case "13":
                         projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
@@ -1085,6 +1104,8 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "formRecordModify")
     public String formRecordModify(ProjectReportRecord projectReportRecord, Model model) {
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
         if(StringUtils.isBlank(projectReportRecord.getId())){
             projectReportRecord.setCreateDate(new Date());
@@ -1149,7 +1170,21 @@ public class RuralCostProjectMessageController extends BaseController {
                         projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
                         break;
                     case "12":
-                        projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                        for (ProjectTemplateInfo info: projectTemplateList) {
+                            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.setFileGistdataList(projectTemplateList);
                         break;
                     case "13":
                         projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));

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

@@ -10,6 +10,7 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService;
@@ -77,6 +78,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
     private ProjectTemplateService projectTemplateService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private ProjectEngineeringService engineeringService;
 
     @ModelAttribute
     public RuralProjectRecords get(@RequestParam(required=false) String id) {
@@ -101,6 +104,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = {"form"})
     public String form(RuralProjectcontentinfo projectcontentinfo,Double reviewFee, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         model.addAttribute("parentIds", projectcontentinfo1.getParentIds());
         String dictType = projectcontentinfo.getDictType();
@@ -166,7 +171,21 @@ public class RuralCostProjectMessageNewController extends BaseController {
                     projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
                     break;
                 case "12":
-                    projectcontentinfo.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: projectTemplateList) {
+                        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.setFileGistdataList(projectTemplateList);
                     break;
                 case "13":
                     projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
@@ -262,6 +281,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
     @RequiresPermissions(value={"ruralProject:ruralCostProjectMessage:edit"},logical= Logical.OR)
     @RequestMapping(value = "modify")
     public String modify(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         projectReportData = projectReportDataService.get(projectReportData.getId());
@@ -370,7 +391,21 @@ public class RuralCostProjectMessageNewController extends BaseController {
                     projectcontent.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
                     break;
                 case "12":
-                    projectcontent.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: projectTemplateList) {
+                        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");
+                                }
+                            }
+                        }
+                    }
+                    projectcontent.setFileGistdataList(projectTemplateList);
                     break;
                 case "13":
                     projectcontent.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));

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

@@ -15,6 +15,7 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchDao;
 import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
@@ -113,6 +114,8 @@ public class RuralProjectMessageController extends BaseController {
     private RuralProjectRecordsService ruralProjectRecordsService;
     @Autowired
     private RuralProjectRecordsReportedDao ruralProjectRecordsReportedDao;
+    @Autowired
+    private ProjectEngineeringService engineeringService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -979,6 +982,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "formRecord")
     public String form(ProjectReportRecord projectReportRecord, Model model) throws Exception {
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
         if (StringUtils.isBlank(projectReportRecord.getView()) || !projectReportRecord.getView().equals("view")){
             if(StringUtils.isBlank(projectReportRecord.getId())){
                 projectReportRecord.setCreateDate(new Date());
@@ -1073,7 +1078,21 @@ public class RuralProjectMessageController extends BaseController {
                         projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
                         break;
                     case "12":
-                        projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                        for (ProjectTemplateInfo info: projectTemplateList) {
+                            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.setFileGistdataList(projectTemplateList);
                         break;
                     case "13":
                         projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
@@ -1112,6 +1131,8 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "formRecordModify")
     public String formRecordModify(ProjectReportRecord projectReportRecord, Model model) {
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
         if(StringUtils.isBlank(projectReportRecord.getId())){
             projectReportRecord.setCreateDate(new Date());
@@ -1176,7 +1197,21 @@ public class RuralProjectMessageController extends BaseController {
                         projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
                         break;
                     case "12":
-                        projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                        List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                        for (ProjectTemplateInfo info: projectTemplateList) {
+                            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.setFileGistdataList(projectTemplateList);
                         break;
                     case "13":
                         projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));

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

@@ -10,6 +10,7 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
+import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
@@ -83,6 +84,8 @@ public class RuralProjectMessageNewController extends BaseController {
     private RuralProjectRecordsService ruralProjectRecordsService;
     @Autowired
     private ProjectcontentinfoDao projectcontentinfoDao;
+    @Autowired
+    private ProjectEngineeringService engineeringService;
 
     @ModelAttribute
     public RuralProjectRecords get(@RequestParam(required=false) String id) {
@@ -108,6 +111,8 @@ public class RuralProjectMessageNewController extends BaseController {
      */
     @RequestMapping(value = {"form"})
     public String form(RuralProjectcontentinfo projectcontentinfo,Double reviewFee, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         model.addAttribute("parentIds", projectcontentinfo1.getParentIds());
         String dictType = projectcontentinfo.getDictType();
@@ -173,7 +178,21 @@ public class RuralProjectMessageNewController extends BaseController {
                     projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
                     break;
                 case "12":
-                    projectcontentinfo.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: projectTemplateList) {
+                        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.setFileGistdataList(projectTemplateList);
                     break;
                 case "13":
                     projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
@@ -268,6 +287,8 @@ public class RuralProjectMessageNewController extends BaseController {
     @RequiresPermissions(value={"ruralProject:ruralProjectMessage:edit"},logical= Logical.OR)
     @RequestMapping(value = "modify")
     public String modify(RuralProjectcontentinfo projectcontentinfo,Integer status, Model model, RedirectAttributes redirectAttributes) {
+        //查询“配农网”工程类型id
+        String engineeringId = engineeringService.getEngineeringId("202");
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         projectReportData = projectReportDataService.get(projectReportData.getId());
@@ -376,7 +397,21 @@ public class RuralProjectMessageNewController extends BaseController {
                     projectcontent.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
                     break;
                 case "12":
-                    projectcontent.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+                    for (ProjectTemplateInfo info: projectTemplateList) {
+                        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");
+                                }
+                            }
+                        }
+                    }
+                    projectcontent.setFileGistdataList(projectTemplateList);
                     break;
                 case "13":
                     projectcontent.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));

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

@@ -2310,6 +2310,8 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView";
 					}
 				} else if (workProjectNotify.getType().equals("96")) {    //工作内容报告new
+					//查询“配农网”工程类型id
+					String engineeringId = engineeringService.getEngineeringId("202");
 					ProjectReportData projectReportData = projectReportDataService.getOnRural(workProjectNotify.getNotifyId());
 					RuralProjectRecords ruralProjectRecords=ruralProjectRecordsService.getQueryProjectUsers(projectReportData.getProject().getId());
 					if(StringUtils.isBlank(ruralProjectRecords.getProjectMasterId())){
@@ -2430,7 +2432,21 @@ public class WorkProjectNotifyController extends BaseController {
 								projectcontentinfo.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
 								break;
 							case "12":
-								projectcontentinfo.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+								List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+								for (ProjectTemplateInfo info: projectTemplateList) {
+									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.setFileGistdataList(projectTemplateList);
 								break;
 							case "13":
 								projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
@@ -2777,6 +2793,8 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 
 				} else if (workProjectNotify.getType().equals("51")) {    //工作内容报告归档
+					//查询“配农网”工程类型id
+					String engineeringId = engineeringService.getEngineeringId("202");
 					ProjectReportRecord projectReportRecord = projectReportRecordService.get(workProjectNotify.getNotifyId());
 					//判断是否未全过程归档项目信息
 					if("3".equals(projectReportRecord.getReport().getProject().getProjectType())){
@@ -2876,7 +2894,21 @@ public class WorkProjectNotifyController extends BaseController {
 									projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateListByArchive(relateInfo));
 									break;
 								case "12":
-									projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateListByArchive(relateInfo));
+									List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
+									for (ProjectTemplateInfo info: projectTemplateList) {
+										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.setFileGistdataList(projectTemplateList);
 									break;
 								case "13":
 									projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateListByArchive(relateInfo));

src/main/resources/mappings/modules/projectEngineering/PeojectEngineeringDao.xml

@@ -121,4 +121,8 @@
         </where>
         ORDER BY a.index_num
     </select>
-</mapper>
+
+    <select id="getEngineeringId" resultType="java.lang.String">
+        select id from project_engineering_info where index_num=#{indexNum}
+    </select>
+</mapper>