审核类型

src/main/java/com/jeeplus/modules/identification/dao/AuditTemplateTypeDao.java

@@ -4,6 +4,8 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.identification.entity.AuditTemplateType;
 
+import java.util.List;
+
 /**
  * @Author bai
  * Date on 2022/3/18  8:50
@@ -11,4 +13,6 @@ import com.jeeplus.modules.identification.entity.AuditTemplateType;
  */
 @MyBatisDao
 public interface AuditTemplateTypeDao extends CrudDao<AuditTemplateType> {
+
+    Integer findIdentification(String identification);
 }

src/main/java/com/jeeplus/modules/identification/service/AuditTemplateTypeService.java

@@ -44,4 +44,9 @@ public class AuditTemplateTypeService extends CrudService<AuditTemplateTypeDao,
     public void delete(AuditTemplateType auditTemplateType) {
         super.delete(auditTemplateType);
     }
+
+    @Transactional(readOnly = false)
+    public Boolean findIdentification(String identification){
+        return auditTemplateTypeDao.findIdentification(identification) > 0 ? true :false;
+    }
 }

src/main/java/com/jeeplus/modules/identification/web/AuditTemplateTypeController.java

@@ -6,6 +6,8 @@ import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.identification.entity.AuditTemplateType;
 import com.jeeplus.modules.identification.service.AuditTemplateTypeService;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +20,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
+import java.util.*;
 
 /**
  * 自定义审核模板类型controller
@@ -29,7 +31,7 @@ import java.util.Date;
 @RequestMapping(value = "${adminPath}/auditTemplate/auditTemplateType")
 public class AuditTemplateTypeController {
 
-    @Autowired
+    @Autowired(required = false)
     private AuditTemplateTypeService auditTemplateTypeService;
 
 
@@ -60,9 +62,24 @@ public class AuditTemplateTypeController {
 
     @RequestMapping("/form")
     public String form(AuditTemplateType auditTemplateType,Model model){
+
+        List<MainDictDetail> mainDictList = DictUtils.getMainDictList("audit_opinion");
+
         if (auditTemplateType != null && StringUtils.isNotBlank(auditTemplateType.getId())){
+            model.addAttribute("mainDictList", mainDictList);
+            model.addAttribute("auditTemplateType",auditTemplateType);
             return  "modules/identification/AuditTemplateTypeForm";
         }
+
+        Iterator<MainDictDetail> it=mainDictList.iterator();
+        while (it.hasNext()){
+            String value = it.next().getValue();
+            if (auditTemplateTypeService.findIdentification(value)){
+                it.remove();
+            }
+        }
+
+        model.addAttribute("mainDictList", mainDictList);
         auditTemplateType.setCreateBy(UserUtils.getUser());
         auditTemplateType.setCreateDate(new Date());
         model.addAttribute("auditTemplateType",auditTemplateType);
@@ -73,9 +90,9 @@ public class AuditTemplateTypeController {
 
     @RequestMapping(value = "save")
     public String save(AuditTemplateType auditTemplateType, Model model, RedirectAttributes redirectAttributes) throws Exception{
-//        if (!beanValidator(model, auditTemplateType)){
-//            return form(auditTemplateType, model);
-//        }
+
+
+
         if(!auditTemplateType.getIsNewRecord()){//编辑表单保存
             AuditTemplateType t = auditTemplateTypeService.get(auditTemplateType.getId());//从数据库取出记录的值
             MyBeanUtils.copyBeanNotNull2Bean(auditTemplateType, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -83,8 +100,7 @@ public class AuditTemplateTypeController {
         }else{//新增表单保存
             auditTemplateTypeService.save(auditTemplateType);//保存
         }
-//        addMessage(redirectAttributes, "保存成功");
-        return "redirect:"+ Global.getAdminPath()+"/fauditTemplate/auditTemplateType?repage";
+        return "redirect:"+ Global.getAdminPath()+"/auditTemplate/auditTemplateType?repage";
     }
 
 
@@ -95,7 +111,9 @@ public class AuditTemplateTypeController {
 
         auditTemplateTypeService.delete(auditTemplateType);
         // 返回列表
-        return "redirect:"+ Global.getAdminPath()+"/fauditTemplate/auditTemplateType?repage";
+        return "redirect:"+ Global.getAdminPath()+"/auditTemplate/auditTemplateType?repage";
     }
 
+
+
 }

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

@@ -31,6 +31,15 @@ public class ProjectAccessoryRelationInfo extends TreeEntity<ProjectAccessoryRel
 	private String attachmentProjectApprovalMoney;		// 送审金额
 	private String attachmentProjectPack;		// 打包类别
 	private List<Integer> requiredStageList;		// 必填阶段
+	private boolean flag;  //判断送审金额1000万
+
+	public boolean isFlag() {
+		return flag;
+	}
+
+	public void setFlag(boolean flag) {
+		this.flag = flag;
+	}
 
 	public String getAttachName() {
 		return attachName;

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

@@ -335,6 +335,13 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
                 info.setMustFlag(0);
                 info.setFileFlag(0);
             }
+            if (("咨询效果评价表").equals(info.getAttachName()) && projectTemplateInfo.isFlag()){
+                info.setMustFlag(1);
+                //判定必填项的下的是否有附件信息
+                if (attachments.size()!=0){
+                    info.setFileFlag(1);
+                }
+            }
         }
         //查询没有被选择必填项的数据并查询是否已经上传附件，若有则添加到展示列中
         List<ProjectTemplateInfo> otherProjectTemplateList = dao.projectAccessoryListByParentId(projectTemplateInfo);

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -110,6 +110,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String flagArchive;  //归档员判定
 	private String projectProperties;//投资性质
 
+	
+
 
 
 	@NotNull(message = "委托方联系人不能为空")

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

@@ -66,6 +66,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -290,6 +291,7 @@ public class RuralCostProjectMessageController extends BaseController {
                         projectcontentinfo.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
                         break;
                     case "13":
+
                         projectcontentinfo.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
                         break;
                 }
@@ -1486,6 +1488,13 @@ public class RuralCostProjectMessageController extends BaseController {
                     projectReportRecord.setFileGistdataList(projectTemplateList);
                     break;
                 case "13":
+                    BigDecimal submitScale = ruralProjectRecords.getSubmitScale();
+                    // 送审金额大于等于1000万时
+                    if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+                        relateInfo.setFlag(true);
+                    }else {
+                        relateInfo.setFlag(false);
+                    }
                     projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
                     break;
             }

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

@@ -1135,9 +1135,10 @@ public class RuralCostProjectMessageNewController extends BaseController {
      * 选择报销项目
      */
     @RequestMapping(value = "selectReproject")
