Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectAccessory/entity/ProjectAccessoryRelationInfo.java

@@ -30,6 +30,7 @@ public class ProjectAccessoryRelationInfo extends TreeEntity<ProjectAccessoryRel
 	private String attachmentProjectSort;		// 项目类别
 	private String attachmentProjectApprovalMoney;		// 送审金额
 	private String attachmentProjectPack;		// 打包类别
+	private List<Integer> requiredStageList;		// 必填阶段
 
 	public String getAttachName() {
 		return attachName;
@@ -166,4 +167,12 @@ public class ProjectAccessoryRelationInfo extends TreeEntity<ProjectAccessoryRel
 	public void setAttachmentProjectPack(String attachmentProjectPack) {
 		this.attachmentProjectPack = attachmentProjectPack;
 	}
-}
+
+	public List<Integer> getRequiredStageList() {
+		return requiredStageList;
+	}
+
+	public void setRequiredStageList(List<Integer> requiredStageList) {
+		this.requiredStageList = requiredStageList;
+	}
+}

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectTemplateService.java

@@ -332,6 +332,54 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
         return projectTemplateList;
     }
 
+    /**
+     * 归档审核页面各附件保存信息查看展示数据（归档中将报告的必填项也展示出来）
+     * @param projectTemplateInfo
+     * @return
+     */
+    public List<ProjectTemplateInfo> getProjectTemplateListByArchive(ProjectAccessoryRelationInfo projectTemplateInfo){
+        //查询所有被选择为必填项展示列，并查询附件信息
+        List<ProjectTemplateInfo> projectTemplateList = dao.getProjectTemplateList(projectTemplateInfo);
+        for (ProjectTemplateInfo info: projectTemplateList) {
+            WorkClientAttachment attchment = new WorkClientAttachment();
+            attchment.setProjectId(projectTemplateInfo.getId());
+            attchment.setAttachmentId(info.getId());
+            List<WorkClientAttachment> attachments = workattachmentService.getList(attchment);
+            //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+            workattachmentService.clientAttachmentManageOnUrl(attachments);
+            info.setWorkAttachments(attachments);
+            //判断是否为必填项，若为必填项则添加必填判定字段
+            if(projectTemplateInfo.getRequiredStageList().indexOf(info.getRequiredStage()) != -1){
+                info.setMustFlag(1);
+                //判定必填项的下的是否有附件信息
+                if (attachments.size()!=0){
+                    info.setFileFlag(1);
+                }
+            } else {
+                info.setMustFlag(0);
+                info.setFileFlag(0);
+            }
+        }
+        //查询没有被选择必填项的数据并查询是否已经上传附件，若有则添加到展示列中
+        List<ProjectTemplateInfo> otherProjectTemplateList = dao.projectAccessoryListByParentId(projectTemplateInfo);
+        for (ProjectTemplateInfo otherInfo: otherProjectTemplateList) {
+            WorkClientAttachment attchment = new WorkClientAttachment();
+            attchment.setProjectId(projectTemplateInfo.getId());
+            attchment.setAttachmentId(otherInfo.getId());
+            List<WorkClientAttachment> attachments = workattachmentService.getList(attchment);
+            //数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+            workattachmentService.clientAttachmentManageOnUrl(attachments);
+            if(attachments.size()>0){
+                otherInfo.setWorkAttachments(attachments);
+                otherInfo.setFileFlag(0);
+                otherInfo.setMustFlag(0);
+                projectTemplateList.add(otherInfo);
+            }
+        }
+
+        return projectTemplateList;
+    }
+
 
     public Integer getAttachmentCount(String attachmentId,String projectId){
             WorkClientAttachment attchment = new WorkClientAttachment();
@@ -381,4 +429,4 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
         return map;
     }
 
-}
+}

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

@@ -2360,7 +2360,11 @@ public class WorkProjectNotifyController extends BaseController {
 						}*/
 
 						//添加报告类型
-						relateInfo.setRequiredStage(2);
+						//relateInfo.setRequiredStage(2);
+						List<Integer> requiredStageList = Lists.newArrayList();
+						requiredStageList.add(1);
+						requiredStageList.add(2);
+						relateInfo.setRequiredStageList(requiredStageList);
 						relateInfo.setId(ruralProjectRecords.getId());
 						//查询报告文件、依据性文件、其他文件必填列表以及数据
 						List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
@@ -2368,13 +2372,13 @@ public class WorkProjectNotifyController extends BaseController {
 							relateInfo.setAttachType(mainDict.getValue());
 							switch (mainDict.getValue()) {
 								case "11":
-									projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+									projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateListByArchive(relateInfo));
 									break;
 								case "12":
-									projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+									projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateListByArchive(relateInfo));
 									break;
 								case "13":
-									projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+									projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateListByArchive(relateInfo));
 									break;
 							}
 

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -45,6 +45,7 @@
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
 				var projectId = '${project.id}';
+				var boolFlag = true;
 					if(obj == 2){
 						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessage/holdSaveRecord");