代码调整优化

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -283,6 +283,18 @@ public class OaNotifyController extends BaseController {
 		oaNotify.setContent("");
 		model.addAttribute("oaNotify", oaNotify);
 		model.addAttribute("flagOffice", oaNotify.getFlagOffice());
+
+		if(StringUtils.isNotBlank(oaNotify.getProcessInstanceId())){
+			if(null == oaNotify.getAct() || StringUtils.isBlank(oaNotify.getAct().getProcInsId())){
+				Act act = new Act();
+				act.setProcInsId(oaNotify.getProcessInstanceId());
+				oaNotify.setAct(act);
+			}
+			WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(oaNotify.getProcessInstanceId());
+			if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+				model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+			}
+		}
 		if(StringUtils.isNotBlank(view)&& "view".equals(view)){
 			//查看登陆者访问该公告信息
 			OaNotifyView oaNotifyView = oaNotifyService.getOaNotifyView(oaNotify.getId(), UserUtils.getUser().getId());

src/main/java/com/jeeplus/modules/projectConstruction/web/ContractController.java

@@ -364,7 +364,7 @@ public class ContractController extends BaseController {
     @RequestMapping("selectcontent")
     public String gridSelect(ProjectImplementEarly projectRecords, String searchLabel, HttpServletRequest request, HttpServletResponse response, Model model) throws UnsupportedEncodingException {
         model.addAttribute("obj", projectRecords);
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
         model.addAttribute("searchLabel", searchLabel);
@@ -414,7 +414,7 @@ public class ContractController extends BaseController {
             model.addAttribute("flag", "1");
         }
         //获取审核通过项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         model.addAttribute("page", page);
@@ -429,7 +429,7 @@ public class ContractController extends BaseController {
     @ResponseBody
     public Map<String, List> getProjectFollowList(ProjectFollowReport projectFollowReport, HttpServletRequest request, HttpServletResponse response, Model model, ProjectImplementEarly projectRecords) {
         //查询审核通过的所有项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         List<ProjectRecordTreeData> projectRecordTreeDataList = new ArrayList<>();

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -23,6 +23,8 @@ import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import net.sf.json.JSONObject;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
@@ -54,6 +56,8 @@ public class ProjectFilingBatchController extends BaseController {
     private UserService userService;
     @Autowired
     private WorkattachmentDao workattachmentDao;
+    @Autowired
+    protected WorkProjectNotifyService workProjectNotifyService;
 
     @ModelAttribute
     public ProjectFilingBatch get(@RequestParam(required = false) String id) {
@@ -168,6 +172,12 @@ public class ProjectFilingBatchController extends BaseController {
             //项目信息
             projectFilingBatch.setProject(ruralProjectRecordsList);
         }
+        if(StringUtils.isNotBlank(projectFilingBatch.getProcessinstanceId())){
+            WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(projectFilingBatch.getProcessinstanceId());
+            if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+            }
+        }
 //        List<User> auditUserList = userService.getFilingUserList();
 //        projectFilingBatch.setBzshbUserList(auditUserList);
         model.addAttribute("projectFilingBatch", projectFilingBatch);

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/Projectcontentinfo.java

@@ -59,6 +59,7 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	private Date monthlyDate;    //月报时间
 	private String monthlyContent;  //月报内容信息
 	private String monthlyNumber;   //月报编号
+	private String nodeId;   //节点id
 
 	private List<RuralReportConsultant> reportedConsultantList= Lists.newArrayList();;//咨询员列表
 
@@ -435,4 +436,12 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	public void setProjectAchievementFileDataList(List<ProjectTemplateInfo> projectAchievementFileDataList) {
 		this.projectAchievementFileDataList = projectAchievementFileDataList;
 	}
+
+	public String getNodeId() {
+		return nodeId;
+	}
+
+	public void setNodeId(String nodeId) {
+		this.nodeId = nodeId;
+	}
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -39,6 +39,8 @@ import com.jeeplus.modules.workcontent.entity.WorkContentContractSum;
 import com.jeeplus.modules.workcontent.service.WorkContentAltermanageService;
 import com.jeeplus.modules.workcontent.web.WorkContentTypeController;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import org.activiti.engine.HistoryService;
@@ -100,6 +102,8 @@ public class ProjectcontentinfoController extends BaseController {
 	private ProjectResultsFileTemplateService projectResultsFileTemplateService;
 	@Autowired
 	private ProjectImplementEarlyService projectImplementEarlyService;
+	@Autowired
+	protected WorkProjectNotifyService workProjectNotifyService;
 
 	@ModelAttribute("projectcontentinfo")
 	public Projectcontentinfo get(@RequestParam(required=false) String id) {
@@ -977,8 +981,16 @@ public class ProjectcontentinfoController extends BaseController {
 				Act act = new Act();
 				if(StringUtils.isNotBlank(projectReportData.getProcessInstanceId())){
 					act = getByAct(projectReportData.getProcessInstanceId());
+					if(StringUtils.isBlank(act.getProcInsId())){
+						act.setProcInsId(projectReportData.getProcessInstanceId());
+					}
 					projectReportData.setAct(act);
+					WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(projectReportData.getProcessInstanceId());
+					if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+						model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+					}
 				}
+
 				if ("edit".equals(projectcontentinfo.getFlag())) {
 					if("modifyApply".equals(act.getTaskDefKey())){
 						model.addAttribute("condition", "according");

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -1467,8 +1467,8 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 	public void queryContractInfos(ProjectRecords projectRecords) {
 		if (null != projectRecords.getWorkContractInfo()){
 			//查询合同信息
-			WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
-			if(workContractInfo!=null){
+			WorkContractInfo workContractInfo = contractInfoService.getContractInfo(projectRecords.getWorkContractInfo().getId());
+			/*if(workContractInfo!=null){
 				workContractInfo.setConstructionProjectTypeStr(DictUtils.getMainDictLabel(String.valueOf(workContractInfo.getContractType()), "contract_type", ""));
 				if(workContractInfo.getWorkClientInfoList()!=null&&!workContractInfo.getWorkClientInfoList().isEmpty()){
 					StringBuilder workClinetInfoIds = new StringBuilder();
@@ -1478,7 +1478,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 					workClinetInfoIds.deleteCharAt(workClinetInfoIds.length()-1);
 					workContractInfo.setWorkClinetInfoIds(workClinetInfoIds.toString());
 				}
-			}
+			}*/
 			projectRecords.setWorkContractInfo(workContractInfo);
 		}
 	}

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectImplementCompletionController.java

@@ -92,7 +92,7 @@ public class ProjectImplementCompletionController {
             model.addAttribute("flag","1");
         }
         //查询项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         model.addAttribute("page", page);
@@ -114,7 +114,7 @@ public class ProjectImplementCompletionController {
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         List<ProjectRecordTreeData> projectRecordTreeDataList = new ArrayList<>();

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectImplementEarlyController.java

@@ -88,7 +88,7 @@ public class ProjectImplementEarlyController {
             model.addAttribute("flag","1");
         }
         //获取项目实施前期项目列表信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         model.addAttribute("page", page);
@@ -106,7 +106,7 @@ public class ProjectImplementEarlyController {
             model.addAttribute("flag","1");
         }
         //获取项目实施前期项目列表信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         List<ProjectRecordTreeData> projectRecordTreeDataList = new ArrayList<>();

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -106,6 +106,8 @@ public class ProjectRecordsController extends BaseController {
 	private ProjectReportDataDao projectReportDataDao;
 	@Autowired
 	private UserDao userDao;
+	@Autowired
+	protected WorkProjectNotifyService workProjectNotifyService;
 
 	private static String template_path = Global.getProjectTemplatePath()+"咨询工作方案.xlsx";
 	private static String template_name = "咨询工作方案.xlsx";
@@ -257,6 +259,12 @@ public class ProjectRecordsController extends BaseController {
 		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
 			projectRecordsService.queryProjectDetail(projectRecords);
 		}
+		if(StringUtils.isNotBlank(projectRecords.getProcessInstanceId())){
+			WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(projectRecords.getProcessInstanceId());
+			if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+				model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+			}
+		}
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/projectrecord/projectRecordsView";
 	}

src/main/java/com/jeeplus/modules/projectrecord/web/monthly/MonthlyConsultationReportController.java

@@ -87,7 +87,7 @@ public class MonthlyConsultationReportController extends BaseController {
             model.addAttribute("flag","1");
         }
         //获取项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
         return "modules/projectrecord/monthly/monthlyConsultationReportList";
     }
@@ -107,7 +107,7 @@ public class MonthlyConsultationReportController extends BaseController {
             model.addAttribute("flag","1");
         }
         //获取项目信息
-        Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
+        Page<ProjectImplementEarly> page = projectImplementEarlyService.findOverallProcessProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //无合同状态下，获取委托方的名称
         List<ProjectImplementEarly> list = page.getList();
         List<ProjectRecordTreeData> projectRecordTreeDataList = new ArrayList<>();

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

@@ -115,8 +115,8 @@ public class RuralPeojectRecordChooseCheckAllService extends CrudService<RuralPe
      * @param projectRecords
      */
     public void queryContractInfos(RuralProjectRecords projectRecords) {
-        WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
-        if(workContractInfo!=null){
+        WorkContractInfo workContractInfo = contractInfoService.getContractInfo(projectRecords.getWorkContractInfo().getId());
+        /*if(workContractInfo!=null){
             workContractInfo.setConstructionProjectTypeStr(DictUtils.getMainDictLabel(String.valueOf(workContractInfo.getContractType()), "contract_type", ""));
             if(workContractInfo.getWorkClientInfoList()!=null&&!workContractInfo.getWorkClientInfoList().isEmpty()){
                 StringBuilder workClinetInfoIds = new StringBuilder();
@@ -126,7 +126,7 @@ public class RuralPeojectRecordChooseCheckAllService extends CrudService<RuralPe
                 workClinetInfoIds.deleteCharAt(workClinetInfoIds.length()-1);
                 workContractInfo.setWorkClinetInfoIds(workClinetInfoIds.toString());
             }
-        }
+        }*/
         projectRecords.setWorkContractInfo(workContractInfo);
     }
 

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

@@ -108,29 +108,37 @@ public class RuralPeojectRecordChooseCheckService extends CrudService<RuralPeoje
         List<RuralProjectRecords> recordsList = Lists.newArrayList();
         //获取当前登陆人信息
         User user = UserUtils.getUser();
-        //获取当前登陆人角色信息
-        Role role = user.getRoleList().get(0);
-        switch (role.getEnname()){
-            //总工或总审主任展示数据
-            case "zg":
-            case "zszr":
-                projectRecords.setBzshbUserId(user.getId());
-                count = dao.queryCountByZg(projectRecords);
-                recordsList = dao.findListByZg(projectRecords);
-                break;
-            //线下归档员展示数据
-            case "xxgdgly":
-                count = dao.queryCountByXxgdy(projectRecords);
-                recordsList = dao.findListByXxgdy(projectRecords);
-                break;
-            //普通员工展示数据
-            default :
-                projectRecords.setCreateBy(user);
-                count = dao.queryCountByYg(projectRecords);
-                recordsList = dao.findListByYg(projectRecords);
-                break;
+        List<Role> roleList = user.getRoleList();
+        if(roleList.size()>0){
+            //获取当前登陆人角色信息
+            Role role = user.getRoleList().get(0);
+            switch (role.getEnname()){
+                //总工或总审主任展示数据
+                case "zg":
+                case "zszr":
+                    projectRecords.setBzshbUserId(user.getId());
+                    count = dao.queryCountByZg(projectRecords);
+                    recordsList = dao.findListByZg(projectRecords);
+                    break;
+                //线下归档员展示数据
+                case "xxgdgly":
+                    count = dao.queryCountByXxgdy(projectRecords);
+                    recordsList = dao.findListByXxgdy(projectRecords);
+                    break;
+                //普通员工展示数据
+                default :
+                    projectRecords.setCreateBy(user);
+                    count = dao.queryCountByYg(projectRecords);
+                    recordsList = dao.findListByYg(projectRecords);
+                    break;
+            }
+        }else{
+            projectRecords.setCreateBy(user);
+            count = dao.queryCountByYg(projectRecords);
+            recordsList = dao.findListByYg(projectRecords);
         }
 
+
         page.setCount(count);
         page.setCountFlag(false);
         projectRecords.setPage(page);

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

@@ -139,7 +139,7 @@ public class RuralProjectMessageAllController extends BaseController {
         }
 
         //查询总审人员信息
-        List<User> auditUserList = userService.getAuditUserList();
+        List<User> auditUserList = userService.getShowAuditUserList();
         model.addAttribute("userList", auditUserList);
 
         long s2 = System.currentTimeMillis();

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

@@ -7,6 +7,7 @@ import com.jeeplus.common.utils.Collections3;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.alterinfo.entity.AlterInfo;
 import com.jeeplus.modules.alterinfo.service.AlterInfoService;
@@ -42,6 +43,8 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
@@ -110,6 +113,8 @@ public class RuralProjectViewController extends BaseController {
     private RuralWorkProjectUserDao workProjectUserDao;
     @Autowired
     private ProjectFilingBatchService projectFilingBatchService;
+    @Autowired
+    protected WorkProjectNotifyService workProjectNotifyService;
     /**
      * 项目查看
      * 传参：项目id
@@ -247,6 +252,14 @@ public class RuralProjectViewController extends BaseController {
         if (null!=reported){
             model.addAttribute("reportedId",reported.getId());
         }
+
+        if(StringUtils.isNotBlank(workContractInfo.getProcessInstanceId())){
+            WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(workContractInfo.getProcessInstanceId());
+            if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+            }
+        }
+
         //查询项目报告信息
         ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
         model.addAttribute("flagProjectReportData",projectReportData);
@@ -565,6 +578,12 @@ public class RuralProjectViewController extends BaseController {
                 }
             }
         }
+        if(StringUtils.isNotBlank(projectReportData.getProcessInstanceId())){
+            WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(projectReportData.getProcessInstanceId());
+            if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+            }
+        }
         //获取总审人员
         User user=UserUtils.get(projectReportData.getBzshbUserId());
         if(null != user){
@@ -670,6 +689,12 @@ public class RuralProjectViewController extends BaseController {
             ruralProjectMessageService.getInfoByView(reported);
             model.addAttribute("reportedId",reported.getId());
         }
+        if(StringUtils.isNotBlank(reported.getProcessInstanceId())){
+            WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(reported.getProcessInstanceId());
+            if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+            }
+        }
         //获取工程类型
         ProjectEngineeringInfo engineeringInfos=engineeringService.getProjectReportedType(reported.getPorjectUse());
         model.addAttribute("engineeringInfo", engineeringInfos);
@@ -880,6 +905,12 @@ public class RuralProjectViewController extends BaseController {
                 }
             }
         }
+        if(StringUtils.isNotBlank(projectReportRecord.getProcessInstanceId())){
+            WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(projectReportRecord.getProcessInstanceId());
+            if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+            }
+        }
         model.addAttribute("list", workReviewAudits);
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
@@ -1103,6 +1134,12 @@ public class RuralProjectViewController extends BaseController {
                 }
             }
         }
+        if(StringUtils.isNotBlank(projectReportDataTwo.getProcessInstanceId())){
+            WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(projectReportDataTwo.getProcessInstanceId());
+            if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+            }
+        }
         //获取总审人员
         User user=UserUtils.get(projectReportData.getBzshbUserId());
         model.addAttribute("bzshbUserName",user.getName());
@@ -1148,6 +1185,12 @@ public class RuralProjectViewController extends BaseController {
                 filingBatch = new ProjectFilingBatch();
             }
 
+            if(StringUtils.isNotBlank(filingBatch.getProcessinstanceId())){
+                WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(filingBatch.getProcessinstanceId());
+                if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                    model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+                }
+            }
             model.addAttribute("projectRecords", projectRecords);
             model.addAttribute("projectFilingBatch", filingBatch);
             return "modules/ruralprojectrecords/view/projectFilingBatchView";
@@ -1193,6 +1236,13 @@ public class RuralProjectViewController extends BaseController {
                 }
             }
         }
+
+        if(StringUtils.isNotBlank(paperFiling.getProcessInstanceId())){
+            WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(paperFiling.getProcessInstanceId());
+            if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+            }
+        }
         //查询所有的工程类型
         List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
         model.addAttribute("engineeringInfo",engineeringInfos);

src/main/java/com/jeeplus/modules/sys/dao/UserDao.java

@@ -286,6 +286,13 @@ public interface UserDao extends CrudDao<User> {
 	 * @return
 	 */
 	public List<User> getAuditUserListByProjectGrade();
+
+	/**
+	 * 根据项目等级查询总审人员信息(真实总审)(仅查询使用)
+	 * @param
+	 * @return
+	 */
+	public List<User> getShowAuditUserListByProjectGrade();
 	/**
 	 * 根据项目报告总审人员id查询对应的真实总审信息
 	 * @param

src/main/java/com/jeeplus/modules/sys/service/UserService.java

@@ -564,6 +564,17 @@ public class UserService extends BaseController {
         List<User> userList = UserUtils.getAuditUserList("bzshb",3,recordsOffice.getId(),"12",UserUtils.getUser());*/
         return auditUserList;
     }
+
+    /**
+     * 查询总审人员信息
+     * @return
+     */
+    public List<User> getShowAuditUserList(){//查询真实总审信息
+        List<User> auditUserList = userDao.getShowAuditUserListByProjectGrade();
+        /*Office recordsOffice =officeService.get(UserUtils.getUser().getOffice());
+        List<User> userList = UserUtils.getAuditUserList("bzshb",3,recordsOffice.getId(),"12",UserUtils.getUser());*/
+        return auditUserList;
+    }
     public List<User> getFilingUserList(){
         Office recordsOffice =officeService.get(UserUtils.getUser().getOffice());
         List<User> userList = UserUtils.getByRoleActivityEnname("xxgdydyhu",3,recordsOffice.getId(),"10",UserUtils.getUser());

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -873,6 +873,17 @@ public class WorkContractInfoController extends BaseController {
         if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
+        if(StringUtils.isNotBlank(workContractInfo.getProcessInstanceId())){
+            if(null == workContractInfo.getAct() || StringUtils.isBlank(workContractInfo.getAct().getProcInsId())){
+                Act act = new Act();
+                act.setProcInsId(workContractInfo.getProcessInstanceId());
+                workContractInfo.setAct(act);
+            }
+            WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(workContractInfo.getProcessInstanceId());
+            if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+            }
+        }
         //合同作废信息
         AlterInfo alterInfo = alterInfoService.getByContractInfo(workContractInfo);
         model.addAttribute("alterInfo",alterInfo);

src/main/java/com/jeeplus/modules/workcontractrecord/web/WorkContractRecordController.java

@@ -22,6 +22,8 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -64,6 +66,8 @@ public class WorkContractRecordController extends BaseController {
 	private ActTaskService actTaskService;
 	@Autowired
 	private WorkContractInfoService workContractInfoService;
+	@Autowired
+	protected WorkProjectNotifyService workProjectNotifyService;
 
 	private static byte[] SYN_BYTE = new byte[0];
 	@ModelAttribute
@@ -133,6 +137,18 @@ public class WorkContractRecordController extends BaseController {
 			workContractRecord.setCreateBy(UserUtils.getUser());
 			workContractRecord.setCreateDate(new Date());
 		}
+
+		if(StringUtils.isNotBlank(workContractRecord.getProcessInstanceId())){
+			if(null == workContractRecord.getAct() || StringUtils.isBlank(workContractRecord.getAct().getProcInsId())){
+				Act act = new Act();
+				act.setProcInsId(workContractRecord.getProcessInstanceId());
+				workContractRecord.setAct(act);
+			}
+			WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(workContractRecord.getProcessInstanceId());
+			if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+				model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+			}
+		}
 		model.addAttribute("workContractRecord", workContractRecord);
 		return "modules/workcontractrecord/"+view;
 	}

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -375,6 +375,17 @@ public class WorkInvoiceAllController extends BaseController {
 			}
 
 		}
+		if(StringUtils.isNotBlank(workInvoice.getProcessInstanceId())){
+			if(null == workInvoice.getAct() || StringUtils.isBlank(workInvoice.getAct().getProcInsId())){
+				Act act = new Act();
+				act.setProcInsId(workInvoice.getProcessInstanceId());
+				workInvoice.setAct(act);
+			}
+			WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(workInvoice.getProcessInstanceId());
+			if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+				model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+			}
+		}
 
 		model.addAttribute("workInvoice", workInvoice);
 		return "modules/workinvoice/" + view;

src/main/java/com/jeeplus/modules/workprojectnotify/dao/WorkProjectNotifyDao.java

@@ -119,4 +119,11 @@ public interface WorkProjectNotifyDao extends CrudDao<WorkProjectNotify> {
     int updateWpaData(WorkProjectNotify notify);
 
     List<WorkProjectNotify> notifyFindList(WorkProjectNotify workProjectNotify);
+
+    /**
+     * 根据processInstanceId查询待办或通知信息
+     * @param processInstanceId
+     * @return
+     */
+    WorkProjectNotify getByProcessInstanceId(String  processInstanceId);
 }

src/main/java/com/jeeplus/modules/workprojectnotify/entity/WorkProjectNotify.java

@@ -34,6 +34,7 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	private String title;		// 标题
 	private String content;		// 内容
 	private String type;		// 类型
+	private String notifyType;		// 类型(String)
 	private String types;		// 多个类型
 	private User user;		// 通知人
 	private String notifyId;		// 通知信息id
@@ -109,6 +110,14 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 		this.type = type;
 	}
 
+	public String getNotifyType() {
+		return notifyType;
+	}
+
+	public void setNotifyType(String notifyType) {
+		this.notifyType = notifyType;
+	}
+
 	@ExcelField(title="通知人", align=2, sort=11)
 	public User getUser() {
 		return user;

src/main/java/com/jeeplus/modules/workprojectnotify/service/WorkProjectNotifyService.java

@@ -11,6 +11,7 @@ import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workactivity.entity.WorkActivityProcess;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
@@ -403,4 +404,18 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 		}
 		return nowWorkProjectNotify;
 	}
+
+	/**
+	 * 根据processInstanceId查询待办或通知信息
+	 * @param id
+	 * @return
+	 */
+	public WorkProjectNotify getByProcessInstanceId(String id) {
+		WorkProjectNotify workProjectNotify = dao.getByProcessInstanceId(id);
+		if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getType())){
+			String projectNotifyType = DictUtils.getDictLabel(workProjectNotify.getType(), "project_notify_type", "");
+			workProjectNotify.setNotifyType(projectNotifyType);
+		}
+		return workProjectNotify;
+	}
 }

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

@@ -1158,6 +1158,8 @@ public class WorkProjectNotifyController extends BaseController {
 			workProjectNotify.preUpdate();
 			workProjectNotifyService.save(workProjectNotify);
 			if (StringUtils.isNotBlank(workProjectNotify.getType())) {
+				String projectNotifyType = DictUtils.getDictLabel(workProjectNotify.getType(), "project_notify_type", "");
+				model.addAttribute("projectNotifyType", projectNotifyType);
 				if (workProjectNotify.getType().equals("13")) {    //报销
 					WorkReimbursement workReimbursement = workReimbursementService.get(workProjectNotify.getNotifyId());
 					//判断报销类型状态并添加报销类型信息数据
@@ -1325,7 +1327,7 @@ public class WorkProjectNotifyController extends BaseController {
 						}*/
 						return "modules/workcontractinfo/newWorkContract/workContractInfoFormEdit";
 					}
-				} else if (workProjectNotify.getType().equals("144")) {    //合同管理new
+				} else if (workProjectNotify.getType().equals("144")) {    //审定单
 					RuralProjectRecords ruralProjectRecords = ruralProjectMessageElectronicSealService.getProjectApprovalSignatureById(workProjectNotify.getNotifyId());
 					ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
 					ruralProjectRecords.setSignatureContractId(projectReportData.getSignatureContractId());
@@ -8996,6 +8998,8 @@ public class WorkProjectNotifyController extends BaseController {
 
 	private String caseBase(WorkProjectNotify workProjectNotify,Model model) {
 		try {
+			String projectNotifyType = DictUtils.getDictLabel(workProjectNotify.getType(), "project_notify_type", "");
+			model.addAttribute("projectNotifyType", projectNotifyType);
 			//查询“配农网”工程类型id
 			String engineeringId = engineeringService.getEngineeringId("202");
 			ProjectReportRecord projectReportRecord = projectReportRecordService.getProjectReportRecordByProjectId(workProjectNotify.getNotifyId());
@@ -9338,6 +9342,8 @@ public class WorkProjectNotifyController extends BaseController {
 
 	private String disposeBusinessQuestions(WorkProjectNotify workProjectNotify,Model model) {
 		try {
+			String projectNotifyType = DictUtils.getDictLabel(workProjectNotify.getType(), "project_notify_type", "");
+			model.addAttribute("projectNotifyType", projectNotifyType);
 			BusinessQuestions businessQuestions = businessQuestionsService.get(workProjectNotify.getNotifyId());
 			businessQuestionsService.queryDetails(businessQuestions);
 			//查询业务提问内容集合（按照时间正序进行查询）

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementAllController.java

@@ -37,6 +37,8 @@ import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workfullmanage.service.WorkFullManageService;
 import com.jeeplus.modules.workinvoice.entity.WorkInvoice;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workreimbursement.entity.WorkAccount;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementTypeInfo;
@@ -121,6 +123,8 @@ public class WorkReimbursementAllController extends BaseController {
 	private WorkReimbursementBackService workReimbursementBackService;
 	@Autowired
 	private WorkReimbursementTypeService workReimbursementTypeService;
+	@Autowired
+	protected WorkProjectNotifyService workProjectNotifyService;
 
 	@ModelAttribute
 	public WorkReimbursement get(@RequestParam(required=false) String id) {
@@ -257,6 +261,17 @@ public class WorkReimbursementAllController extends BaseController {
 				workReimbursement.setAchivesId(UserUtils.getBasicInfo().getId());
 			}
 		}
+		if(StringUtils.isNotBlank(workReimbursement.getProcessInstanceId())){
+			if(null == workReimbursement.getAct() || StringUtils.isBlank(workReimbursement.getAct().getProcInsId())){
+				Act act = new Act();
+				act.setProcInsId(workReimbursement.getProcessInstanceId());
+				workReimbursement.setAct(act);
+			}
+			WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(workReimbursement.getProcessInstanceId());
+			if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+				model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+			}
+		}
 		model.addAttribute("workReimbursement", workReimbursement);
 		return "modules/workreimbursement/"+view;
 	}

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -162,14 +162,14 @@ public class WorkReimbursementController extends BaseController {
 		//添加发票对应编号
 		//workProjectNotify.setType("13");
 		//查询所有需要当前登录人进行处理的项目信息
-		List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
+		//List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
 
 		/*//添加发票对应编号
 		workProjectNotify.setType("102");
 		//查询所有需要当前登录人进行处理的项目信息
 		List<WorkProjectNotify> newNotifyList = workProjectNotifyService.findList(workProjectNotify);*/
 
-		for (WorkReimbursement info: list) {
+		/*for (WorkReimbursement info: list) {
 			for (WorkProjectNotify notify: notifyList) {
 				if(notify.getNotifyId().equals(info.getId()) && "13".equals(notify.getType())){
 					info.setNotifyId(notify.getId());
@@ -193,7 +193,7 @@ public class WorkReimbursementController extends BaseController {
 					break;
 				}
 			}
-		}
+		}*/
 		model.addAttribute("page", page);
 		return "modules/workreimbursement/workReimbursementList";
 	}
@@ -300,6 +300,17 @@ public class WorkReimbursementController extends BaseController {
 			User user=UserUtils.get(workReimbursement.getCreateBy().getId());
 			workReimbursement.setCreateBy(user);
 		}
+		if(StringUtils.isNotBlank(workReimbursement.getProcessInstanceId())){
+			if(null == workReimbursement.getAct() || StringUtils.isBlank(workReimbursement.getAct().getProcInsId())){
+				Act act = new Act();
+				act.setProcInsId(workReimbursement.getProcessInstanceId());
+				workReimbursement.setAct(act);
+			}
+			WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(workReimbursement.getProcessInstanceId());
+			if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+				model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+			}
+		}
 
 		model.addAttribute("workReimbursement", workReimbursement);
 		return "modules/workreimbursement/"+view;

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -1273,6 +1273,17 @@
 				,a.name = '任建国' desc
 	</select>
 
+	<select id="getShowAuditUserListByProjectGrade" resultType="User">
+		SELECT
+		a.id,a.name,a.photo,a.login_name AS "loginName"
+		FROM sys_user a
+		JOIN sys_user_role ur ON ur.user_id = a.id
+		JOIN project_audit_user_info pau ON pau.user_id = a.id
+		JOIN sys_role r ON ur.role_id = r.id
+		WHERE a.office_id is not null and pau.real_flag=1
+		order by a.name desc
+	</select>
+
 	<select id="getAuditUserListByBzshbUserId" resultType="java.lang.String">
 		SELECT
 		a.relevance_user_id

src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -966,4 +966,13 @@
 		WHERE id = #{id}
 	</update>
 
+	<select id="getByProcessInstanceId" resultType="WorkProjectNotify" >
+		SELECT
+		<include refid="workProjectNotifyColumns"/>
+		,a.process_instance_id as "processInstanceId"
+		FROM work_project_notify a
+		<include refid="workProjectNotifyJoins"/>
+		WHERE a.process_instance_id = #{processInstanceId}
+		limit 1
+	</select>
 </mapper>

src/main/webapp/webpage/modules/businessQuestions/businessQuestionsAudit.jsp

@@ -354,7 +354,7 @@
 		</div>
 
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >
 				<act:flowChart procInsId="${businessQuestions.act.procInsId}"/>
 				<act:histoicFlow procInsId="${businessQuestions.act.procInsId}" />

src/main/webapp/webpage/modules/caseinfo/caseInfoAudit.jsp

@@ -527,7 +527,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${caseInfo.act.procInsId}"/>
 					<act:histoicFlow procInsId="${caseInfo.act.procInsId}"/>

src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp

@@ -522,7 +522,7 @@
         </div>
         <iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
         <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <act:flowChart procInsId="${oaNotify.act.procInsId}"/>
                 <act:histoicFlow procInsId="${oaNotify.act.procInsId}"/>

src/main/webapp/webpage/modules/oa/oaNotifyList.jsp

@@ -558,7 +558,7 @@
 					}}
                 ,{align:'center', title: '通告状态',  width:70,templet:function(d){
                         var st = getAuditState(d.status)
-                        var xml = "<span onclick=\"openDialogListView('流程追踪', '${ctx}/oa/oaNotify/getProcess?id=" + d.id + "','" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                        var xml = "<span onclick=\"openDialogListView('通告流程追踪', '${ctx}/oa/oaNotify/getProcess?id=" + d.id + "','" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
                 // ,{fixed: 'right',align:'center', toolbar: '#op',title:"操作"}

src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp

@@ -526,7 +526,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${oaNotify.act.procInsId}"/>
                     <act:histoicFlow procInsId="${oaNotify.act.procInsId}"/>

src/main/webapp/webpage/modules/oa/oaNotifyView.jsp

@@ -487,7 +487,13 @@
                 <%--<div class="comment_add_or_last" >
                     没有更多评论了
                 </div>--%>
-
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${oaNotify.act.procInsId}"/>
+                    <act:histoicFlow procInsId="${oaNotify.act.procInsId}"/>
+                </div>
+            </div>
             <div class="form-group layui-row page-end"></div>
             </form:form>
         </div>

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

@@ -390,7 +390,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
 					<act:histoicFlow procInsId="${projectReportRecord.act.procInsId}"/>

src/main/webapp/webpage/modules/processProjectReportRecord/projectReportRecordModifyApply.jsp

@@ -409,7 +409,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
 					<act:histoicFlow procInsId="${projectReportRecord.act.procInsId}"/>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchApply.jsp

@@ -412,7 +412,7 @@
 			</div>
 	</form:form>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectFilingBatch.processinstanceId}"/>
 					<act:histoicFlow procInsId="${projectFilingBatch.processinstanceId}"/>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp

@@ -421,7 +421,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectFilingBatch.processinstanceId}"/>
 					<act:histoicFlow procInsId="${projectFilingBatch.processinstanceId}"/>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchView.jsp

@@ -250,6 +250,13 @@
             </div>
             <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
         </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${projectFilingBatch.processinstanceId}"/>
+                    <act:histoicFlow procInsId="${projectFilingBatch.processinstanceId}"/>
+                </div>
+            </div>
         </form:form>
     </div>
 </div>

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingAudit.jsp

@@ -1795,7 +1795,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingModify.jsp

@@ -542,7 +542,7 @@
 
 		</form:form>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >
 				<act:flowChart procInsId="${processInstanceId}"/>
 				<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingView.jsp

@@ -231,7 +231,7 @@
 <%--		</div>--%>
 <%--		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>--%>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

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

@@ -1708,7 +1708,7 @@
 
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
 					<act:histoicFlow procInsId="${projectReportRecord.act.procInsId}"/>

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

@@ -770,7 +770,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
 					<act:histoicFlow procInsId="${projectReportRecord.act.procInsId}"/>

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

@@ -371,7 +371,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
 					<act:histoicFlow procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>

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

@@ -482,7 +482,7 @@
 		</c:if>
 		<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >
 				<act:flowChart procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
 				<act:histoicFlow procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>

src/main/webapp/webpage/modules/projectrecord/check/checkDistributionSettlementList.jsp

@@ -304,7 +304,7 @@
                             }else if(d.condition ==2){
                                 return  "";
                             }else if(d.condition ==3){
-                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=distribution&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"','95%', '95%')\">" + d.number + "</a>";
+                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看工作内容', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportView&condition=distribution&flag=view&reportType=${reportType}&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&projectReportData.id="+d.reportId+"&nodeId="+d.id+"','95%', '95%')\">" + d.number + "</a>";
                             }else{
                                 return "";
                             }

src/main/webapp/webpage/modules/projectrecord/follow/workFollowArchiveAudit.jsp

@@ -1198,7 +1198,7 @@
         </form:form>
 
         <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <act:flowChart procInsId="${processInstanceId}"/>
                 <act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/projectrecord/follow/workFollowArchiveModify.jsp

@@ -1231,7 +1231,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectFollowReport.reportProcessInstanceId}"/>
                     <act:histoicFlow procInsId="${projectFollowReport.reportProcessInstanceId}"/>

src/main/webapp/webpage/modules/projectrecord/follow/workFollowReportAudit.jsp

@@ -1198,7 +1198,7 @@
         </form:form>
 
         <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <act:flowChart procInsId="${processInstanceId}"/>
                 <act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/projectrecord/follow/workFollowReportModify.jsp

@@ -1231,7 +1231,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectFollowReport.reportProcessInstanceId}"/>
                     <act:histoicFlow procInsId="${projectFollowReport.reportProcessInstanceId}"/>

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterAudit.jsp

@@ -707,7 +707,7 @@
 			</script>
 	</form:form>
         <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <act:flowChart procInsId="${processInstanceId}"/>
                 <act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp

@@ -754,7 +754,7 @@
 	</form:form>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp

@@ -814,7 +814,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectRecords.processInstanceId}"/>
                     <act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>

src/main/webapp/webpage/modules/projectrecord/projectRecordsView.jsp

@@ -741,6 +741,13 @@
 				</div>
 			</div>
 
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${projectRecords.processInstanceId}"/>
+					<act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportView.jsp

@@ -439,18 +439,7 @@
 		</div>--%>
 		<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>审批意见</h2></div>
-			<div class="layui-item layui-col-xs12 with-textarea" >
-				<label class="layui-form-label">审批意见：</label>
-				<div class="layui-input-block">
-					<textarea name="projectReportData.act.comment" class="form-control" rows="4" maxlength="127" ></textarea>
-				</div>
-			</div>
-		</div>
-		</c:if>
-		<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
-		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >
 				<act:flowChart procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
 				<act:histoicFlow procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workFollowAudit.jsp

@@ -1198,7 +1198,7 @@
         </form:form>
 
         <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <act:flowChart procInsId="${processInstanceId}"/>
                 <act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workFollowModify.jsp

@@ -1231,7 +1231,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectFollowReport.processInstanceId}"/>
                     <act:histoicFlow procInsId="${projectFollowReport.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsAudit.jsp

@@ -564,7 +564,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsDownAudit.jsp

@@ -591,7 +591,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsModify.jsp

@@ -487,7 +487,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectRecords.checkProcessInstanceId}"/>
                     <act:histoicFlow procInsId="${projectRecords.checkProcessInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp

@@ -2286,7 +2286,7 @@
                                     <th ><span class="require-item">*</span>咨询员名称</th>
                                     <th width="8%">角色</th>
                                     <th ><span class="require-item">*</span>身份证号</th>
-                                    <th ><span class="require-item">*</span>注册/资格证号</th>
+                                    <th >注册/资格证号</th>
                                     <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
                                     <th ><span class="require-item">*</span>完成营业收入（万元）</th>
                                     <th width="150px"><span class="require-item">*</span>本人负责内容</th>
@@ -3234,7 +3234,7 @@
     <iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
                     <act:histoicFlow procInsId="${ruralProjectRecordsReported.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/newReportedForm.jsp

@@ -1238,7 +1238,7 @@
                                 <th ><span class="require-item">*</span>咨询员名称</th>
                                 <th width="8%">角色</th>
                                 <th ><span class="require-item">*</span>身份证号</th>
-                                <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th >注册/资格证号</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
                                 <th ><span class="require-item">*</span>完成营业收入（万元）</th>
                                 <th width="150px"><span class="require-item">*</span>本人负责内容</th>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -1249,7 +1249,7 @@
                                 <th ><span class="require-item">*</span>咨询员名称</th>
                                 <th width="8%">角色</th>
                                 <th ><span class="require-item">*</span>身份证号</th>
-                                <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th >注册/资格证号</th>
                                 <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
                                 <th ><span class="require-item">*</span>完成营业收入（万元）</th>
                                 <th width="150px"><span class="require-item">*</span>本人负责内容</th>
@@ -1659,7 +1659,7 @@
     <iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
                     <act:histoicFlow procInsId="${ruralProjectRecordsReported.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalAudit.jsp

@@ -560,7 +560,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalModify.jsp

@@ -605,7 +605,7 @@
         </form:form>
         <%--<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>--%>
         <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <act:flowChart procInsId="${processInstanceId}"/>
                 <act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalView.jsp

@@ -1235,7 +1235,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectRecords.processInstanceId}"/>
                     <act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureAudit.jsp

@@ -558,7 +558,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureModify.jsp

@@ -611,7 +611,7 @@
         </form:form>
         <%--<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>--%>
         <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <act:flowChart procInsId="${processInstanceId}"/>
                 <act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureSzzkAudit.jsp

@@ -611,7 +611,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureView.jsp

@@ -1241,7 +1241,7 @@
 
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectRecords.processInstanceId}"/>
                     <act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -1847,7 +1847,7 @@
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >
 				<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
 				<act:histoicFlowRecordTwo procInsId="${projectReportRecord.act.procInsId}"  recordId="${projectReportRecord.id}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordModifyApply.jsp

@@ -739,7 +739,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
 					<act:histoicFlowRecordTwo procInsId="${projectReportRecord.act.procInsId}"  recordId="${projectReportRecord.id}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModifyApply.jsp

@@ -1133,7 +1133,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
 					<act:histoicFlowRecordTwo procInsId="${projectReportRecord.act.procInsId}"  recordId="${projectReportRecord.id}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectRepordDescriptionAudit.jsp

@@ -375,7 +375,7 @@
 						</div>
 					</div>
 					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>审批流程</h2></div>
+						<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 						<div class="layui-item layui-col-xs12 form-table-container" >
 							<act:flowChart procInsId="${materialDefectRecord.act.procInsId}"/>
 							<act:histoicFlow procInsId="${materialDefectRecord.act.procInsId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectRepordDescriptionModify.jsp

@@ -1036,7 +1036,7 @@
 				</div>
 			</div>--%>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${materialDefectRecord.act.procInsId}"/>
 					<act:histoicFlow procInsId="${materialDefectRecord.act.procInsId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectRepordDescriptionView.jsp

@@ -1180,7 +1180,7 @@
 
 
 							<div class="form-group layui-row">
-								<div class="form-group-label"><h2>审批流程</h2></div>
+								<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 								<div class="layui-item layui-col-xs12 form-table-container" >
 									<act:flowChart procInsId="${materialDefectRecord.processInstanceId}"/>
 									<act:histoicFlow procInsId="${materialDefectRecord.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordAudit.jsp

@@ -272,7 +272,7 @@
 								</div>
 							</div>
 							<div class="form-group layui-row">
-								<div class="form-group-label"><h2>审批流程</h2></div>
+								<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 								<div class="layui-item layui-col-xs12 form-table-container" >
 									<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
 									<act:histoicFlow procInsId="${projectReportRecord.act.procInsId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordModifyApply.jsp

@@ -711,7 +711,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
 					<act:histoicFlow procInsId="${projectReportRecord.act.procInsId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordUrgentModifyApply.jsp

@@ -1003,7 +1003,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>
 					<act:histoicFlow procInsId="${projectReportRecord.act.procInsId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/projectReportedImportList.jsp

@@ -409,7 +409,7 @@
 							if(d.reportedState !=undefined && d.reportedState != null && d.reportedState !='' && d.reportedState !='0'){
 								if(d.reportedState == 1){
 									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/project/projectReportedImport/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-									xml+="<a href=\"${ctx}/project/projectReportedImport/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs btn-danger btn-xs layui-bg-red\" > 删除</a>";
+									xml+="<a href=\"${ctx}/project/projectReportedImport/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs btn-danger btn-xs layui-bg-red\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 删除</a>";
 								}
 								if(d.reportedState == 2){
 									xml+="<a href=\"${ctx}/project/projectReportedImport/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.processInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 撤回上报</a>";
@@ -417,13 +417,13 @@
 								/*撤回修改*/
 								if(d.reportedState == 3){
 									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/project/projectReportedImport/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-									xml+="<a href=\"${ctx}/project/projectReportedImport/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs btn-danger btn-xs layui-bg-red\" > 删除</a>";
+									xml+="<a href=\"${ctx}/project/projectReportedImport/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs btn-danger btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 删除</a>";
 								}
 								/*驳回修改*/
 								if(d.reportedState == 4){
 									//驳回操作
 									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/project/projectReportedImport/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改上报</a>";
-									xml+="<a href=\"${ctx}/project/projectReportedImport/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs btn-danger btn-xs layui-bg-red\" > 删除</a>";
+									xml+="<a href=\"${ctx}/project/projectReportedImport/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs btn-danger btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 删除</a>";
 								}
 							}else{
 								xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/project/projectReportedImport/updateReported?id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\"  class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 上报</a>";

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedAudit.jsp

@@ -1589,7 +1589,7 @@
     <iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
                     <act:histoicFlow procInsId="${ruralProjectRecordsReported.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/import/reportedModify.jsp

@@ -1551,7 +1551,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectReportedImport.processInstanceId}"/>
                     <act:histoicFlow procInsId="${projectReportedImport.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedAudit.jsp

@@ -1644,7 +1644,7 @@
     <iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
                     <act:histoicFlow procInsId="${ruralProjectRecordsReported.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/reported/reportedModify.jsp

@@ -1607,7 +1607,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
                     <act:histoicFlow procInsId="${ruralProjectRecordsReported.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAlterAudit.jsp

@@ -525,7 +525,7 @@
 			</script>
 	</form:form>
         <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <act:flowChart procInsId="${processInstanceId}"/>
                 <act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAudit.jsp

@@ -859,7 +859,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsCaseAudit.jsp

@@ -1928,7 +1928,7 @@
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >
 				<act:flowChart procInsId="${projectRecords.processInstanceId}"/>
 				<act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsCaseModify.jsp

@@ -1877,7 +1877,7 @@
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >
 				<act:flowChart procInsId="${projectRecords.processInstanceId}"/>
 				<act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsCaseView.jsp

@@ -482,7 +482,7 @@
 				</div>
 			</c:if>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectRecords.processInstanceId}"/>
 					<act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -1387,7 +1387,7 @@
 <%--                </div>--%>
 <%--            </div>--%>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectRecords.processInstanceId}"/>
                     <act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectRecordsApprovalYCAudit.jsp

@@ -560,7 +560,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectRecordsApprovalYCModify.jsp

@@ -605,7 +605,7 @@
         </form:form>
         <%--<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>--%>
         <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <act:flowChart procInsId="${processInstanceId}"/>
                 <act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectRecordsApprovalYCView.jsp

@@ -1235,7 +1235,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectRecords.processInstanceId}"/>
                     <act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectRecordsReportSignatureYCAudit.jsp

@@ -558,7 +558,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectRecordsReportSignatureYCModify.jsp

@@ -611,7 +611,7 @@
         </form:form>
         <%--<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>--%>
         <div class="form-group layui-row">
-            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <act:flowChart procInsId="${processInstanceId}"/>
                 <act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectRecordsReportSignatureYCSzzkAudit.jsp

@@ -611,7 +611,7 @@
 		</div>
 		<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${processInstanceId}"/>
 					<act:histoicFlow procInsId="${processInstanceId}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectRecordsReportSignatureYCView.jsp

@@ -1241,7 +1241,7 @@
 
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${projectRecords.processInstanceId}"/>
                     <act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>

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

@@ -1946,7 +1946,7 @@
 				</div>
 				<div>
 					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>审批流程</h2></div>
+						<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 						<div class="layui-item layui-col-xs12 form-table-container" >
 							<act:flowChart procInsId="${processInstanceId}"/>
 							<act:histoicFlow procInsId="${processInstanceId}"/>

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

@@ -1818,7 +1818,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <act:flowChart procInsId="${processInstanceId}"/>
                     <act:histoicFlow procInsId="${processInstanceId}"/>