-    public String selectReproject(String auditOpinion, Model model) {
+    public String selectReproject(String auditOpinion, Model model,String identification) {
         //审核意见模板标识
-        model.addAttribute("identification", "projectReportDataLeader");
+        model.addAttribute("identification", identification);
+//        model.addAttribute("identification", "projectReportDataLeader");
         model.addAttribute("identificationName", "报告项目组成员审核意见");
         ProjectReportData projectReportData = new ProjectReportData();
         model.addAttribute("auditOpinion",auditOpinion);

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

@@ -40,6 +40,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -197,6 +198,13 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                     projectReportRecord.setFileGistdataList(projectTemplateList);
                     break;
                 case "13":
+                    BigDecimal submitScale = ruralProjectRecords.getSubmitScale();
+                    // 送审金额大于等于1000万时
+                    if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+                        relateInfo.setFlag(true);
+                    }else {
+                        relateInfo.setFlag(false);
+                    }
                     projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
                     break;
             }
@@ -375,6 +383,7 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                 case "13":
                     projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
                     break;
+
             }
 
         }
@@ -508,7 +517,8 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                     projectReportRecord.setFileGistdataList(projectTemplateList);
                     break;
                 case "13":
-                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateUrgentList(relateInfo));
+
+                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
                     break;
             }
 

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

@@ -234,6 +234,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -2204,7 +2205,13 @@ public class WorkProjectNotifyController extends BaseController {
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/projectPaperFiling/projectPaperFilingView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-						model.addAttribute("identification", "projectPaperFiling");
+						if ("2".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "projectPaperFiling");
+						}
+						if ("1".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "consultProjectPaperFiling ");
+						}
+//						model.addAttribute("identification", "projectPaperFiling");
 						model.addAttribute("identificationName","项目纸质归档意见");
 						return "modules/projectPaperFiling/projectPaperFilingAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
@@ -2477,7 +2484,13 @@ public class WorkProjectNotifyController extends BaseController {
 						model.addAttribute("reportedId",reported.getId());
 						return "modules/ruralprojectrecords/ruralporjectmessage/reportedView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-						model.addAttribute("identification", "projectReported");
+						if ("1".equals(records.getProjectType())){
+							model.addAttribute("identification", "projectReported");
+						}
+						if ("2".equals(records.getProjectType())){
+							model.addAttribute("identification", "consultProjectReported");
+						}
+//						model.addAttribute("identification", "projectReported");
 						model.addAttribute("identificationName","项目上报审核意见");
 						return "modules/ruralprojectrecords/ruralporjectmessage/reportedAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
@@ -2760,7 +2773,13 @@ public class WorkProjectNotifyController extends BaseController {
 						model.addAttribute("reportedId",reported.getId());
 						return "modules/ruralprojectrecords/ruralporjectmessage/reportedView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-						model.addAttribute("identification", "projectReported");
+						if ("2".equals(records.getProjectType())){
+							model.addAttribute("identification", "projectReported");
+						}
+						if ("1".equals(records.getProjectType())){
+							model.addAttribute("identification", "consultProjectReported");
+						}
+//						model.addAttribute("identification", "projectReported");
 						model.addAttribute("identificationName","项目上报审核意见");
 						if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
 							if(Double.valueOf(reported.getJingHeJianLv())>30 || Double.valueOf(reported.getJingHeJianLv())< -30 ){
@@ -3059,6 +3078,12 @@ public class WorkProjectNotifyController extends BaseController {
 						model.addAttribute("reportedId",reported.getId());
 						return "modules/ruralprojectrecords/ruralporjectmessage/reportedView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						if ("2".equals(records.getProjectType())){
+							model.addAttribute("identification", "projectPaperFiling");
+						}
+						if ("1".equals(records.getProjectType())){
+							model.addAttribute("identification", "consultProjectPaperFiling");
+						}
 						model.addAttribute("identification", "projectReported");
 						model.addAttribute("identificationName","项目上报审核意见");
 						if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
@@ -3113,7 +3138,13 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/ruralprojectrecords/reported/import/reportedView";
 					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						model.addAttribute("ruralProjectRecordsReported", reported);
-						model.addAttribute("identification", "projectReported");
+						if ("1".equals(reported.getProjectType())){
+							model.addAttribute("identification", "projectReported");
+						}
+						if ("2".equals(reported.getProjectType())){
+							model.addAttribute("identification", "consultProjectReported ");
+						}
+//						model.addAttribute("identification", "projectReported");
 						model.addAttribute("identificationName","项目上报审核意见");
 						return "modules/ruralprojectrecords/reported/import/reportedAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
@@ -4229,7 +4260,20 @@ public class WorkProjectNotifyController extends BaseController {
 						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
 						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
 						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
-						model.addAttribute("identification", "projectReportData");
+
+						//2为工程咨询
+						if ("2".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "projectReportData");
+							model.addAttribute("identifications","ReportDataRatingComments");
+							model.addAttribute("identificationstwo","projectReportDataLeader");
+						}
+						if ("1".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "consultProjectReportData");
+							model.addAttribute("identifications"," consultReportDataRatingComments");
+							model.addAttribute("identificationstwo","consultProjectReportDataLeader");
+						}
+
+//						model.addAttribute("projectRecords",ruralProjectRecords.getProjectType());
 						model.addAttribute("identificationName","报告审核意见");
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
@@ -5200,7 +5244,17 @@ public class WorkProjectNotifyController extends BaseController {
 						projectcontentinfo.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
 						projectcontentinfo.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
 						projectcontentinfo.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
-						model.addAttribute("identification", "projectReportData");
+
+						if ("2".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "projectReportData");
+							model.addAttribute("identifications","ReportDataTwoRatingComments");
+
+						}
+						if ("1".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "consultProjectReportData");
+							model.addAttribute("identifications","consultReportDataTwoRatingComments");
+						}
+//						model.addAttribute("identification", "projectReportData");
 						model.addAttribute("identificationName", "报告审核意见");
 						return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
@@ -5404,7 +5458,13 @@ public class WorkProjectNotifyController extends BaseController {
 							materialDefectRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(materialDefectRecord.getFileAttachmentList()));
 							materialDefectRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(materialDefectRecord.getFileGistdataList()));
 							materialDefectRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(materialDefectRecord.getFileOtherList()));
