模板文件变更，公告信息改通告页面展示

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

@@ -97,7 +97,7 @@ public class OaNotifyController extends BaseController {
 		if(type.size()>0){
 			Map<String, Object> mapParent = new HashMap<>();
 			mapParent.put("id","");
-			mapParent.put("name", "公告类型");
+			mapParent.put("name", "通告类型");
 			mapParent.put("isParent", true);
 			mapList.add(mapParent);
 

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

@@ -142,12 +142,24 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
         workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
         workProjectNotify.setRemarks("待审批");
         //添加发票对应编号
-        workProjectNotify.setType("92");
+        List<String> typeList= Lists.newArrayList();
+        typeList.add("92");
+        typeList.add("51");
+        typeList.add("95");
+        typeList.add("96");
+        typeList.add("97");
+        typeList.add("99");
+        typeList.add("101");
+        typeList.add("98");
+        typeList.add("110");
+        String types = StringUtils.join(typeList,',');
+        workProjectNotify.setTypes(types);
+        //workProjectNotify.setType("92");
         //查询所有需要当前登录人进行处理的项目信息
         List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
 
         //添加发票对应编号
-        workProjectNotify.setType("51");
+        /*workProjectNotify.setType("51");
         //查询所有需要当前登录人进行处理的项目信息
         List<WorkProjectNotify> recordNotifyList = workProjectNotifyService.findList(workProjectNotify);
 
@@ -179,7 +191,7 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
         //添加上报对应编号
         workProjectNotify.setType("110");
         //查询所有需要当前登录人进行处理的纸质归档信息
-        List<WorkProjectNotify> paperProjectNotifyList = workProjectNotifyService.findList(workProjectNotify);
+        List<WorkProjectNotify> paperProjectNotifyList = workProjectNotifyService.findList(workProjectNotify);*/
 
 
 
@@ -188,16 +200,16 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
             if(null != records.getRecordState() && 0 == records.getProjectReportRecordStatus()){
                 records.setProjectReportRecordStatus(records.getRecordState());
             }
-            this.queryContractInfos(records);
+            /*this.queryContractInfos(records);*/
             //获取项目负责人
-            List<User> users = workProjectUserDao.getProjectprincipalList(records.getId());
+            /*List<User> users = workProjectUserDao.getProjectprincipalList(records.getId());
             records.setProjectLeaders(users);
             records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
-            records.setLeaderIds(Collections3.extractToString(users, "id", ","));
+            records.setLeaderIds(Collections3.extractToString(users, "id", ","));*/
 
             //新增报告展示
             for (WorkProjectNotify notify: notifyList) {
-                if(notify.getNotifyId().equals(records.getPrdId())){
+                if(notify.getNotifyId().equals(records.getPrdId()) && "92".equals(notify.getType())){
                     records.setReportNotifyId(notify.getId());
                     if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records.setReportNotifyFlag(1);
@@ -207,10 +219,8 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     }
                     break;
                 }
-            }
-            //线上归档展示
-            for (WorkProjectNotify notify: recordNotifyList) {
-                if(notify.getNotifyId().equals(records.getPrrId())){
+                //线上归档展示
+                if(notify.getNotifyId().equals(records.getPrrId()) && "51".equals(notify.getType())){
                     records.setReportNotifyId(notify.getId());
                     if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records.setRecordNotifyFlag(1);
@@ -220,10 +230,8 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     }
                     break;
                 }
-            }
-            //上报展示
-            for (WorkProjectNotify notify: reportedNotifyList) {
-                if(notify.getNotifyId().equals(records.getId())){
+                //上报展示
+                if(notify.getNotifyId().equals(records.getPrrId()) && "95".equals(notify.getType())){
                     records.setReportNotifyId(notify.getId());
                     if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records.setReportedNotifyFlag(1);
@@ -233,10 +241,8 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     }
                     break;
                 }
-            }
-            //新代办修改权限处理
-            for (WorkProjectNotify notify: newReportNotifyList) {
-                if(notify.getNotifyId().equals(records.getPrdId())){
+                //新代办修改权限处理
+                if(notify.getNotifyId().equals(records.getPrrId()) && "96".equals(notify.getType())){
                     records.setReportNotifyId(notify.getId());
                     if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records.setNewReportNotifyFlag(1);
@@ -246,10 +252,8 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     }
                     break;
                 }
-            }
-            //新代办流程2修改权限处理
-            for (WorkProjectNotify notify: newReportNotifyListTwo) {
-                if(notify.getNotifyId().equals(records.getPrdtId())){
+                //新代办流程2修改权限处理
+                if(notify.getNotifyId().equals(records.getPrrId()) && "97".equals(notify.getType())){
                     records.setReportNotifyId(notify.getId());
                     if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records.setNewReportTwoNotifyFlag(1);
@@ -259,10 +263,8 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     }
                     break;
                 }
-            }
-            //报告归档资料缺失说明修改权限处理
-            for (WorkProjectNotify notify: materialDefectRecord) {
-                if(notify.getNotifyId().equals(records.getPrdtId())){
+                //报告归档资料缺失说明修改权限处理
+                if(notify.getNotifyId().equals(records.getPrrId()) && "99".equals(notify.getType())){
                     records.setReportNotifyId(notify.getId());
                     if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records.setNewReportMaterialNotifyFlag(1);
@@ -272,10 +274,8 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     }
                     break;
                 }
-            }
-            //新代办修改权限处理
-            for (WorkProjectNotify notify: newRecordNotifyList) {
-                if(notify.getNotifyId().equals(records.getPrrId())){
+                //新代办修改权限处理
+                if(notify.getNotifyId().equals(records.getPrrId()) && "101".equals(notify.getType())){
                     records.setReportNotifyId(notify.getId());
                     if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records.setNewRecordNotifyFlag(1);
@@ -285,11 +285,8 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     }
                     break;
                 }
-            }
-
-            //新代办修改权限处理
-            for (WorkProjectNotify notify: newReportedNotifyList) {
-                if(notify.getNotifyId().equals(records.getId())){
+                //新代办修改权限处理
+                if(notify.getNotifyId().equals(records.getPrrId()) && "98".equals(notify.getType())){
                     records.setNewRecordNotifyId(notify.getId());
                     if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records.setNewReportedNotifyFlag(1);
@@ -299,11 +296,8 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     }
                     break;
                 }
-            }
-
-            //新代办修改权限处理
-            for (WorkProjectNotify notify: paperProjectNotifyList) {
-                if(notify.getNotifyId().equals(records.getPpfId())){
+                //新代办修改权限处理
+                if(notify.getNotifyId().equals(records.getPrrId()) && "110".equals(notify.getType())){
                     records.setPaperProjectNotifyId(notify.getId());
                     if("重新申请".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
                         records.setPaperProjectNotifyFlag(1);
@@ -315,10 +309,9 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                 }
             }
 
-
             //获取归档批次信息
             //项目归档批次
-            ProjectFilingbatchRelation relation=filingbatchRelationDao.getProjectId(records.getId());
+            /*ProjectFilingbatchRelation relation=filingbatchRelationDao.getProjectId(records.getId());
             if(null != relation && StringUtils.isNotBlank(relation.getId())){
                 records.setFilingBatch(relation.getFilingBatch());
                 records.setFilingProjectStatus(relation.getStatus());
@@ -331,7 +324,7 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                     records.setFilingProcessinstanceId(filingBatch.getProcessinstanceId());
                     records.setFilingStatus(filingBatch.getFilingStatus());
                 }
-            }
+            }*/
         }
         page.setList(recordsList);
         return page;

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

@@ -127,13 +127,21 @@ public class RuralProjectViewController extends BaseController {
     @RequestMapping(value = "view")
     public String view(RuralProjectRecords projectRecords, Model model) {
         if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
+            long l1 = System.currentTimeMillis();
             projectRecords = projectRecordsService.get(projectRecords.getId());
+            long l2 = System.currentTimeMillis();
+            System.out.println("查询项目信息方法时间：" + (l2-l1));
 
             //根据归属部门Id查询归属部门名称显示
             String belongingDepartmentName = projectRecordsService.getBelongingDepartmentNameByBelongingDepartment(projectRecords.getBelongingDepartment());
             model.addAttribute("belongingDepartmentName",belongingDepartmentName);
 
+            long l3 = System.currentTimeMillis();
+            System.out.println("查询归属部门名称方法时间：" + (l3-l2));
+
             projectRecordsService.queryProjectDetail(projectRecords);
+            long l4 = System.currentTimeMillis();
+            System.out.println("查询其他信息方法时间：" + (l4-l3));
 
             if(null != projectRecords.getReportSignatureUploadFileUser() && StringUtils.isNotBlank(projectRecords.getReportSignatureUploadFileUser().getId())){
                 projectRecords.setReportSignatureUploadFileUser(UserUtils.get(projectRecords.getReportSignatureUploadFileUser().getId()));
@@ -148,6 +156,10 @@ public class RuralProjectViewController extends BaseController {
             }
             //获取项目计划信息
             List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+
+            long l5 = System.currentTimeMillis();
+            System.out.println("查询项目计划方法时间：" + (l5-l4));
+
             projectRecords.setProjectPlanList(projectPlanList);
             List<MainDictDetail> mainDictList = Lists.newArrayList();
             //工程咨询
@@ -166,6 +178,8 @@ public class RuralProjectViewController extends BaseController {
                     }
                 }
             }
+            long l6 = System.currentTimeMillis();
+            System.out.println("处理方法时间：" + (l6-l5));
 
             //查询项目报告信息
             ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
@@ -178,17 +192,24 @@ public class RuralProjectViewController extends BaseController {
                     model.addAttribute("projectId", "");
                 }
             }
+            long l7 = System.currentTimeMillis();
+            System.out.println("查询项目报告方法时间：" + (l7-l6));
 
             model.addAttribute("flagProjectReportData",projectReportData);
 
         }
         model.addAttribute("projectRecords", projectRecords);
+        long l8 = System.currentTimeMillis();
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         if (null!=reported){
             model.addAttribute("reportedId",reported.getId());
         }
+        long l9 = System.currentTimeMillis();
+        System.out.println("查询项目归档方法时间：" + (l9-l8));
         //查询所有的工程类型
         List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+        long l10 = System.currentTimeMillis();
+        System.out.println("查询所有的工程类型方法时间：" + (l10-l9));
         model.addAttribute("engineeringInfo",engineeringInfos);
         return "modules/ruralprojectrecords/view/ruralProjectRecordsView";
     }

src/main/java/com/jeeplus/modules/workfullmanage/service/WorkFullManageService.java

@@ -625,6 +625,13 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 				}
 				User user=userService.get(consultant.getZixunyuan());
 				consultant.setZixunyuanName(user.getName());
