上传文件展示500w以上配置信息

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

@@ -1509,15 +1509,20 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 
 			//查看送审金额是否为500w以上金额
 			Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-			if(0 == approvalMoney){
-				//金额为0
-				relateInfo.setAttachmentProjectApprovalMoney(null);
-			}else if(1 == approvalMoney){
-				//500w以下金额状态
-				relateInfo.setAttachmentProjectApprovalMoney("1");
-			}else{
-				//500w以上金额状态
-				relateInfo.setAttachmentProjectApprovalMoney("2");
+			approvalMoney = 2;
+			switch (approvalMoney){
+				case 0:
+					//金额为0
+					relateInfo.setAttachmentProjectApprovalMoney(null);
+					break;
+				case 1:
+					//500w以下金额状态
+					relateInfo.setAttachmentProjectApprovalMoney("1");
+					break;
+				case 2:
+					//500w以上金额状态
+					relateInfo.setAttachmentProjectApprovalMoney("2");
+					break;
 			}
 			//添加报告类型
 			relateInfo.setRequiredStage(1);
@@ -1669,15 +1674,21 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
 
 		}
-		if(0 == approvalMoney){
-			//金额为0
-			relateInfo.setAttachmentProjectApprovalMoney(null);
-		}else if(1 == approvalMoney){
-			//500w以下金额状态
-			relateInfo.setAttachmentProjectApprovalMoney("1");
-		}else{
-			//500w以上金额状态
-			relateInfo.setAttachmentProjectApprovalMoney("2");
+		//设置默认值为500w以上的展示数据
+		approvalMoney = 2;
+		switch (approvalMoney){
+			case 0:
+				//金额为0
+				relateInfo.setAttachmentProjectApprovalMoney(null);
+				break;
+			case 1:
+				//500w以下金额状态
+				relateInfo.setAttachmentProjectApprovalMoney("1");
+				break;
+			case 2:
+				//500w以上金额状态
+				relateInfo.setAttachmentProjectApprovalMoney("2");
+				break;
 		}
 		//创建阶段集合（若为归档阶段则将新增报告和归档阶段信息都添加在内）
 		List<Integer> requiredStageList = Lists.newArrayList();
@@ -1743,11 +1754,12 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			List<WorkClientAttachment> attachments = workClientAttachmentDao.getList(attchment);
 			info.setWorkAttachments(attachments);
 			//判断是否为必填项，若为必填项则添加必填判定字段
-			if(requiredStageList.contains(info.getRequiredStage())){
+			info.setMustFlag(0);
+			/*if(requiredStageList.contains(info.getRequiredStage())){
 				info.setMustFlag(1);
 			}else{
 				info.setMustFlag(0);
-			}
+			}*/
 		}
 		//查询没有被选择必填项的数据并查询是否已经上传附件，若有则添加到展示列中
 		List<ProjectTemplateInfo> otherProjectTemplateList = projectTemplateDao.projectAccessoryListByParentId(projectTemplateInfo);

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

@@ -190,16 +190,21 @@ public class RuralCostProjectMessageController extends BaseController {
             /*if(0 == projectSort){*/
                 //查看送审金额是否为500w以上金额
                 Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
-                if(0 == approvalMoney){
-                    //金额为0
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
-                }else if(1 == approvalMoney){
-                    //500w以下金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("1");
-                }else{
-                    //500w以上金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("2");
-                }
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
             /*}else{
                 relateInfo.setAttachmentProjectApprovalMoney(null);
             }*/
@@ -461,16 +466,21 @@ public class RuralCostProjectMessageController extends BaseController {
             /*if(0 == projectSort){*/
                 //查看送审金额是否为500w以上金额
                 Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-                if(0 == approvalMoney){
-                    //金额为0
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
-                }else if(1 == approvalMoney){
-                    //500w以下金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("1");
-                }else{
-                    //500w以上金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("2");
-                }
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
             /*}else{
                 relateInfo.setAttachmentProjectApprovalMoney(null);
             }*/
@@ -648,16 +658,21 @@ public class RuralCostProjectMessageController extends BaseController {
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
                 Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-                if(0 == approvalMoney){
-                    //金额为0
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
-                }else if(1 == approvalMoney){
-                    //500w以下金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("1");
-                }else{
-                    //500w以上金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("2");
-                }
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
             /*}else{
                 relateInfo.setAttachmentProjectApprovalMoney(null);
             }*/
@@ -912,16 +927,21 @@ public class RuralCostProjectMessageController extends BaseController {
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
                 Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(reportData.getReviewFee());
-                if(0 == approvalMoney){
-                    //金额为0
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
-                }else if(1 == approvalMoney){
-                    //500w以下金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("1");
-                }else{
-                    //500w以上金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("2");
-                }
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
             /*}else{
                 relateInfo.setAttachmentProjectApprovalMoney(null);
             }*/
@@ -1004,16 +1024,21 @@ public class RuralCostProjectMessageController extends BaseController {
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
                 Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
-                if(0 == approvalMoney){
-                    //金额为0
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
-                }else if(1 == approvalMoney){
-                    //500w以下金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("1");
-                }else{
-                    //500w以上金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("2");
-                }
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
             /*}else{
                 relateInfo.setAttachmentProjectApprovalMoney(null);
             }*/

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

@@ -214,16 +214,21 @@ public class RuralProjectMessageController extends BaseController {
             /*if(0 == projectSort){*/
                 //查看送审金额是否为500w以上金额
                 Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
-                if(0 == approvalMoney){
-                    //金额为0
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
-                }else if(1 == approvalMoney){
-                    //500w以下金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("1");
-                }else{
-                    //500w以上金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("2");
-                }
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
             /*}else{
                 relateInfo.setAttachmentProjectApprovalMoney(null);
             }*/
@@ -481,16 +486,21 @@ public class RuralProjectMessageController extends BaseController {
             /*if(0 == projectSort){*/
                 //查看送审金额是否为500w以上金额
                 Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-                if(0 == approvalMoney){
-                    //金额为0
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
-                }else if(1 == approvalMoney){
-                    //500w以下金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("1");
-                }else{
-                    //500w以上金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("2");
-                }
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
             /*}else{
                 relateInfo.setAttachmentProjectApprovalMoney(null);
             }*/
@@ -668,16 +678,21 @@ public class RuralProjectMessageController extends BaseController {
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
                 Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-                if(0 == approvalMoney){
-                    //金额为0
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
-                }else if(1 == approvalMoney){
-                    //500w以下金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("1");
-                }else{
-                    //500w以上金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("2");
-                }
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
             /*}else{
                 relateInfo.setAttachmentProjectApprovalMoney(null);
             }*/
@@ -938,16 +953,21 @@ public class RuralProjectMessageController extends BaseController {
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
                 Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(reportData.getReviewFee());
-                if(0 == approvalMoney){
-                    //金额为0
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
-                }else if(1 == approvalMoney){
-                    //500w以下金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("1");
-                }else{
-                    //500w以上金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("2");
-                }
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
             /*}else{
                 relateInfo.setAttachmentProjectApprovalMoney(null);
             }*/
@@ -1026,16 +1046,21 @@ public class RuralProjectMessageController extends BaseController {
             //if(0 == projectSort){
                 //查看送审金额是否为500w以上金额
                 Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
-                if(0 == approvalMoney){
-                    //金额为0
-                    relateInfo.setAttachmentProjectApprovalMoney(null);
-                }else if(1 == approvalMoney){
-                    //500w以下金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("1");
-                }else{
-                    //500w以上金额状态
-                    relateInfo.setAttachmentProjectApprovalMoney("2");
-                }
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
             /*}else{
                 relateInfo.setAttachmentProjectApprovalMoney(null);
             }*/

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

@@ -1811,16 +1811,22 @@ public class WorkProjectNotifyController extends BaseController {
 						//if(0 == projectSort){
 							//查看送审金额是否为500w以上金额
 							Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectcontentinfo.getProjectReportData().getReviewFee());
-							if(0 == approvalMoney){
-								//金额为0
-								relateInfo.setAttachmentProjectApprovalMoney(null);
-							}else if(1 == approvalMoney){
-								//500w以下金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("1");
-							}else{
-								//500w以上金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("2");
-							}
+					//设置默认值为500w以上的展示数据
+					approvalMoney = 2;
+					switch (approvalMoney){
+						case 0:
+							//金额为0
+							relateInfo.setAttachmentProjectApprovalMoney(null);
+							break;
+						case 1:
+							//500w以下金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("1");
+							break;
+						case 2:
+							//500w以上金额状态
+							relateInfo.setAttachmentProjectApprovalMoney("2");
+							break;
+					}
 						/*}else{
 							relateInfo.setAttachmentProjectApprovalMoney(null);
 						}*/
@@ -2003,32 +2009,41 @@ public class WorkProjectNotifyController extends BaseController {
 
 					//根据条件查询附件必填项
 					//判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
-					Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+					//Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
 
-					Boolean flag = false;
+					/*Boolean flag = false;
 					//如果是打包项目或者报告送审价不为null则可进行查询附件类型
 					if(1 == projectSort || null != projectReportRecord.getReport().getReviewFee()){
 						flag = true;
 					}
-					if(flag) {
+					if(flag) {*/
 						ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
 						//添加项目类型
 						relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
 						relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
 						//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
-						if(0 == projectSort){
+						//if(0 == projectSort){
 							//查看送审金额是否为500w以上金额
 							Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
-							if(1 == approvalMoney){
-								//500w以下金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("1");
-							}else{
-								//500w以上金额状态
-								relateInfo.setAttachmentProjectApprovalMoney("2");
+							//设置默认值为500w以上的展示数据
+							approvalMoney = 2;
+							switch (approvalMoney){
+								case 0:
+									//金额为0
+									relateInfo.setAttachmentProjectApprovalMoney(null);
+									break;
+								case 1:
+									//500w以下金额状态
+									relateInfo.setAttachmentProjectApprovalMoney("1");
+									break;
+								case 2:
+									//500w以上金额状态
+									relateInfo.setAttachmentProjectApprovalMoney("2");
+									break;
 							}
-						}else{
+						/*}else{
 							relateInfo.setAttachmentProjectApprovalMoney(null);
-						}
+						}*/
 
 						//添加报告类型
 						relateInfo.setRequiredStage(2);
@@ -2050,7 +2065,7 @@ public class WorkProjectNotifyController extends BaseController {
 							}
 
 						}
-					}
+					//}
 
 					model.addAttribute("projectReportRecord", projectReportRecord);
 					model.addAttribute("project", projectReportRecord.getReport().getProject());
@@ -3560,14 +3575,14 @@ public class WorkProjectNotifyController extends BaseController {
 				workProjectNotifyService.deleteByNotifyId(workProjectNotify);
 
 				//判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
-				Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+				//Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
 				List<ProjectTemplateInfo> attachmentList = Lists.newArrayList();
-				Boolean flag = false;
+				/*Boolean flag = false;
 				//如果是打包项目或者报告送审价不为null则可进行查询附件类型
 				if(1 == projectSort || null != projectReportData.getReviewFee()){
 					flag = true;
 				}
-				if(flag) {
+				if(flag) {*/
 					//查询报告文件、依据性文件、其他文件必填列表以及数据
 					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
 					ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
@@ -3577,25 +3592,34 @@ public class WorkProjectNotifyController extends BaseController {
 					relateInfo.setId(ruralProjectRecords.getId());
 					relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
 					//判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
-					if(0 == projectSort){
+					//if(0 == projectSort){
 						//查看送审金额是否为500w以上金额
 						Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportData.getReviewFee());
-						if(1 == approvalMoney){
-							//500w以下金额状态
-							relateInfo.setAttachmentProjectApprovalMoney("1");
-						}else{
-							//500w以上金额状态
-							relateInfo.setAttachmentProjectApprovalMoney("2");
+						//设置默认值为500w以上的展示数据
+						approvalMoney = 2;
+						switch (approvalMoney){
+							case 0:
+								//金额为0
+								relateInfo.setAttachmentProjectApprovalMoney(null);
+								break;
+							case 1:
+								//500w以下金额状态
+								relateInfo.setAttachmentProjectApprovalMoney("1");
+								break;
+							case 2:
+								//500w以上金额状态
+								relateInfo.setAttachmentProjectApprovalMoney("2");
+								break;
 						}
-					}else{
+					/*}else{
 						relateInfo.setAttachmentProjectApprovalMoney(null);
-					}
+					}*/
 					for (MainDictDetail mainDict : mainDictDetails) {
 						//添加报告类型
 						relateInfo.setAttachType(mainDict.getValue());
 						attachmentList.addAll(projectTemplateService.getProjectTemplateList(relateInfo));
 					}
-				}
+				//}