-							model.addAttribute("identification","projectRepordDescription");
+							if ("2".equals(ruralProjectRecords.getProjectType())){
+								model.addAttribute("identification","projectRepordDescription");
+							}
+							if ("1".equals(ruralProjectRecords.getProjectType())){
+								model.addAttribute("identification","consultProjectRepordDescription");
+							}
+//							model.addAttribute("identification","projectRepordDescription");
 							model.addAttribute("identificationName","资料缺失说明审核意见");
 							return "modules/ruralprojectrecords/record/projectRepordDescriptionAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
@@ -5719,7 +5779,14 @@ public class WorkProjectNotifyController extends BaseController {
 											}
 										}
 									}
-									projectReportRecord.setFileOtherList(fileOtherList);
+									BigDecimal submitScale = ruralProjectRecords.getSubmitScale();
+									// 送审金额大于等于1000万时
+									if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
+										relateInfo.setFlag(true);
+									}else {
+										relateInfo.setFlag(false);
+									}
+									projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
 									break;
 							}
 
@@ -5813,7 +5880,15 @@ public class WorkProjectNotifyController extends BaseController {
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
 						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
-						model.addAttribute("identification","projectcontentinfoFile");
+						if ("2".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "projectcontentinfoFile");
+							model.addAttribute("identifications","referenceRemarks");
+						}
+						if ("1".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identifications","consultReferenceRemarks");
+							model.addAttribute("identification", "consultProjectPaperFiling");
+						}
+//						model.addAttribute("identification","projectcontentinfoFile");
 						model.addAttribute("identificationName","归档审核意见");
 						return "modules/projectcontentinfo/projectReportRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