+				consultant.setRole("咨询员");
+				if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+					bzshbConsultant = consultant;
+					bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+					bzshbConsultant.setRole("技术负责人");
+					it.remove();
+				}
 			}
 		}
 		consultants.addAll(consultantList);
@@ -761,51 +768,54 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 		//查询签章数据信息
 		ProjectReportSignatureInfo projectReportSignatureInfo = ruralProjectMessageElectronicSealDao.get(projectReportData.getNumber());
 
-		//根据咨询员id查询咨询员信息以及咨询员的专业和资格
-		if(null != projectReportSignatureInfo && StringUtils.isNotBlank(projectReportSignatureInfo.getConsultant())){
-			RuralReportConsultant consultantUserConsultant = new RuralReportConsultant();
-			User consultantUser = UserUtils.get(projectReportSignatureInfo.getConsultant());
-			data.put("consultantName1",consultantUser.getName());
-
-			//如果咨询员不为空，则对项咨询员进行获取签字章并存储
-			if(org.apache.commons.lang3.StringUtils.isNotBlank(consultantUser.getId())){
-				String base64String = base64String(consultantUser.getId());
-				data.put("handSignature4",base64String);
-			}else{
-				data.put("handSignature4","");
-			}
-
 
+		data.put("zixunyuanName","");
+		data.put("consultantName1","");
+		data.put("consultantProfession1","");
+		data.put("consultantQualification1","");
+		data.put("handSignature4",blankBase64);
 
-			data.put("zixunyuanName",consultantUser.getName());
-			data.put("consultantProfession1","");
-			data.put("consultantQualification1","");
-			List<WorkStaffCertificate> certificateByUser = ruralProjectMessageNewService.getCertificateByUser(consultantUser.getId());
-			for (WorkStaffCertificate certificateInfo: certificateByUser) {
-				consultantUserConsultant.setZhucezigezhID(certificateInfo.getNum());
-				consultantUserConsultant.setZhucezigezhKey(certificateInfo.getName());
-				for (MainDictDetail type : certificateMajor) {
-					if(certificateInfo.getMajor().equals(type.getValue())){
-						data.put("consultantProfession1",type.getLabel());
-						break;
+		Integer zxyFlag = 0;
+		//根据咨询员id查询咨询员信息以及咨询员的专业和资格
+		for (RuralReportConsultant consultant : consultants) {
+			if("咨询员".equals(consultant.getRole()) && 0 == zxyFlag){
+				zxyFlag ++;
+				User consultantUser = UserUtils.get(consultant.getZixunyuan());
+				data.put("consultantName1",consultantUser.getName());
+
+				//如果咨询员不为空，则对项咨询员进行获取签字章并存储
+				if(org.apache.commons.lang3.StringUtils.isNotBlank(consultantUser.getId())){
+					String base64String = base64String(consultantUser.getId());
+					data.put("handSignature4",base64String);
+				}else{
+					data.put("handSignature4","");
+				}
+				data.put("zixunyuanName",consultantUser.getName());
+				data.put("consultantProfession1","");
+				data.put("consultantQualification1","");
+				RuralReportConsultant consultantUserConsultant = new RuralReportConsultant();
+				List<WorkStaffCertificate> certificateByUser = ruralProjectMessageNewService.getCertificateByUser(consultantUser.getId());
+				for (WorkStaffCertificate certificateInfo: certificateByUser) {
+					consultantUserConsultant.setZhucezigezhID(certificateInfo.getNum());
+					consultantUserConsultant.setZhucezigezhKey(certificateInfo.getName());
+					for (MainDictDetail type : certificateMajor) {
+						if(certificateInfo.getMajor().equals(type.getValue())){
+							data.put("consultantProfession1",type.getLabel());
+							break;
+						}
 					}
 				}
-			}
 
-			for (MainDictDetail type : certificateType) {
-				if(consultantUserConsultant.getZhucezigezhKey().equals(type.getValue())){
-					data.put("consultantQualification1",type.getLabel());
-					break;
+				for (MainDictDetail type : certificateType) {
+					if(consultantUserConsultant.getZhucezigezhKey().equals(type.getValue())){
+						data.put("consultantQualification1",type.getLabel());
+						break;
+					}
 				}
 			}
-		}else{
-			data.put("zixunyuanName","");
-			data.put("consultantName1","");
-			data.put("consultantProfession1","");
-			data.put("consultantQualification1","");
-			data.put("handSignature4",blankBase64);
 		}
 
+
 		//咨询报告日期
 		if(null != projectReportSignatureInfo && null != projectReportSignatureInfo.getStampDate()){
 			data.put("projectReportDate",dateStr(projectReportSignatureInfo.getStampDate()));

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -90,7 +90,12 @@ import freemarker.template.Template;
 @Controller
 @RequestMapping(value = "${adminPath}/workfullmanage/workFullManage")
 public class WorkFullManageController extends BaseController {
-
+	//空白图片的base64参数
+	private final String blankBase64 = "iVBORw0KGgoAAAANSUhEUgAAAIIAAAA/CAYAAAAsVxBWAAAAAXNSR0IArs4c6QAAAARnQU1BAACx\n" +
+			"jwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACPSURBVHhe7dIBDQAwEMSg+Td9+1QHaOANjghE\n" +
+			"BCICEYGIQEQgIhARiAhEBCICEYGIQEQgIhARiAhEBCICEYGIQEQgIhARiAhEBCICEYGIQEQgIhAR\n" +
+			"iAhEBCICEYGIQEQgIhARiAhEBCICEYGIQEQgIhARiAhEBCICEYGIQEQgIhARiAhEBCICEYGIQETg\n" +
+			"bB/QoX96EpAulQAAAABJRU5ErkJggg==";
 
 	@Autowired
 	private WorkFullManageService workFullManageService;
@@ -1117,6 +1122,7 @@ public class WorkFullManageController extends BaseController {
 				}
 				User user=userService.get(consultant.getZixunyuan());
 				consultant.setZixunyuanName(user.getName());
+				consultant.setRole("咨询员");
 			}
 		}
 		consultants.addAll(consultantList);
@@ -1210,6 +1216,7 @@ public class WorkFullManageController extends BaseController {
 		//约定作业期
 		data.put("promiseTime",promiseTime);
 		data.put("projectMaster",ruralProjectRecords.getLeaderNameStr());
+		int flag = 0;
 		//咨询员信息
 		if(null != consultants){
 			for (int i = 0; i<consultants.size(); i++){
@@ -1223,11 +1230,14 @@ public class WorkFullManageController extends BaseController {
 					data.put("consultantProfession"+i,consultants.get(i).getMajor());
 				}
 				data.put("consultantQualification"+i,consultants.get(i).getZhucezigezh());
-				if(i == 0){
-					//项目负责人签字章处理
-					if(StringUtils.isNotBlank(consultants.get(i).getZixunyuan())){
+				//咨询员签字
+				if(0 == flag){
+					if(StringUtils.isNotBlank(consultants.get(i).getZixunyuan()) && "咨询员".equals(consultants.get(i).getRole())){
 						String base64String = workFullManageService.base64String(consultants.get(i).getZixunyuan());
 						data.put("handSignature1",base64String);
+						flag ++;
+					}else{
+						data.put("handSignature1",blankBase64);
 					}
 				}
 			}
@@ -1245,6 +1255,14 @@ public class WorkFullManageController extends BaseController {
 				data.put("consultantQualification"+i,"");
 			}
 		}
+		//查询陈红星陈总的用户信息
+		User chxUser = UserUtils.getByUserName("陈红星");
+		if(StringUtils.isNotBlank(chxUser.getId())){
+			String base64String = workFullManageService.base64String(chxUser.getId());
+			data.put("handSignature3",base64String);
+		}else{
+			data.put("handSignature3",blankBase64);
+		}
 		//专业咨询员处理（添加序号）
 		for(int i = 1; i <=consultantList.size();i++){
 			consultantList.get(i-1).setId(i+"");

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -62,7 +62,8 @@
 		a.signature_url as "signatureUrl",
 		a.signature_upload_file_user as "signatureUploadFileUser.id",
 		a.signature_upload_date as "signatureUploadDate",
-		a.first_audit_date as "firstAuditDate"
+		a.first_audit_date as "firstAuditDate",
+		a.bzshb_user_id as "bzshbUserId"
 	</sql>
 
 	<sql id="projectReportDataJoins">

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -373,7 +373,14 @@ END) as projectScale*/
 		,ifnull(ppf.status,0) as "paperFilingStatus"
 		,ppf.process_instance_id as "ppfProcessInstanceId"
 		,ppf.id as "ppfId"
+		,pfp.filing_batch as "filingBatch"
+		,pfp.box_num as "boxNum"
+		,pfp.re_box_num as "reBoxNum"
+		,pfb.id AS "FilingBatchId"
+		,(select group_concat(su.name) from work_project_user wpu left join sys_user su on su.id = wpu.user_id where wpu.project_id = a.id) as "leaderNameStr"
+		,(select group_concat(su.id) from work_project_user wpu left join sys_user su on su.id = wpu.user_id where wpu.project_id = a.id) as "leaderNameIds"
 		,pfb.process_instance_id AS "filingProcessinstanceId"
+		,pfb.filing_status AS "filingStatus"
 		,ifnull(pfp.status,0) as "filingProjectStatus"
 		,ifnull(prd.approval_fee ,"") as "approvalFee"
 		,ifnull(prd.review_fee ,"") as "reviewFee"

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

@@ -16,7 +16,7 @@
             $("#content").val(content);
             console.log(content+","+(content == null)+(content == undefined)+(content == ""));
             if(content == null || content == undefined || content == "" || content == "\n"){
-                parent.layer.msg('公告内容不能为空',{icon:5});
+                parent.layer.msg('通告内容不能为空',{icon:5});
                 return false;
             }
             if(validateForm.form()){
@@ -139,13 +139,13 @@
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>通告信息</h2></div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>公告标题：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>通告标题：</label>
                     <div class="layui-input-block">
                         <form:input path="title" htmlEscape="false" maxlength="30" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>公告编号：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>通告编号：</label>
                     <div class="layui-input-block">
                         <div class="input-group">
                             <form:input path="number" htmlEscape="false" readonly="true" maxlength="30" class="form-control layui-input"/>
@@ -156,7 +156,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>公告类型：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>通告类型：</label>
                     <div class="layui-input-block">
                         <form:select path="type" class="form-control required simple-select">
                             <form:options items="${fns:getMainDictList('oa_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>

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

@@ -149,9 +149,9 @@
             <input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
             <div class="form-group layui-row first">
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>公告状态</h2></div>
+                    <div class="form-group-label"><h2>通告状态</h2></div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">公告状态：</label>
+                        <label class="layui-form-label">通告状态：</label>
                         <div class="layui-input-block">
                             <input type="radio" title="短期" lay-filter="ext" checked name="ext" id="ext" value="0" disabled>
                             <input type="radio" title="长期" lay-filter="ext" name="ext" id="ext1" value="1" disabled>
@@ -160,9 +160,9 @@
                 </div>
             </div>
             <div class="form-group layui-row first">
-                <div class="form-group-label"><h2>公告信息</h2></div>
+                <div class="form-group-label"><h2>通告信息</h2></div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">公告标题：</label>
+                    <label class="layui-form-label">通告标题：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true" style="background-color: #f1f1f1" maxlength="30" class="form-control required layui-input"
                                value="${oaNotify.title}"/>
@@ -176,7 +176,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">公告类型：</label>
+                    <label class="layui-form-label">通告类型：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true" style="background-color: #f1f1f1" maxlength="30" class="form-control required layui-input"
                                value="${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}"/>
@@ -239,7 +239,7 @@
             </div>
 
                     <div class="form-group layui-row">
-                        <div class="form-group-label"><h2>公告范围-部门</h2></div>
+                        <div class="form-group-label"><h2>通告范围-部门</h2></div>
                         <table id="officeTable" class="table table-bordered table-condensed details">
                             <thead>
                             <tr>
@@ -258,7 +258,7 @@
                         </script>
                     </div>
                     <div class="form-group layui-row">
-                        <div class="form-group-label"><h2>公告范围-成员</h2></div>
+                        <div class="form-group-label"><h2>通告范围-成员</h2></div>
                         <table id="userTable" class="table table-bordered table-condensed details">
                             <thead>
                             <tr>
@@ -335,7 +335,7 @@
                     </div>
 
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>公告附件</h2></div>
+                    <div class="form-group-label"><h2>通告附件</h2></div>
                     <div class="layui-item layui-col-xs12" style="padding:0 16px;">
                         <table id="upTable" class="table table-bordered table-condensed details">
                             <thead>

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

@@ -36,7 +36,7 @@
                     $("#content").val(content);
                     console.log(content+","+(content == null)+(content == undefined)+(content == ""));
                     if(content == null || content == undefined || content == "" || content == "\n"){
-                        parent.layer.msg('公告内容不能为空',{icon:5});
+                        parent.layer.msg('通告内容不能为空',{icon:5});
                         return false;
                     }
                     var flag=judgment();
@@ -196,9 +196,9 @@
             <sys:message content="${message}"/>
             <div class="form-group layui-row first">
                 <div class="layui-row">
-                    <div class="form-group-label"><h2>公告状态</h2></div>
+                    <div class="form-group-label"><h2>通告状态</h2></div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">公告状态：</label>
+                        <label class="layui-form-label">通告状态：</label>
                         <div class="layui-input-block">
                             <input type="radio" title="短期" lay-filter="ext" checked name="ext" id="ext" value="0">
                             <input type="radio" title="长期" lay-filter="ext" name="ext" id="ext1" value="1">
@@ -209,9 +209,9 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>通告信息</h2></div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>公告标题：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>通告标题：</label>
                     <div class="layui-input-block">
-                        <form:input path="title" htmlEscape="false" placeholder="请输入公告标题" maxlength="30" class="form-control judgment layui-input"/>
+                        <form:input path="title" htmlEscape="false" placeholder="请输入通告标题" maxlength="30" class="form-control judgment layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -221,7 +221,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>公告类型：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>通告类型：</label>
                     <div class="layui-input-block readOnlyFFF">
                         <form:select path="type" class="form-control judgment simple-select">
                             <form:options items="${fns:getMainDictList('oa_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -267,7 +267,7 @@
             </div>
 
             <div class="layui-item layui-col-sm6" >
-                <div class="form-group-label" ><h2>公告范围-部门</h2></div>
+                <div class="form-group-label" ><h2>通告范围-部门</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:treeselectoffices id="offices" name="" value="" labelName="memberNameStr" labelValue=""
                                            retnParent="true" checked="true" notAllowSelectParent="true" title="部门" url="/sys/office/treeData?type=2"  cssClass="form-control " allowClear="true"/>
@@ -299,7 +299,7 @@
             </div>
 
             <div class="layui-item layui-col-sm6" >
-                <div class="form-group-label"><h2>公告范围-成员</h2></div>
+                <div class="form-group-label"><h2>通告范围-成员</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:treeselectusers id="users" name="" value="" labelName="memberNameStr" labelValue=""
                                          retnParent="true" title="用户" url="/sys/office/treeData?type=3" checked="true" cssClass="form-control " allowClear="true" notAllowSelectParent="true"/>

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

@@ -120,9 +120,9 @@
         <sys:message content="${message}"/>
 
         <div class="form-group layui-row first">
-            <div class="form-group-label"><h2>公告信息</h2></div>
+            <div class="form-group-label"><h2>通告信息</h2></div>
             <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label">公告标题：</label>
+                <label class="layui-form-label">通告标题：</label>
                 <div class="layui-input-block">
                     <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" maxlength="30" class="form-control required layui-input"
                            value="${oaNotify.title}"/>
@@ -136,7 +136,7 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label">公告类型：</label>
+                <label class="layui-form-label">通告类型：</label>
                 <div class="layui-input-block">
                     <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" maxlength="30" class="form-control required layui-input"
                            value="${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}"/>
@@ -197,7 +197,7 @@
 
             <c:if test="${oaNotify.createBy.id eq fns:getUser().id}">
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>公告范围-部门</h2></div>
+                    <div class="form-group-label"><h2>通告范围-部门</h2></div>
                     <table id="officeTable" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
@@ -216,7 +216,7 @@
                     </script>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>公告范围-成员</h2></div>
+                    <div class="form-group-label"><h2>通告范围-成员</h2></div>
                     <table id="userTable" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
@@ -294,7 +294,7 @@
             </c:if>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>公告附件</h2></div>
+                <div class="form-group-label"><h2>通告附件</h2></div>
                 <div class="layui-item layui-col-xs12" style="padding:0 16px;">
                     <table id="upTable" class="table table-bordered table-condensed details">
                         <thead>
@@ -426,8 +426,8 @@
                     </table>
                 </div>
             </div>
-            <!--在“我的公告”中只能查看到个人接收的，只改变未读状态为已读，不显示所有的查看状态;
-            在“公告管理”中只有管理员权限才能查看，显示该条公告的所有查看状态；
+            <!--在“我的通告”中只能查看到个人接收的，只改变未读状态为已读，不显示所有的查看状态;
+            在“通告管理”中只有管理员权限才能查看，显示该条通告的所有查看状态；
             -->
                 <%-- <c:choose>
                      <c:when test="${toReadMyNotify}">

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

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-    <title>公告管理</title>
+    <title>通告管理</title>
     <meta name="decorator" content="default"/>
     <%@include file="/webpage/include/treeview.jsp" %>
     <style type="text/css">

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

@@ -271,7 +271,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该公告信息已删除！", {icon: 0});
+						top.layer.msg("该通告信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}
@@ -309,7 +309,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该公告信息已删除！", {icon: 0});
+						top.layer.msg("该通告信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}
@@ -402,13 +402,13 @@
 
 				<div class="commonQuery">
 					<div class="layui-item query athird">
-						<label class="layui-form-label">公告标题：</label>
+						<label class="layui-form-label">通告标题：</label>
 						<div class="layui-input-block with-icon">
 							<form:input path="title" htmlEscape="false" maxlength="200"  class=" form-control layui-input" />
 						</div>
 					</div>
 					<div class="layui-item query athird">
-						<label class="layui-form-label">公告文号：</label>
+						<label class="layui-form-label">通告文号：</label>
 						<div class="layui-input-block with-icon">
 							<form:input path="referenceNumber" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
@@ -418,7 +418,7 @@
 
 
 <%--					<div class="layui-item query athird">--%>
-<%--						<label class="layui-form-label">公告类型：</label>--%>
+<%--						<label class="layui-form-label">通告类型：</label>--%>
 <%--						<div class="layui-input-block">--%>
 <%--							<form:select path="type"  class="form-control simple-select">--%>
 <%--								<form:option value="" label=""/>--%>
@@ -455,13 +455,13 @@
 						</div>
 					</div>
 					<div class="layui-item query athird">
-						<label class="layui-form-label">公告内容：</label>
+						<label class="layui-form-label">通告内容：</label>
 						<div class="layui-input-block with-icon">
 							<form:input path="content" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
 					</div>
 
-					<!-- 隐藏公告类型 可以重置 -->
+					<!-- 隐藏通告类型 可以重置 -->
 					<div class="layui-item query athird">
 						<div class="layui-input-block with-icon">
 							<input name="type" value="${oaNotify.type}" type="hidden">
@@ -533,18 +533,18 @@
             ,cols: [[
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center',  width:40,title: '序号'}
-				,{field:'title',align:'center', title: '公告标题', minWidth:150,templet:function(d){
-						var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogListView('查看公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','" + d.id + "','95%','95%')\">" +
+				,{field:'title',align:'center', title: '通告标题', minWidth:150,templet:function(d){
+						var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogListView('查看通告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','" + d.id + "','95%','95%')\">" +
 								"<span title=" + d.title + ">" + d.title + "</span></a>";
 						return xml;
 					}}
-                ,{field:'referenceNumber',align:'center', title: '公告文号', minWidth:150/*,templet:function(d){
-                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','95%','95%')\">" +
+                ,{field:'referenceNumber',align:'center', title: '通告文号', minWidth:150/*,templet:function(d){
+                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看通告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','95%','95%')\">" +
                         "<span title=" + d.number + ">" + d.number + "</span></a>";
                     return xml;
                 }*/}
-                ,{field:'type',align:'center', title: '公告类型', width:80}
-                ,{field:'content',align:'center', title: '公告内容', minWidth:200,templet:function(d){
+                ,{field:'type',align:'center', title: '通告类型', width:80}
+                ,{field:'content',align:'center', title: '通告内容', minWidth:200,templet:function(d){
                     return "<span title='"+ d.content +"'>" + d.content + "</span>";
                 }}
                 ,{field:'startDate', align:'center',title: '开始时间',width:150}
@@ -556,7 +556,7 @@
                 ,{field:'tmdcreateDate', align:'center',title: '创建时间',width:150,templet:function(d){
 						return "<span title='"+ d.createDate +"'>" + d.tmdcreateDate + "</span>";
 					}}
-                ,{align:'center', title: '公告状态',  width:70,templet:function(d){
+                ,{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>";
                         return xml;
@@ -567,25 +567,25 @@
                         var xml = "<div class=\"layui-btn-group\">";
 						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
 						{
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('公告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('通告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
                         if(d.canedit != undefined && d.canedit == "1")
-                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialog('修改公告', '${ctx}/oa/oaNotify/form?id="+ d.id +"','95%', '95%')\"   class=\"layui-btn layui-btn-xs  layui-bg-green\"> 修改</a>";
+                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialog('修改通告', '${ctx}/oa/oaNotify/form?id="+ d.id +"','95%', '95%')\"   class=\"layui-btn layui-btn-xs  layui-bg-green\"> 修改</a>";
                         if(d.flagAdmin != undefined && d.flagAdmin == "1")
-                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogAdmin('修改公告', '${ctx}/oa/oaNotify/adminForm?id="+ d.id +"','95%', '95%')\"   class=\"layui-btn layui-btn-xs layui-bg-green\"> 修改</a>";
+                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogAdmin('修改通告', '${ctx}/oa/oaNotify/adminForm?id="+ d.id +"','95%', '95%')\"   class=\"layui-btn layui-btn-xs layui-bg-green\"> 修改</a>";
                         if(d.candel != undefined && d.candel == "1")
-                            xml += "<a href=\"${ctx}/oa/oaNotify/delete?id="+ d.id +"\" onclick=\"return confirmx('确认要关闭该公告吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 关闭</a>";
+                            xml += "<a href=\"${ctx}/oa/oaNotify/delete?id="+ d.id +"\" onclick=\"return confirmx('确认要关闭该通告吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 关闭</a>";
                         if(d.canmodify != undefined && d.canmodify =="1"){
-                            xml+="<a href=\"#\" onclick=\"openDialogreModify('修改公告', '${ctx}/oa/oaNotify/modify?id=" + d.id + "','" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogreModify('修改通告', '${ctx}/oa/oaNotify/modify?id=" + d.id + "','" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1"){
-                            xml+="<a href=\"${ctx}/oa/oaNotify/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该公告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
+                            xml+="<a href=\"${ctx}/oa/oaNotify/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该通告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1"){
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改通告', '${ctx}/oa/oaNotify/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.candelete != undefined && d.candelete == "1"){
-                            xml +="<a href=\"${ctx}/oa/oaNotify/logicDelete?id=" + d.id+"\" onclick=\"return confirmx('确认要删除该公告吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
+                            xml +="<a href=\"${ctx}/oa/oaNotify/logicDelete?id=" + d.id+"\" onclick=\"return confirmx('确认要删除该通告吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                         }
                         xml+="</div>"
                             return xml;

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

@@ -84,8 +84,8 @@
 		<div class="full-width fl">
 			<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 				<ul class="list-tabs" >
-					<li class="active"><a href="${ctx}/oa/oaNotify/self">未过期公告</a></li>
-					<li><a href="${ctx}/oa/oaNotify/readSelf">过期公告</a></li>
+					<li class="active"><a href="${ctx}/oa/oaNotify/self">未过期通告</a></li>
+					<li><a href="${ctx}/oa/oaNotify/readSelf">过期通告</a></li>
 				</ul>
 			</div>
 			<div class="contentShadow layui-row" id="queryDiv">
@@ -127,7 +127,7 @@
 				</div>
 				<div id="moresees" style="clear:both;display:none;">
 					<div class="layui-item query athird">
-						<label class="layui-form-label">公告编号：</label>
+						<label class="layui-form-label">通告编号：</label>
 						<div class="layui-input-block with-icon">
 							<form:input path="number" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
@@ -145,7 +145,7 @@
 						</div>
 					</div>
 					<div class="layui-item query athird">
-						<label class="layui-form-label">公告内容：</label>
+						<label class="layui-form-label">通告内容：</label>
 						<div class="layui-input-block with-icon">
 							<form:input path="content" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
@@ -196,21 +196,21 @@
             ,cols: [[
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center',  width:40,title: '序号'}
-                ,{field:'number',align:'center', title: '公告编号', minWidth:150,templet:function(d){
-                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openView('查看公告', '${ctx}/oa/oaNotify/homeView?id=" + d.id + "&view=view','95%','95%')\">" +
+                ,{field:'number',align:'center', title: '通告编号', minWidth:150,templet:function(d){
+                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openView('查看通告', '${ctx}/oa/oaNotify/homeView?id=" + d.id + "&view=view','95%','95%')\">" +
                         "<span title=" + d.number + ">" + d.number + "</span></a>";
                     return xml;
                 }}
-                ,{field:'title',align:'center', title: '公告标题', minWidth:150/*,templet:function(d){
-                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openView('查看公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','95%','95%')\">" +
+                ,{field:'title',align:'center', title: '通告标题', minWidth:150/*,templet:function(d){
+                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openView('查看通告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','95%','95%')\">" +
                         "<span title=" + d.title + ">" + d.title + "</span></a>";
                     return xml;
                 }*/}
-                ,{field:'type',align:'center', title: '公告类型', width:80}
-                ,{field:'content',align:'center', title: '公告内容', minWidth:200,templet:function(d){
+                ,{field:'type',align:'center', title: '通告类型', width:80}
+                ,{field:'content',align:'center', title: '通告内容', minWidth:200,templet:function(d){
                     return "<span title='"+ d.content +"'>" + d.content + "</span>";
                 }}
-                /*,{field:'status',align:'center', title: '公告状态', width:80}*/
+                /*,{field:'status',align:'center', title: '通告状态', width:80}*/
                 ,{field:'startDate', align:'center',title: '开始时间',width:150}
                 ,{field:'endDate', align:'center',title: '结束时间',width:150}
                 /*,{field:'vtatus', align:'center',title: '查阅状态', width:80}*/

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

@@ -54,8 +54,8 @@
 		<div class="full-width fl">
 			<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 				<ul class="list-tabs" >
-					<li><a href="${ctx}/oa/oaNotify/self">未过期公告</a></li>
-					<li class="active"><a href="${ctx}/oa/oaNotify/readSelf">过期公告</a></li>
+					<li><a href="${ctx}/oa/oaNotify/self">未过期通告</a></li>
+					<li class="active"><a href="${ctx}/oa/oaNotify/readSelf">过期通告</a></li>
 				</ul>
 			</div>
 			<div class="contentShadow layui-row" id="queryDiv">
@@ -97,7 +97,7 @@
 				</div>
 				<div id="moresees" style="clear:both;display:none;">
 					<div class="layui-item query athird">
-						<label class="layui-form-label">公告编号：</label>
+						<label class="layui-form-label">通告编号：</label>
 						<div class="layui-input-block with-icon">
 							<form:input path="number" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
@@ -116,7 +116,7 @@
 						</div>
 					</div>
 					<div class="layui-item query athird">
-						<label class="layui-form-label">公告内容：</label>
+						<label class="layui-form-label">通告内容：</label>
 						<div class="layui-input-block with-icon">
 							<form:input path="content" htmlEscape="false" maxlength="200"  class=" form-control layui-input"/>
 						</div>
@@ -167,21 +167,21 @@
             ,cols: [[
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center',  width:40,title: '序号'}
-                ,{field:'number',align:'center', title: '公告编号', minWidth:150,templet:function(d){
-                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看公告', '${ctx}/oa/oaNotify/view?id=" + d.id + "&view=view','95%','95%')\">" +
+                ,{field:'number',align:'center', title: '通告编号', minWidth:150,templet:function(d){
+                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看通告', '${ctx}/oa/oaNotify/view?id=" + d.id + "&view=view','95%','95%')\">" +
                         "<span title=" + d.number + ">" + d.number + "</span></a>";
                     return xml;
                 }}
-                ,{field:'title',align:'center', title: '公告标题', minWidth:150/*,templet:function(d){
-                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','95%','95%')\">" +
+                ,{field:'title',align:'center', title: '通告标题', minWidth:150/*,templet:function(d){
+                    var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看通告', '${ctx}/oa/oaNotify/form?id=" + d.id + "&view=view','95%','95%')\">" +
                         "<span title=" + d.title + ">" + d.title + "</span></a>";
                     return xml;
                 }*/}
-                ,{field:'type',align:'center', title: '公告类型', width:80}
-                ,{field:'content',align:'center', title: '公告内容', minWidth:200,templet:function(d){
+                ,{field:'type',align:'center', title: '通告类型', width:80}
+                ,{field:'content',align:'center', title: '通告内容', minWidth:200,templet:function(d){
                     return "<span title='"+ d.content +"'>" + d.content + "</span>";
                 }}
-                /*,{field:'status',align:'center', title: '公告状态', width:80}*/
+                /*,{field:'status',align:'center', title: '通告状态', width:80}*/
                 ,{field:'startDate', align:'center',title: '开始时间',width:150}
                 ,{field:'endDate', align:'center',title: '结束时间',width:150}
                 /*,{field:'vtatus', align:'center',title: '查阅状态', width:80}*/

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

@@ -21,7 +21,7 @@
             }
             $("#content").val(content);
             if(content == null || content == undefined || content == "" || content == "\n"){
-                parent.layer.msg('公告内容不能为空',{icon:5});
+                parent.layer.msg('通告内容不能为空',{icon:5});
                 return false;
             }
             var startDate = new Date($("#startDate").val());
@@ -170,9 +170,9 @@
             <form:hidden id="flag" path="act.flag"/>
             <div class="form-group layui-row first">
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>公告状态</h2></div>
+                    <div class="form-group-label"><h2>通告状态</h2></div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">公告状态：</label>
+                        <label class="layui-form-label">通告状态：</label>
                         <div class="layui-input-block">
                             <input type="radio" title="短期" lay-filter="ext" checked name="ext" id="ext" value="0" disabled>
                             <input type="radio" title="长期" lay-filter="ext" name="ext" id="ext1" value="1" disabled>
@@ -183,9 +183,9 @@
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>通告信息</h2></div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>公告标题：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>通告标题：</label>
                     <div class="layui-input-block">
-                        <form:input path="title" htmlEscape="false" maxlength="30" placeholder="请输入公告标题" class="form-control required layui-input"/>
+                        <form:input path="title" htmlEscape="false" maxlength="30" placeholder="请输入通告标题" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -195,7 +195,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>公告类型：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>通告类型：</label>
                     <div class="layui-input-block readOnlyFFF">
                         <form:select path="type" class="form-control required simple-select">
                             <form:options items="${fns:getMainDictList('oa_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
@@ -240,7 +240,7 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>公告范围-部门</h2></div>
+                <div class="form-group-label"><h2>通告范围-部门</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:treeselectoffices id="offices" name="" value="" labelName="memberNameStr" labelValue=""
                                            retnParent="true" checked="true" notAllowSelectParent="true" title="部门" url="/sys/office/treeData?type=2"  cssClass="form-control required" allowClear="true"/>
@@ -271,7 +271,7 @@
                 </script>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>公告范围-成员</h2></div>
+                <div class="form-group-label"><h2>通告范围-成员</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:treeselectusers id="users" name="" value="" labelName="memberNameStr" labelValue=""
                                          retnParent="true" title="用户" url="/sys/office/treeData?type=3" checked="true" cssClass="form-control required" allowClear="true" notAllowSelectParent="true"/>

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

@@ -97,9 +97,9 @@
         <sys:message content="${message}"/>
 
         <div class="form-group layui-row first">
-            <div class="form-group-label"><h2>公告信息</h2></div>
+            <div class="form-group-label"><h2>通告信息</h2></div>
             <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label">公告标题：</label>
+                <label class="layui-form-label">通告标题：</label>
                 <div class="layui-input-block">
                     <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" maxlength="30" class="form-control required layui-input"
                            value="${oaNotify.title}"/>
@@ -113,7 +113,7 @@
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
-                <label class="layui-form-label">公告类型：</label>
+                <label class="layui-form-label">通告类型：</label>
                 <div class="layui-input-block">
                     <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" maxlength="30" class="form-control required layui-input"
                            value="${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}"/>
@@ -174,7 +174,7 @@
 
             <c:if test="${oaNotify.createBy.id eq fns:getUser().id}">
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>公告范围-部门</h2></div>
+                    <div class="form-group-label"><h2>通告范围-部门</h2></div>
                     <table id="officeTable" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
@@ -193,7 +193,7 @@
                     </script>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>公告范围-成员</h2></div>
+                    <div class="form-group-label"><h2>通告范围-成员</h2></div>
                     <table id="userTable" class="table table-bordered table-condensed details">
                         <thead>
                         <tr>
@@ -271,7 +271,7 @@
             </c:if>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>公告附件</h2></div>
+                <div class="form-group-label"><h2>通告附件</h2></div>
                 <div class="layui-item layui-col-xs12" style="padding:0 16px;">
                     <table id="upTable" class="table table-bordered table-condensed details">
                         <thead>
@@ -424,8 +424,8 @@
                     </table>
                 </div>
             </div>
-            <!--在“我的公告”中只能查看到个人接收的，只改变未读状态为已读，不显示所有的查看状态;
-            在“公告管理”中只有管理员权限才能查看，显示该条公告的所有查看状态；
+            <!--在“我的通告”中只能查看到个人接收的，只改变未读状态为已读，不显示所有的查看状态;
+            在“通告管理”中只有管理员权限才能查看，显示该条通告的所有查看状态；
             -->
                 <%-- <c:choose>
                      <c:when test="${toReadMyNotify}">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -1095,9 +1095,10 @@
                     ,"recodeNum":"${projectRecords.recodeNum}"
 					,"projectReportNumber":"${projectRecords.projectReportNumber}"
                     ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
-                    ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
+					<%--,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"--%>
+                    ,"projMaster":"${projectRecords.leaderNameStr}"
                     ,"contract":"${projectRecords.workContractInfo.name}"
-					,"contractId":"${projectRecords.workContractInfo.id}"
+                    ,"contractId":"${projectRecords.workContractInfo.id}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"createName":"${projectRecords.createBy.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
@@ -1106,64 +1107,64 @@
                     ,"defectRecordStatus":"${projectRecords.defectRecordStatus}"
                     ,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"
                     ,"prrProcessInstanceId":"${projectRecords.prrProcessInstanceId}"
-					,"reportedProcessInstanceId":"${projectRecords.reportedProcessInstanceId}"
+                    ,"reportedProcessInstanceId":"${projectRecords.reportedProcessInstanceId}"
                     ,"prrId":"${projectRecords.prrId}"
                     ,"procId":"${projectRecords.processInstanceId}"
-					,"projectReportName":"${projectRecords.projectReportName}"
-					,"reportedState":"${projectRecords.reportedState}"
-					,"view":"${projectRecords.view}"
-					,"reportStatus":"${projectRecords.reportStatus}"
-					,"syncStatus":"${projectRecords.syncStatus}"
-					,"downProjectReportRecordStatus":"${projectRecords.downProjectReportRecordStatus}"
-					,"prrdProcessInstanceId":"${projectRecords.filingProcessinstanceId}"
-					,"prrdId":"${projectRecords.prrdId}"
-					,"emergencyProject":"${projectRecords.emergencyProject}"
-					,"bid":"${projectRecords.prdId}"
-					,"pmdrProcessInstanceId":"${projectRecords.pmdrProcessInstanceId}"
-					,"pmdrId":"${projectRecords.pmdrId}"
-					,"prdtProcessinstanceId":"${projectRecords.prdtProcessinstanceId}"
-					,"reportAuditNotifyFlag":"${projectRecords.reportAuditNotifyFlag}"
+                    ,"projectReportName":"${projectRecords.projectReportName}"
+                    ,"reportedState":"${projectRecords.reportedState}"
+                    ,"view":"${projectRecords.view}"
+                    ,"reportStatus":"${projectRecords.reportStatus}"
+                    ,"syncStatus":"${projectRecords.syncStatus}"
+                    ,"downProjectReportRecordStatus":"${projectRecords.downProjectReportRecordStatus}"
+                    ,"prrdProcessInstanceId":"${projectRecords.filingProcessinstanceId}"
+                    ,"prrdId":"${projectRecords.prrdId}"
+                    ,"emergencyProject":"${projectRecords.emergencyProject}"
+                    ,"bid":"${projectRecords.prdId}"
+                    ,"pmdrProcessInstanceId":"${projectRecords.pmdrProcessInstanceId}"
+                    ,"pmdrId":"${projectRecords.pmdrId}"
+                    ,"prdtProcessinstanceId":"${projectRecords.prdtProcessinstanceId}"
+                    ,"reportAuditNotifyFlag":"${projectRecords.reportAuditNotifyFlag}"
 
-					,"recordAuditNotifyFlag":"${projectRecords.recordAuditNotifyFlag}"
-					,"reportedAuditNotifyFlag":"${projectRecords.reportedAuditNotifyFlag}"
-					,"newReportAuditNotifyFlag":"${projectRecords.newReportAuditNotifyFlag}"
-					,"newRecordAuditNotifyFlag":"${projectRecords.newRecordAuditNotifyFlag}"
-					,"paperProjectNotifyId":"${projectRecords.paperProjectNotifyId}"
-					,"paperProjectAuditNotifyFlag":"${projectRecords.paperProjectAuditNotifyFlag}"
-					,"reportNotifyId":"${projectRecords.reportNotifyId}"
-					,"paperFilingStatus":"${projectRecords.paperFilingStatus}"
-					,"ppfId":"${projectRecords.ppfId}"
-					,"ppfProcessInstanceId":"${projectRecords.ppfProcessInstanceId}"
-					,"submitMoney":"${projectRecords.submitMoney}"
-					,"money":"${projectRecords.money}"
-					,"caseProcessId":"${projectRecords.caseProcessId}"
-					,"caseType":"${projectRecords.caseType}"
-					,"caseCreateBy":"${projectRecords.caseCreateBy}"
-					,"caseStatus":"${projectRecords.caseStatus}"
-					,"falg":
-					<c:choose>
-						<c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">
-								"1"
-						</c:when>
-						<c:otherwise>
-						"0"
-						</c:otherwise>
-					</c:choose>
-					,"submitMoneyStr":
-					<c:choose>
-						<c:when test="${'2'==projectRecords.submitMoney}">
-							"A级"
-						</c:when>
-						<c:otherwise>
-							"B级"
-							<%--<c:choose>
-								<c:when test="${'1'==projectRecords.emergencyProject}">
-									"B级紧急"
-								</c:when>
-								<c:otherwise>
-									"B级非紧急"
-								</c:otherwise>
-							</c:choose>--%>
+                    ,"recordAuditNotifyFlag":"${projectRecords.recordAuditNotifyFlag}"
+                    ,"reportedAuditNotifyFlag":"${projectRecords.reportedAuditNotifyFlag}"
+                    ,"newReportAuditNotifyFlag":"${projectRecords.newReportAuditNotifyFlag}"
+                    ,"newRecordAuditNotifyFlag":"${projectRecords.newRecordAuditNotifyFlag}"
+                    ,"paperProjectNotifyId":"${projectRecords.paperProjectNotifyId}"
+                    ,"paperProjectAuditNotifyFlag":"${projectRecords.paperProjectAuditNotifyFlag}"
+                    ,"reportNotifyId":"${projectRecords.reportNotifyId}"
+                    ,"paperFilingStatus":"${projectRecords.paperFilingStatus}"
+                    ,"ppfId":"${projectRecords.ppfId}"
+                    ,"ppfProcessInstanceId":"${projectRecords.ppfProcessInstanceId}"
+                    ,"submitMoney":"${projectRecords.submitMoney}"
+                    ,"money":"${projectRecords.money}"
+                    ,"caseProcessId":"${projectRecords.caseProcessId}"
+                    ,"caseType":"${projectRecords.caseType}"
+                    ,"caseCreateBy":"${projectRecords.caseCreateBy}"
+                    ,"caseStatus":"${projectRecords.caseStatus}"
+                    ,"falg":
+                    <c:choose>
+                        <c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">
+                                "1"
+                        </c:when>
+                        <c:otherwise>
+                        "0"
+                        </c:otherwise>
+                    </c:choose>
+                    ,"submitMoneyStr":
+                    <c:choose>
+                        <c:when test="${'2'==projectRecords.submitMoney}">
+                            "A级"
+                        </c:when>
+                        <c:otherwise>
+                            "B级"
+                            <%--<c:choose>
+                                <c:when test="${'1'==projectRecords.emergencyProject}">
+                                    "B级紧急"
+                                </c:when>
+                                <c:otherwise>
+                                    "B级非紧急"
+                                </c:otherwise>
+                            </c:choose>--%>
 						</c:otherwise>
 					</c:choose>
                 }