@@ -6069,7 +6144,13 @@ public class WorkProjectNotifyController extends BaseController {
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
 						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
-						model.addAttribute("identification","projectcontentinfoFile");
+						if ("1".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "projectcontentinfoFile");
+						}
+						if ("2".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "consultProjectPaperFiling");
+						}
+//						model.addAttribute("identification","projectcontentinfoFile");
 						model.addAttribute("identificationName","归档审核意见");
 						if("bzshb".equals(act.getTaskDefKey())){
 							model.addAttribute("type","1");
@@ -6374,7 +6455,13 @@ public class WorkProjectNotifyController extends BaseController {
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
 						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
-						model.addAttribute("identification","projectcontentinfoFile");
+						if ("1".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "projectcontentinfoFile");
+						}
+						if ("2".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "consultProjectPaperFiling");
+						}
+//						model.addAttribute("identification","projectcontentinfoFile");
 						model.addAttribute("identificationName","归档审核意见");
 						if("bzshb".equals(act.getTaskDefKey())){
 							model.addAttribute("type","1");
@@ -8750,7 +8837,13 @@ public class WorkProjectNotifyController extends BaseController {
 				projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 				projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
 				projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
-				model.addAttribute("identification", "projectcontentinfoFile");
+				if ("1".equals(ruralProjectRecords.getProjectType())){
+					model.addAttribute("identification", "projectcontentinfoFile");
+				}
+				if ("2".equals(ruralProjectRecords.getProjectType())){
+					model.addAttribute("identification", "consultProjectPaperFiling");
+				}
+//				model.addAttribute("identification", "projectcontentinfoFile");
 				model.addAttribute("identificationName", "归档审核意见");
 				if ("bzshb".equals(act.getTaskDefKey())) {
 					model.addAttribute("type", "1");
@@ -8762,7 +8855,13 @@ public class WorkProjectNotifyController extends BaseController {
 				projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 				projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
 				projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
-				model.addAttribute("identification", "projectcontentinfoFile");
+				if ("1".equals(ruralProjectRecords.getProjectType())){
+					model.addAttribute("identification", "projectcontentinfoFile");
+				}
+				if ("2".equals(ruralProjectRecords.getProjectType())){
+					model.addAttribute("identification", "consultProjectPaperFiling");
+				}
+//				model.addAttribute("identification", "projectcontentinfoFile");
 				model.addAttribute("identificationName", "归档审核意见");
 				if ("bzshb".equals(act.getTaskDefKey())) {
 					model.addAttribute("type", "1");

src/main/resources/mappings/modules/identification/AuditTemplateTypeDao.xml

@@ -85,6 +85,12 @@
         WHERE id = #{id}
     </update>
 
+    <select id="findIdentification" resultType="Integer">
+        select count(1)
+            FROM template_correlation_chart
+            where identification=#{identification};
+    </select>
+
 
 
 </mapper>

src/main/webapp/webpage/modules/identification/AuditTemplateList.jsp

@@ -130,7 +130,7 @@
     </script>
 </head>
 <body>
-<%--<div style="margin: 10px 30px;background-color: #FFB800"> <a href="javascript:void(0)"  onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${auditTemplate.identification}&name=${auditTemplate.name}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>--%>
+
 <form:form id="inputForm"  modelAttribute="auditTemplate"  action="${ctx}/auditTemplate/auditTemplate/" method="post" class="form-inline">
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>

src/main/webapp/webpage/modules/identification/AuditTemplateTypeForm.jsp

@@ -202,47 +202,10 @@
                     var flag=$(this).prop("checked")
                     $("#createReportFlag").val(flag);
                 })
-                //是否紧急项目判断项
-                layui.form.on('radio(submitMoney)', function(data){
-                    var span=data.value;
-                    if(span==2){
-                        // $("#emergencyProject").parent().parent().parent().hide();
-                        //A级均为非紧急项目
-                        $("#emergencyProjectFlag").val("0");
-                        // $("#emergencyProject").prop("checked",false);
-                        layui.form.render();
-                    }else if(span==1){
-                        // $("#emergencyProject").parent().parent().parent().show();
-                        //B级默认紧急项目
-                        $("#emergencyProjectFlag").val("1");
-                    }
-                });
-                // form.on('switch(emergencyProject)',function(data){
-                //     var flag=$(this).prop("checked")
-                //     if (flag){
-                //         //是紧急项目
-                //         $("#emergencyProjectFlag").val("1");
-                //     }else{
-                //         //不是紧急项目
-                //         $("#emergencyProjectFlag").val("0");
-                //     }
-                // })
+
+
             });
-            //默认打开判断是否时紧急项目
-            var submitMoney="${ruralProjectRecords.submitMoney}"
-            if(submitMoney==1){
-                // $("#emergencyProject").parent().parent().parent().show();
-                var emergencyProject="${ruralProjectRecords.emergencyProject}"
-                if (emergencyProject=="1"){
-                    $("#emergencyProjectFlag").val("1");
-                    // $("#emergencyProject").prop("checked",true);
-                    layui.form.render();
-                }else{
-                    $("#emergencyProjectFlag").val("0");
-                    // $("#emergencyProject").prop("checked",false);
-                    layui.form.render();
-                }
-            }
+
 
             var radioVal ;
             validateForm = $("#inputForm").validate({
@@ -373,45 +336,7 @@
         });
 
 
-        function setContractValue(obj){
-            var clientId = $("#contractClientId").val();
-            $.ajax({
-                type:'post',
-                url:'${ctx}/ruralProject/ruralCostProjectRecords/getContractInfo',
-                data:{
-                    "id":obj
-                },
-                success:function(data){
-                    if(data.contractInformation == "1"){
-                        $("#c2").show();
-                        $("#c1").hide();
-                    }else{
-                        $("#c2").hide();
-                        $("#c1").show();
-                    }
-                    $("#contractName").val(data.name);
-                    $("#otherDetails").val(data.otherDetails);
-                    $("#contractPrice").val(data.contractPrice);
-                    formatNum($("#contractPrice"));
-                    $("#contractClientName").val(data.client.name);
-                    $("#contractClientId").val(data.client.id);
-                    $("#constructionProjectType").val(data.contractType);
-                    $("#linkmanId").val(data.workClinetInfoIds);
-                    //清理之前的联系人
-                    var newClientId  = data.client.id;
-                    if(clientId != newClientId){
-                        $("#workClientLinkmanList tr").remove();
-                        //if(isMasterClient){
-                        clientCount++;
-                        setLinkMan(newClientId);
-                        isMasterClient = false;
-                        //}
-                    }
-                    // console.log("clientId------newClientId");
-                    // console.log(clientId+"------"+newClientId);
-                }
-            });
-        }
+
 
         function getFee() {
             $("#unitFees").val('');
@@ -478,96 +403,6 @@
             $("#installUnitFees").val(pp);
         }
 
-        function setLinkMan(newClientId) {
-            $.ajax({
-                url:"${ctx}/ruralProject/ruralCostProjectRecords/getLinkManByClientId",
-                data:{"clientId":newClientId},
-                type:"post",
-                dataType:"json",
-                success:function (d) {
-                    // console.log(d);
-                    addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl);workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                    var row = workClientLinkmanRowIdx - 1 ;
-                    $("#workClientLinkmanList"+row+"_id").val(d.id);
-                    $("#workClientLinkmanList"+row+"_clientId_id").val(d.clientId);
-                    $("#workClientLinkmanList"+row+"_clientName").val(d.clientName);
-                    $("#workClientLinkmanList"+row+"_name").val(d.linkName);
-                    $("#workClientLinkmanList"+row+"_linkMobile").val(d.linkMobile);
-                    $("#workClientLinkmanList"+row+"_linkPhone").val(d.linkPhone);
-                    $("#workClientLinkmanList"+row+"_clientName").prop("readonly","readonly");
-                    $("#workClientLinkmanList"+row+"_name").prop("readonly","readonly");
-                    $("#workClientLinkmanList"+row+"_linkMobile").prop("readonly","readonly");
-                    $("#workClientLinkmanList"+row+"_linkPhone").prop("readonly","readonly");
-
-                    //按钮禁用
-                    $("#addUserButton").removeClass("disables");
-                    $("#addUserButton").removeClass("notDisables");
-                    $("#addUserButton").addClass("disables");
-                    //a标签置灰
-                    $("#aButton").removeClass("forbidden");
-                    $("#aButton").removeClass("notForbidden");
-                    $("#aButton").addClass("forbidden");
-
-                    $("#linkmanDiv").removeClass("disables");
-                    $("#linkmanDiv").removeClass("notDisables");
-                    $("#linkmanDiv").addClass("disables");
-
-                    $("#linkmanButton").removeClass("forbidden");
-                    $("#linkmanButton").removeClass("notForbidden");
-                    $("#linkmanButton").addClass("forbidden");
-                }
-            });
-        }
-        function setValuee(obj){
-            var successRows = 0;
-            ss = $("#workClientLinkmanList tr").length;
-            for (var i = 0; i < obj.length; i++) {
-                //没有重复的客户id，就可以插入
-                var canInsert = true;
-                for (var j = 0; j < ss; j++) {
-                    var cid = $("#workClientLinkmanList" + j + "_id").val();
-                    if(cid == obj[i].id){
-                        canInsert = false;
-                        // console.log("重复！！");
-                        break;
-                    }
-                }
-                if(canInsert==true){
-                    var idArr = $("#workClientLinkmanList tr:visible .clientId");
-                    if (obj[i].id != '' && !hasInArr(obj[i].id, idArr)) {
-                        addRow("#workClientLinkmanList", workClientLinkmanRowIdx, workClientLinkmanTpl, obj[i]);
-                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                        successRows++;
-                    }
-                }
-            }
-            clientCount=successRows+clientCount;
-
-            //如果委托方还没有设置，则将第一个客户设置为委托方
-            if(obj[0].name != null){
-                if(isMasterClient){
-                    $("#contractClientName").val(obj[0].clientId.name);
-                    isMasterClient = false;
-                }
-            }
-
-            //按钮禁用
-            $("#addUserButton").removeClass("disables");
-            $("#addUserButton").removeClass("notDisables");
-            $("#addUserButton").addClass("disables");
-            //a标签置灰
-            $("#aButton").removeClass("forbidden");
-            $("#aButton").removeClass("notForbidden");
-            $("#aButton").addClass("forbidden");
-
-            $("#linkmanDiv").removeClass("disables");
-            $("#linkmanDiv").removeClass("notDisables");
-            $("#linkmanDiv").addClass("disables");
-
-            $("#linkmanButton").removeClass("forbidden");
-            $("#linkmanButton").removeClass("notForbidden");
-            $("#linkmanButton").addClass("forbidden");
-        }
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
                 if(id==$(idArr[i]).find("td").eq(0).find("input").eq(0).val()){
@@ -606,25 +441,9 @@
             return false;
         }
 
-        function insertTitle(tValue){
-            $("#flagFile").val(false);
-            var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
-                var attachmentId = $("#id").val();
-                var attachmentFlag = "82";
-                /*console.log(file);*/
-                var timestamp=new Date().getTime();
 
-                var storeAs = "projectRecords";
-                var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
-                var divId = "_attachment";
-                $("#addFile"+divId).show();
-                multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
-        }
 
 
-        function addFile() {
-            $("#attachment_file").click();
-        }
 
         function addRow(list, idx, tpl, row){
             // var idx1 = $("#workClientLinkmanList tr").length;
@@ -649,20 +468,7 @@
             });
         }
 
-        function delEntrustRow(obj, prefix){
-            var id = $(prefix+"_id");
-            var delFlag = $(prefix+"_delFlag");
-            $(obj).parent().parent().remove();
-            if($("#workClientLinkmanList tr").length==0){
-                //按钮禁用
-                $("#addUserButton").addClass("notDisables");
-                //a标签置灰
-                $("#aButton").addClass("notForbidden");
 
-                $("#linkmanDiv").addClass("notDisables");
-                $("#linkmanButton").addClass("notForbidden");
-            }
-        }
         function delRow(obj, prefix){
             var id = $(prefix+"_id");
             var delFlag = $(prefix+"_delFlag");
@@ -681,58 +487,7 @@
             }
             $(obj).val(t.split("").reverse().join("") + "." + r);
         }
-        function openBill2(title,url,width,height,target,formId){
-            if($("#workClientLinkmanList tr").length>0){
-                top.layer.msg('仅可添加一名委托方联系人！', {icon: 0});
-                return false;
-            }
-            var frameIndex = parent.layer.getFrameIndex(window.name);
-            var urls = url+"&index="+frameIndex;
-            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
-                width='auto';
-                height='auto';
-            }else{//如果是PC端，根据用户设置的width和height显示。
-
-            }
-            top.layer.open({
-                type: 2,
-                area: [width, height],
-                title: title,
-                skin:"two-btns",
-                maxmin: false, //开启最大化最小化按钮
-                content: urls ,
-                btn: ['确定','关闭'],
-                yes: function(index, layero){
-                    var body = top.layer.getChildFrame('body', index);
-                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    var inputForm = body.find('#inputForm');
-                    var top_iframe;
-                    if(target){
-                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
-                    }else{
-                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                    }
-                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-                    inputForm.attr("action","${ctx}/ruralProject/ruralCostProjectRecords/linkManSave");//表单提交成功后，从服务器返回的url在当前tab中展示
-                    var $document = iframeWin.contentWindow.document;
-
-                    formSubmit2($document,formId,index);
-                    //新增人员之后
-                    //按钮禁用
-                    $("#addUserButton").addClass("disables");
-                    //a标签置灰
-                    $("#aButton").addClass("forbidden");
-
-                    $("#linkmanDiv").addClass("disables");
-                    $("#linkmanButton").addClass("forbidden");
-
-                },
-                cancel: function(index){
-                }
-            });
-
 
-        }
 
         function formSubmit2($document,inputForm,index){
             var validateForm = $($document.getElementById(inputForm)).validate({
@@ -779,17 +534,6 @@
             }
         }
 
-        function getApprovalFee() {
-            //总价
-            var af = $("#estimateTotalFees").val();
-            if(af !=''){
-                $("#estimateTotalFees").val(af)
-            }
-            $("#buildingFees").val("");
-            $("#installFees").val("");
-            $("#buildingPercent").val("");
-            $("#installPercent").val("");
-        }
 
         function getInstallFee() {
             var af = $("#estimateTotalFees").val();
@@ -809,117 +553,29 @@
             }
         }
 
-        function getBuildingFee() {
-            var af = $("#estimateTotalFees").val();
-            //土建
-            var bf = $("#buildingFees").val();
-            if(bf != ''&& af !=''){
-                var hf = parseInt(af)-parseInt(bf);
-                var rate = (Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
-                $("#buildingPercent").val(rate);
-                $("#installFees").val(hf);
-                inf = hf;
-                var inRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
-                $("#installPercent").val(inRate);
-            }
-            if(bf == ''|| af ==''){
-                $("#buildingPercent").val("");
-            }
-        }
-        function reProjectName(obj) {
-            var name=$(obj).val()
-            var proName='${ruralProjectRecords.projectName}'
-            $.ajax({
-                type : "POST",
-                url : "${ctx}/ruralProject/ruralProjectRecords/reProjectName",
-                data : {'projectName':name},
-                //请求成功
-                success : function(result) {
-                    if (result>0){
-                        if(proName!=name){
-                            $(obj).val(proName);
-                            parent.layer.msg("项目名称已存在!",{icon:2});
-                        }
-                    }
-                }
-            })
-        }
     </script>
 </head>
 <body>
 <div class="single-form">
     <div class="container">
         <sys:message content="${message}"/>
-        <form:form id="inputForm" modelAttribute="auditTemplateType" action="${ctx}/fauditTemplate/auditTemplateType/save" method="post" class="form-horizontal layui-form ">
-<%--            <input type="hidden" id="flagFile" value="">--%>
-<%--            <input type="hidden" id="createReportFlag" name="createReportFlag" value="${ruralProjectRecords.createReportFlag}">--%>
-<%--            <input type="hidden" id="emergencyProjectFlag" name="emergencyProject" value="${ruralProjectRecords.emergencyProject}">--%>
-
-<%--            <input type="hidden" id="workClientLinkmanInfo" value="${ruralProjectRecords.workClientLinkmanList}">--%>
-<%--            <div class="form-group layui-row first">--%>
-<%--                <div class="form-group layui-row">--%>
-<%--                    <div class="form-group-label"><h2>项目合同信息</h2></div>--%>
-<%--                    <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                        <label class="layui-form-label">合同情况：</label>--%>
-<%--                        <div class="layui-input-block">--%>
-<%--                            <input type="radio" title="有合同" lay-filter="ext" name="ext" checked id="ext" value="0">--%>
-<%--                                &lt;%&ndash;                            <label for="ext">有合同</label>&ndash;%&gt;--%>
-<%--                            <input type="radio" title="无合同" lay-filter="ext" name="ext" id="ext1" value="1">--%>
-<%--                                &lt;%&ndash;                            <label for="ext1">无合同</label>&ndash;%&gt;--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--&lt;%&ndash;                <div class="form-group layui-row">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    <div id="divv">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        <div class="layui-item layui-col-sm12 lw7" id="d1">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <div class="layui-input-block  with-icon">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                <sys:gridselectContract url="${ctx}/ruralProject/ruralCostProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                                        cssStyle="background-color: #fff" labelValue="${ruralProjectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        <div class="layui-item layui-col-sm6 lw7">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <label class="layui-form-label">合同名称：</label>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <div class="layui-input-block">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                <input  htmlEscape="false"  readonly="true" id="contractName"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.name}"/>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        <div class="layui-item layui-col-sm6 lw7" id="c1">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <label class="layui-form-label">合同金额(元)：</label>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <div class="layui-input-block">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                <input htmlEscape="false"  readonly="true" id="contractPrice"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        <div class="layui-item layui-col-sm6 lw7" id="c2" style="display: none">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <label class="layui-form-label">费率描述：</label>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <div class="layui-input-block">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                <input htmlEscape="false"  readonly="true" id="otherDetails"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.otherDetails}"/>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        <div class="layui-item layui-col-sm6 lw7">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <label class="layui-form-label">委托方：</label>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <div class="layui-input-block">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                <input htmlEscape="false"  readonly="true" id="contractClientName" name="workContractInfo.client.name" class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.client.name}"/>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    </div>&ndash;%&gt;--%>
-
-<%--&lt;%&ndash;                    <div id="divv3">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        <div class="layui-item layui-col-sm6 lw7">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <label class="layui-form-label">合同类型：</label>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <div class="layui-input-block">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${fns:getMainDictLabel(ruralProjectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    </div>&ndash;%&gt;--%>
-
-<%--&lt;%&ndash;                </div>&ndash;%&gt;--%>
-<%--            </div>--%>
-
+        <form:form id="inputForm" modelAttribute="auditTemplateType" action="${ctx}/auditTemplate/auditTemplateType/save" method="post" class="form-horizontal layui-form ">
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目基础信息</h2></div>
+                <div class="form-group-label"><h2>审核意见信息</h2></div>
                 <input  id="id" name="id"  value="${auditTemplateType.id}" type="hidden"/>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>审核类型：</label>
+                    <div class="layui-input-block readOnlyFFF">
+                        <select  class="form-control simple-select required"  name="identification">
+                            <option value="" label="--请选择审核类型--">--请选择审核类型--</option>
+                            <c:forEach items="${mainDictList}" var="info" varStatus="status" >
+                                <option value="${info.value}"  <c:if test="${info.value == auditTemplateType.identification}">selected</c:if> >${info.label}</option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>模块：</label>
                     <div class="layui-input-block">
                         <input  id="module" name="module" onchange="reProjectName(this)" maxlength="255" htmlEscape="false" placeholder="请输入模块" class="form-control layui-input required" value="${auditTemplateType.module}"/>
@@ -936,195 +592,8 @@
                         </div>
                     </div>
                 </div>
-
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>审核类型：</label>
-                    <div class="layui-input-block readOnlyFFF">
-                        <form:select  class="form-control simple-select required"  path="identification">
-                            <form:option value="" label="--请选择审核类型--"/>
-                            <form:options items="${fns:getMainDictList('audit_opinion')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
-                    </div>
-                </div>
-
-
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>--%>
-<%--                    <div class="layui-input-block  with-icon">--%>
-<%--                        <sys:treeselectProject id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"--%>
-<%--                                               cssStyle="background-color: #fff" title="区域" url="/sys/area/treeData" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="false"/>--%>
-<%--                        <span id="areaShow" style="color: red"><c:if test="${ruralProjectRecords.area.id!=null}">${ruralProjectRecords.province}-${ruralProjectRecords.city}-${ruralProjectRecords.county}</c:if></span>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>--%>
-<%--                    <div class="layui-input-block readOnlyFFF">--%>
-<%--                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">--%>
-<%--                            <form:option value=""/>--%>
-<%--                            <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
-<%--                        </form:select>--%>
-<%--                    </div>--%>
                 </div>
-
-<%--                <div class="layui-item layui-col-sm6 lw7" style="display: none">--%>
-<%--                    <label class="layui-form-label">所在省份：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <input path="province"  htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7" style="display: none">--%>
-<%--                    <label class="layui-form-label">所在地级市：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7" style="display: none">--%>
-<%--                    <label class="layui-form-label">所在区县：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label">创建人：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>--%>
-<%--                        <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label"><span class="require-item">*</span>项目责任人：</label>--%>
-<%--                    <div class="layui-input-block  with-icon">--%>
-<%--                        <sys:treeselect id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"--%>
-<%--                                        cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label">所属部门：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <input path="createBy.office.name" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label">项目负责人：</label>--%>
-<%--                    <div class="layui-input-block  with-icon">--%>
-<%--                        <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${ruralProjectRecords.projectMasterName}"--%>
-<%--                                                    cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
-<%--                        <span class="spanzj">必须拥有一级造价师证书</span>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label"><span class="require-item">*</span>工程类型：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                            &lt;%&ndash;                        <select name="engineeringType">&ndash;%&gt;--%>
-<%--                            &lt;%&ndash;                            <option value=""></option>&ndash;%&gt;--%>
-<%--                            &lt;%&ndash;                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">&ndash;%&gt;--%>
-<%--                            &lt;%&ndash;                                <option value="${info.id}" <c:if test="${info.id == ruralProjectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>&ndash;%&gt;--%>
-<%--                            &lt;%&ndash;                            </c:forEach>&ndash;%&gt;--%>
-<%--                            &lt;%&ndash;                        </select>&ndash;%&gt;--%>
-<%--                        <button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">--%>
-<%--                            <span>${engineeringInfo.engineeringName}</span>--%>
-<%--                            <input type="hidden" name="engineeringType" id="engineeringType" class="judgment" value="${engineeringInfo.id}"/>--%>
-<%--                            <i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>--%>
-<%--                        </button>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label"><span class="require-item">*</span>项目等级：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">--%>
-<%--                            <input type="radio" name="submitMoney" lay-filter="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>--%>
-<%--                        </c:forEach>--%>
-<%--                        <p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-
-<%--                <c:if test="${ruralProjectRecords.createReportFlag}">--%>
-<%--                    <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                        <label class="layui-form-label double-line"><span class="require-item">*</span>是否生成报告号：</label>--%>
-<%--                        <div class="layui-input-block">--%>
-<%--                            <div style="margin-right: 30px;">--%>
-<%--                                <input type="checkbox" id="reportSwitch" <c:if test="${ruralProjectRecords.createReportFlag}">checked</c:if> lay-filter="reportSwitch" lay-skin="switch" lay-text="是|否">--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </c:if>--%>
-
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <input path="submitScale" id="submitScale" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input judgment number"/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label double-line">工作开始日期：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="startDate" name="startDate" placeholder="请选择开始日期" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label double-line">工作结束日期：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="endingDate" name="endingDate" placeholder="请选择结束日期" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label">创建日期：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${edocEntity.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control judgment layui-input"/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7">--%>
-<%--                    <label class="layui-form-label"><span class="require-item">*</span>项目类别：</label>--%>
-<%--                    <div class="layui-input-block readOnlyFFF">--%>
-<%--&lt;%&ndash;                        <form:select placeholder="请选择" path="attachmentProjectSort" class="form-control judgment editable-select layui-input" id="attachmentProjectSort" value="${attachmentProjectSort}">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <form:option value=""/>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                            <form:options items="${fns:getMainDictList('attachment_project_sort_cost')}" itemLabel="label" itemValue="value" htmlEscape="false"/>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                        </form:select>&ndash;%&gt;--%>
-<%--                        <span class="spanzj">与归档资料关联,请仔细选择</span>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7 with-textarea">--%>
-<%--                    <label class="layui-form-label">工程概况：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <input:textarea placeholder="请输入工程概况" path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="layui-item layui-col-sm6 lw7 with-textarea">--%>
-<%--                    <label class="layui-form-label ">备注：</label>--%>
-<%--                    <div class="layui-input-block">--%>
-<%--                        <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
             </div>
-
-
-<%--            <div>--%>
-<%--                <div class="form-group-label"><h2><span class="require-item">*</span>委托方联系人信息</h2></div>--%>
-<%--                <div id="linkmanDiv" class="layui-item nav-btns" style="float: left;width: 155px">--%>
-<%--                    <sys:gridselect1  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"--%>
-<%--                                      name="linkman.id"  title="选择客户"--%>
-<%--                                      value="${ruralProjectRecords.workContractInfo.workClinetInfoIds}"--%>
-<%--                                      cssClass="form-control judgment" fieldLabels="联系人" fieldKeys="name"--%>
-<%--                                      searchLabel="联系人" searchKey="name"></sys:gridselect1>--%>
-<%--                </div>--%>
-
-<%--                <div class="layui-item layui-col-xs12 form-table-container" style="padding:0px">--%>
-<%--                    <table id="contentTable1" class="table table-bordered table-condensed details">--%>
-<%--                        <thead>--%>
-<%--                        <tr>--%>
-<%--                            <th class="hide"></th>--%>
-<%--                            <th width="20%"><font color="red">*</font>委托方</th>--%>
-<%--                            <th width="20%">联系人姓名</th>--%>
-<%--                            <th width="20%">联系方式1</th>--%>
-<%--                            <th width="20%">联系方式2</th>--%>
-<%--                            <th width="20%">操作</th>--%>
-<%--                        </tr>--%>
-<%--                        </thead>--%>
-<%--                        <tbody id="workClientLinkmanList">--%>
-<%--                        </tbody>--%>
-<%--                    </table>--%>
                     <script type="text/template" id="workClientLinkmanTpl">//<!--
 
                     </script>
@@ -1144,25 +613,6 @@
                 </div>
             </div>
 
-<%--            <div class="form-group layui-row">--%>
-<%--                <div class="form-group-label"><h2>施工方信息</h2></div>--%>
-<%--                <div class="layui-item nav-btns" style="float: left;width: 155px">--%>
-<%--                    <sys:gridselectConstruction url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList" title="选择施工单位"--%>
-<%--                                                cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name" searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectConstruction>--%>
-<%--                </div>--%>
-
-<%--                <div class="layui-item layui-col-xs12 form-table-container">--%>
-<%--                    <table id="contentTable2" class="table table-bordered table-condensed details">--%>
-<%--                        <thead>--%>
-<%--                        <tr>--%>
-<%--                            <th class="hide"></th>--%>
-<%--                            <th style="text-align: center" width="20%">施工方单位名称</th>--%>
-<%--                            <th style="text-align: center" width="20%">联系人姓名</th>--%>
-<%--                            <th style="text-align: center" width="20%">联系方式1</th>--%>
-<%--                            <th style="text-align: center" width="20%">联系方式2</th>--%>
-<%--                            <th width="20%">操作</th>--%>
-<%--                        </tr>--%>
-<%--                        </thead>--%>
                         <tbody id="workConstructionLinkmanList">
                         </tbody>
                     </table>

src/main/webapp/webpage/modules/identification/AuditTemplateTypeList.jsp

@@ -325,7 +325,7 @@
         </div>
         <div class="full-width fl">
             <div class="layui-row contentShadow shadowLR" id="queryDiv">
-                <form:form id="searchForm" modelAttribute="auditTemplateType" action="${ctx}/fauditTemplate/auditTemplateType" method="post" class="form-inline">
+                <form:form id="searchForm" modelAttribute="auditTemplateType" action="${ctx}/auditTemplate/auditTemplateType" method="post" class="form-inline">
                     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
                     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
                     <input id="toflag" name="toflag" type="hidden" value="1"/>
@@ -379,7 +379,7 @@
     <div id="changewidth"></div>
 </div>
 
-<%--<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>--%>
+
 <script>
 
 
@@ -403,9 +403,8 @@
                         xml+="<a href=\"#\" onclick=\"openDialogre('修改审核意见信息', '${ctx}/auditTemplate/auditTemplateType/form?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
 
                         xml+="<a href=\"${ctx}/auditTemplate/auditTemplateType/del?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该审核意见信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
-                        xml+="<a href=\"${ctx}/fauditTemplate/auditTemplateType/del?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 
-                        xml+="<a href=\"#\" onclick=\"openDialogre('默认意见', '${ctx}/defaultAuditTemplate/defaultAuditTemplate/list?identification=" + d.identification + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 默认意见</a>";
+                        xml+="<a href=\"#\" onclick=\"openDialogView('默认意见', '${ctx}/defaultAuditTemplate/defaultAuditTemplate/list?identification=" + d.identification + "','95%', '95%','','关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 默认意见</a>";
                         xml+="</div>"
                         return xml;
 
@@ -441,7 +440,7 @@
             if (listId.length <= 0) {
                 layer.msg("请选择需要下载的项目信息", {icon: 2})
             } else {
-                $("#searchForm").attr("action","${ctx}/fauditTemplate/auditTemplateType/del?listId="+ listId);
+                $("#searchForm").attr("action","${ctx}/auditTemplate/auditTemplateType/del?listId="+ listId);
                 $("#searchForm").submit();
                 return true;
             }

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -206,7 +206,7 @@
 									<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
 										<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 									</c:forEach>
-									<p style="color: red;font-size: 12px;">200万以上部队或政府项目及500万以上其它项目为A级,其余为B级</p>
+									<p style="color: red;font-size: 12px;">500万及以上项目为A级,其余为B级</p>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6 lw6">
@@ -1717,7 +1717,7 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label">
-					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=referenceRemarks&name=备考表','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 备考表模板列表</a></div>
+					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identifications}&name=备考表','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 备考表模板列表</a></div>
 					<h2>备考表</h2></div>
 				<div class="layui-item layui-col-sm11 with-textarea">
 					<label class="layui-form-label ">备考表：</label>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -1969,7 +1969,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?="+value+"&identification=${identifications}"),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -1995,7 +1995,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectDeduct?deductOpinion="+value+"&identification=ReportDataRatingComments"),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectDeduct?deductOpinion="+value+"&identification=${identifications}"),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -2024,7 +2024,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectDeduct?deductOpinion="+value+"&identification=ReportDataTwoRatingComments"),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectDeduct?deductOpinion="+value+"&identification=${identifications}"),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();