所有审核通过通知内容修改

src/main/java/com/jeeplus/modules/oa/service/OaNotifyService.java

@@ -957,6 +957,13 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
             List<User> userList = new ArrayList<>();
             if (!state) {
                 users.add(oaNotify.getCreateBy());
+                title = "公告【"+ oaNotify.getTitle() + "】申请审批通过";
+                //判断文号是否有值
+                if(StringUtils.isNotBlank(oaNotify.getReferenceNumber())){
+                    str = "公告【"+ oaNotify.getTitle() + "】申请审批通过，公告文号：" + oaNotify.getReferenceNumber();
+                }else {
+                    str = "公告【"+ oaNotify.getTitle() + "】申请审批通过";
+                }
                 if ("yes".equals(oaNotify.getAct().getFlag())) {
                     oaNotify.setStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
                     WorkProjectNotify notify = new WorkProjectNotify();
@@ -1263,6 +1270,13 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
             List<User> userList = new ArrayList<>();
             if (!state) {
                 users.add(oaNotify.getCreateBy());
+                title = "公告【"+ oaNotify.getTitle() + "】申请审批通过";
+                //判断文号是否有值
+                if(StringUtils.isNotBlank(oaNotify.getReferenceNumber())){
+                    str = "公告【"+ oaNotify.getTitle() + "】申请审批通过，公告文号：" + oaNotify.getReferenceNumber();
+                }else {
+                    str = "公告【"+ oaNotify.getTitle() + "】申请审批通过";
+                }
                 if ("yes".equals(oaNotify.getAct().getFlag())) {
                     oaNotify.setStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
                     WorkProjectNotify notify = new WorkProjectNotify();

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectClaimController.java

@@ -28,6 +28,7 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -108,6 +109,11 @@ public class ProjectClaimController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectDesignController.java

@@ -30,6 +30,7 @@ import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workcontent.entity.WorkContentCtrlprice;
 import com.jeeplus.modules.workcontent.entity.WorkScheduleInfo;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -275,6 +276,11 @@ public class ProjectDesignController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectVisaController.java

@@ -289,6 +289,11 @@ public class ProjectVisaController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         //获取已审核通过项目集合
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportRecordService.java

@@ -13,7 +13,9 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportRecordDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.dao.WorkattachmentDao;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -75,6 +77,8 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 	@Autowired
 	private RuralProjectMessageService ruralProjectMessageService;
 	@Autowired
+	private RuralProjectRecordsService ruralProjectRecordsService;
+	@Autowired
 	ProjectReportRecordDao projectReportRecordDao;
 	public ProjectReportRecord get(String id) {
 		ProjectReportRecord projectReportRecord= super.get(id);
@@ -207,7 +211,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 						projectReportRecord.getCompanyId(),
 						title,
 						str,
-						"151",
+						"51",
 						"0",
 						"待审批",
 						""
@@ -272,7 +276,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			Map<String,Object> extras = new HashMap<>();
 			extras.put("type","7001");
 			extras.put("id",workProjectNotify.getId());
-			extras.put("procDefKey","151");
+			extras.put("procDefKey","51");
 			UserUtils.pushInfoToApp(title,str,extras,u.getId());
 			UserUtils.pushIm(u.getId(),str);
 
@@ -529,6 +533,11 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		List<User> userList = new ArrayList<>();
 		if (!state) {
 //            str = "yes".equals(flag)?"您的报销单审核：已通过":"您的报销单审核：未通过";
+			//获取项目信息
+			RuralProjectRecords record = ruralProjectRecordsService.get(reportRecord.getReport().getProject().getId());
+
+			String titleStr = "项目【"+ record.getProjectName()+"】归档完成";
+			String content = "项目【"+ record.getProjectName()+"】归档完成,案卷号：" + projectReportRecord.getFileNum();
 			users.add(projectReportRecord.getCreateBy());
 			if ("yes".equals(flag)) {
 				ProjectReportData projectReportData =projectReportRecord.getReport();
@@ -544,9 +553,9 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 								.saveNotify(projectReportRecord.getId(),
 										projectReportRecord.getCreateBy(),
 										projectReportRecord.getCompanyId(),
-										title,
-										str2,
-										"151",
+										titleStr,
+										content,
+										"51",
 										"0",
 										"待通知",
 										notifyRole));
@@ -564,7 +573,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 											projectReportRecord.getCompanyId(),
 											title,
 											str,
-											"151",
+											"51",
 											"0",
 											"待通知",
 											notifyRole));
@@ -582,7 +591,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 								projectReportRecord.getCompanyId(),
 								title,
 								str,
-								"151",
+								"51",
 								"0",
 								"待审批",
 								notifyRole);
@@ -615,7 +624,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 											projectReportRecord.getCompanyId(),
 											title,
 											str,
-											"151",
+											"51",
 											"0",
 											"重新申请",
 											notifyRole));
@@ -631,7 +640,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 										projectReportRecord.getCompanyId(),
 										title,
 										str,
-										"151",
+										"51",
 										"0",
 										"待审批",
 										notifyRole);
@@ -655,7 +664,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 												projectReportRecord.getCompanyId(),
 												title,
 												str,
-												"151",
+												"51",
 												"0",
 												"重新申请",
 												notifyRole));

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

@@ -601,6 +601,8 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
         if(!state) {
             users.add(projectFollowReport.getCreateBy());
             if ("yes".equals(projectFollowReport.getAct().getFlag())) {
+                titleStr = "全过程项目【"+ projectFollowReport.getProject().getProjectName()+"】咨询成果审批通过";
+                notifyStr = "全过程项目【"+ projectFollowReport.getProject().getProjectName()+"】咨询成果审批通过，跟踪咨询名称：" + projectFollowReport.getProjectFollowName();
                 projectFollowReport.setStatus(ProjectStatusEnum.SIGNED.getValue());
                 WorkProjectNotify notify = new WorkProjectNotify();
                 notify.setNotifyId(projectFollowReport.getId());

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

@@ -83,8 +83,8 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
             }
         }
         //向接收人发起通知操作
-        String notifyStr = "项目编号："+projectRecords.getProjectId()+"，项目名称："+ projectRecords.getProjectName();
-        String titleStr = "项目名称："+ projectRecords.getProjectName();
+        String notifyStr = "项目【"+projectRecords.getProjectName()+"】项目计划制定完成";
+        String titleStr = "项目【"+projectRecords.getProjectName()+"】项目计划制定完成";
         //Set转List
         List<String> masterIdList = new ArrayList<>(masterIdSet);
         List<User> userList = new ArrayList<>();

src/main/java/com/jeeplus/modules/projectrecord/web/armorForMaterials/ArmorForMaterialsController.java

@@ -24,6 +24,7 @@ import com.jeeplus.modules.projectrecord.service.ProjectImplementEarlyService;
 import com.jeeplus.modules.projectrecord.service.armorForMaterials.ArmorForMaterialsService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -92,6 +93,11 @@ public class ArmorForMaterialsController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         //获取项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
@@ -115,6 +121,11 @@ public class ArmorForMaterialsController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();

src/main/java/com/jeeplus/modules/projectrecord/web/check/ChechDesignController.java

@@ -26,6 +26,7 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -259,6 +260,11 @@ public class ChechDesignController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckClaimController.java

@@ -24,6 +24,7 @@ import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -107,6 +108,11 @@ public class CheckClaimController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckDistributionSettlementController.java

@@ -24,6 +24,7 @@ import com.jeeplus.modules.projectrecord.service.ProjectImplementEarlyService;
 import com.jeeplus.modules.projectrecord.service.distributionSettlement.DistributionSettlementService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -91,6 +92,11 @@ public class CheckDistributionSettlementController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         //查询项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
@@ -117,6 +123,11 @@ public class CheckDistributionSettlementController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckInterimPaymentController.java

@@ -27,6 +27,7 @@ import com.jeeplus.modules.projectrecord.service.implementStage.ProjectInterimPa
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.DictService;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -112,6 +113,11 @@ public class CheckInterimPaymentController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckVisaController.java

@@ -27,6 +27,7 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -274,6 +275,11 @@ public class CheckVisaController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();

src/main/java/com/jeeplus/modules/projectrecord/web/concealProject/ConcealProjectController.java

@@ -24,6 +24,7 @@ import com.jeeplus.modules.projectrecord.service.ProjectImplementEarlyService;
 import com.jeeplus.modules.projectrecord.service.concealProject.ConcealProjectService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -89,6 +90,11 @@ public class ConcealProjectController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         //查询已审核通过的项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
@@ -112,6 +118,11 @@ public class ConcealProjectController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         //查询已审核通过的项目信息
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息

src/main/java/com/jeeplus/modules/projectrecord/web/contractMaterial/MaterialController.java

@@ -23,6 +23,7 @@ import com.jeeplus.modules.projectrecord.service.material.MaterialService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -89,6 +90,11 @@ public class MaterialController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         //查询已审核通过 的项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
@@ -112,6 +118,11 @@ public class MaterialController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();

src/main/java/com/jeeplus/modules/projectrecord/web/distributionSettlement/DistributionSettlementController.java

@@ -25,6 +25,7 @@ import com.jeeplus.modules.projectrecord.service.armorForMaterials.ArmorForMater
 import com.jeeplus.modules.projectrecord.service.distributionSettlement.DistributionSettlementService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -93,6 +94,11 @@ public class DistributionSettlementController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         //获取已审核通过项目信息
         Page<ProjectImplementEarly> page = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         model.addAttribute("page", page);
@@ -116,6 +122,11 @@ public class DistributionSettlementController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息
         List<ProjectImplementEarly> recordList = recordPage.getList();

src/main/java/com/jeeplus/modules/projectrecord/web/implementStage/ProjectInterimPaymentController.java

@@ -19,6 +19,7 @@ import com.jeeplus.modules.projectrecord.service.ProjectImplementEarlyService;
 import com.jeeplus.modules.projectrecord.service.implementStage.ProjectInterimPaymentService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -83,6 +84,11 @@ public class ProjectInterimPaymentController extends BaseController {
         if(StringUtils.isNotBlank(constructionContract.getProjectName())){
             projectRecords.setProjectName(constructionContract.getProjectName());
         }
+        if(StringUtils.isNotBlank(constructionContract.getContractName())){
+            WorkContractInfo workContractInfo = new WorkContractInfo();
+            workContractInfo.setName(constructionContract.getContractName());
+            projectRecords.setWorkContractInfo(workContractInfo);
+        }
         //获取审核通过的项目信息
         Page<ProjectImplementEarly> recordPage = projectImplementEarlyService.findProjectPage(new Page<ProjectImplementEarly>(request, response), projectRecords);
         //获取项目信息

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

@@ -553,6 +553,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 //            str = "yes".equals(flag)?"您的报销单审核：已通过":"您的报销单审核：未通过";
             users.add(projectReportData.getCreateBy());
             if ("yes".equals(flag)) {
+                String titleStr = "项目【"+projectRecords.getProjectName()+"】报告审批通过";
+                String content = "项目【"+projectRecords.getProjectName()+"】报告审批通过，报告号：" + projectReportData.getNumber();
                 str =  "报告名称:"+projectReportData.getName()+",工作内容类型:"+ WorkContentTypeController.getContentTypeName(projectReportData.getType(),"")+",项目所属部门:"+recordsOffice.getName();
                 projectReportData.setStatus("5");
                 WorkProjectNotify notify = new WorkProjectNotify();
@@ -563,8 +565,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                                 .saveNotify(projectReportData.getId(),
                                         projectReportData.getCreateBy(),
                                         projectReportData.getCompanyId(),
-                                        title,
-                                        str,
+                                        titleStr,
+                                        content,
                                         "92",
                                         "0",
                                         "待通知",
@@ -2025,11 +2027,11 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                         if ("yes".equals(reported.getAct().getFlag())) {
                             notifyRole = "审批通过";
                             workActivityProcess.setIsApproval("1");
-                            /*//处理上报数据
+                            //处理上报数据
                             Map<String,String> map  = RuralProjectReportedUtil.reportedDataManage(reported);
                             String mapStr = MapToXmlUtil.getMapToXML(map);
                             //进行上报
-                            String client = RuralProjectReportedUtil.client(mapStr);
+                            /*String client = RuralProjectReportedUtil.client(mapStr);
                             if(!"Success".equals(client)){
                                 return "上报失败！";
                             }*/
@@ -2080,6 +2082,9 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     }else{
                         records.setReportedState(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
                     }
+                    ProjectRecords projectRecords = projectRecordsService.getRuralMasters(reported.getProjectId());
+                    String titleStr = "项目【"+projectRecords.getProjectName()+"】上报完成";
+                    String content = "项目【"+projectRecords.getProjectName()+"】上报完成，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(reported.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);
@@ -2088,8 +2093,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                                     .saveNotify(reported.getId(),
                                             reported.getCreateBy(),
                                             reported.getCompany().getId(),
-                                            title,
-                                            str,
+                                            titleStr,
+                                            content,
                                             "95",
                                             "0",
                                             "待通知",

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

@@ -836,6 +836,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		List<User> userList = new ArrayList<>();
 		if(!state) {
 			users.add(projectRecords.getCreateBy());
+			//审核完成提示框
+			String title = "项目【"+projectRecords.getProjectName()+"】登记完成";
+			String content = "项目【"+projectRecords.getProjectName()+"】登记完成，项目编号："+projectRecords.getProjectId();
 			if ("yes".equals(projectRecords.getAct().getFlag())) {
 				projectRecords.setProjectStatus(ProjectStatusEnum.SIGNED.getValue());
 				WorkProjectNotify notify = new WorkProjectNotify();
@@ -847,8 +850,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 								.saveNotify(projectRecords.getId(),
 										projectRecords.getCreateBy(),
 										projectRecords.getCompany().getId(),
-										titleStr,
-										notifyStr,
+										title,
+										content,
 										"39",
 										"0",
 										"待通知",
@@ -1354,8 +1357,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		//获取项目数据（提前三天进行通知 即 获取即将超期的数据）
 		List<RuralProjectRecords> projectRecordsList = dao.getProjectReportedListByAdvent(projectRecords);
 		for (RuralProjectRecords info: projectRecordsList) {
-			String notifyStr = "项目编号："+info.getProjectId()+"，项目名称："+ info.getProjectName();
-			String titleStr = "项目名称："+ info.getProjectName()+"上报即将超期。超期时间为："+info.getAdventDate();
+			String notifyStr = "项目【"+ info.getProjectName()+"】即将上报超期";
+			String titleStr = "项目【"+ info.getProjectName()+"】即将上报超期。超期时间："+info.getAdventDate();
 			List<User> projectLeaders = workProjectUserDao.queryProjectUsers(info.getId(), "1");
 			for (User user: projectLeaders) {
 				workProjectNotifyService

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractBorrowService.java

@@ -39,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -434,8 +435,10 @@ public class WorkContractBorrowService extends CrudService<WorkContractBorrowDao
 			List<User> users = new ArrayList<>();
 			List<User> userList = new ArrayList<>();
 			if (!state) {
-				str =  "主委托方："+workCntractBorrow.getWorkContractInfo().getClient().getName();
-				title = "合同名称:"+workCntractBorrow.getWorkContractInfo().getName();
+				SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+				String aboutGiveDateStr = formatter.format(workCntractBorrow.getAboutGiveDate());
+				str =  "合同【"+workCntractBorrow.getWorkContractInfo().getName() + "】借用成功，约定归还日期：" + aboutGiveDateStr;
+				title = "合同【"+workCntractBorrow.getWorkContractInfo().getName() + "】借用成功";
 				users.add(workCntractBorrow.getCreateBy());
 				if ("yes".equals(workCntractBorrow.getAct().getFlag())) {
 					workCntractBorrow.setStatus("5");

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -1071,6 +1071,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			title = "合同名称:"+workContractInfo.getName();
 			users.add(workContractInfo.getCreateBy());
 			if ("yes".equals(workContractInfo.getAct().getFlag())) {
+				String titleStr = "合同【"+workContractInfo.getName() +"】登记完成";
+				String content = "合同【"+workContractInfo.getName() +"】登记完成,合同编号：" + workContractInfo.getContractNum();
+
 				workContractInfo.setContractState("5");
 				WorkProjectNotify notify = new WorkProjectNotify();
 				notify.setNotifyId(workContractInfo.getId());
@@ -1080,8 +1083,8 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 								.saveNotify(workContractInfo.getId(),
 										workContractInfo.getCreateBy(),
 										workContractInfo.getCompanyId(),
-										title,
-										str,
+										titleStr,
+										content,
 										"16",
 										"0",
 										"待通知",

src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java

@@ -453,8 +453,8 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 			List<User> users = new ArrayList<>();
 			List<User> userList = new ArrayList<>();
 			if (!state) {
-				str =  "归档申请编号："+workContractRecord.getRecordNum()+",主委托方："+workContractRecord.getWorkContractInfo().getClient().getName();
-				title = "合同名称:"+workContractRecord.getWorkContractInfo().getName();
+				str =  "合同【"+workContractRecord.getWorkContractInfo().getName() + "】归档完成，案卷号：" + workContractRecord.getFileNum();
+				title = "合同【"+workContractRecord.getWorkContractInfo().getName() + "】归档完成";
 				users.add(workContractRecord.getCreateBy());
 				if ("yes".equals(workContractRecord.getAct().getFlag())) {
 					workContractRecord.setStatus("5");

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -1089,6 +1089,9 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 				title = "实际开票单位:"+workInvoice.getClient().getName();
 				users.add(workInvoice.getCreateBy());
 				if ("yes".equals(workInvoice.getAct().getFlag())) {
+					ProjectRecords projectRecords = projectRecordsService.getRuralMasters(workInvoice.getProject().getId());
+					title = "项目【"+ projectRecords.getProjectName() +"】发票申请通过";
+					str = "项目【"+ projectRecords.getProjectName() +"】发票申请通过，发票申请编号："+workInvoice.getNumber();
 					workInvoice.setInvoiceState("5");
 					WorkProjectNotify notify = new WorkProjectNotify();
 					notify.setNotifyId(workInvoice.getId());

src/main/java/com/jeeplus/modules/workreimbursement/entity/WorkAccount.java

@@ -42,6 +42,7 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 	private Double evectionNumber;//出差天数
 	private Integer projectRadio;   //是否项目报销(1:项目报销 0：非项目报销)
 	private String reimburseRemarks;   //非项目报销  报销详情
+	private String reimbursementUserId;
 
 
 	public String getInvoiceType() {
@@ -212,4 +213,12 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 	public void setReimburseRemarks(String reimburseRemarks) {
 		this.reimburseRemarks = reimburseRemarks;
 	}
+
+	public String getReimbursementUserId() {
+		return reimbursementUserId;
+	}
+
+	public void setReimbursementUserId(String reimbursementUserId) {
+		this.reimbursementUserId = reimbursementUserId;
+	}
 }

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.workreimbursement.service;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
@@ -904,30 +905,52 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         List<User> users = new ArrayList<>();
         List<User> userList = new ArrayList<>();
         if (!state) {
-            title =  "报销申请编号"+workReimbursement.getNumber()+",报销费用合计："+workReimbursement.getMoney();
+            title =  "报销【" + workReimbursement.getNumber() + "】申请通过";
 //            str = "yes".equals(workReimbursement.getAct().getFlag())?"您的报销单审核：已通过":"您的报销单审核：未通过";
-            if (workReimbursement.getProject()!= null && StringUtils.isNotBlank(workReimbursement.getProject().getId())){
+            /*if (workReimbursement.getProject()!= null && StringUtils.isNotBlank(workReimbursement.getProject().getId())){
                 str =  "报销申请编号:"+workReimbursement.getNumber()+",报销项目:"+workReimbursement.getProject().getProjectName()+",报销费用合计:"+workReimbursement.getMoney();
             }else {
                 str =  "报销申请编号:"+workReimbursement.getNumber()+",非项目报销,报销费用合计:"+workReimbursement.getMoney();
-            }
+            }*/
+            str = "报销【" + workReimbursement.getNumber() + "】申请通过，经办人：" + userName+"，总金额："+workReimbursement.getMoney();
             users.add(workReimbursement.getCreateBy());
             if ("yes".equals(workReimbursement.getAct().getFlag())) {
+
+                Set<String> set = new HashSet();
+                //添加经办人人员id
+                set.add(workReimbursement.getCreateBy().getId());
+                //判断是否含有有效的报销信息
+                if(null != workReimbursement.getWorkAccountList()) {
+                    //添加报销人人员id
+                    for (WorkAccount account : workReimbursement.getWorkAccountList()) {
+                        set.add(account.getReimbursementUserId());
+                    }
+                }
+                //获取通知需要的经办人和报销人人员信息
+                List<User> informUser = Lists.newArrayList();
+                for (String userId: set) {
+                    informUser.add(UserUtils.get(userId));
+                }
+
                 workReimbursement.setStatus("5");
                 WorkProjectNotify notify = new WorkProjectNotify();
                 notify.setNotifyId(workReimbursement.getId());
                 userList = workProjectNotifyService.readByNotifyId(notify);
-                workProjectNotifyService
-                        .save(UtilNotify
-                                .saveNotify(workReimbursement.getId(),
-                                        workReimbursement.getCreateBy(),
-                                        workReimbursement.getCompanyId(),
-                                        title,
-                                        str,
-                                        "13",
-                                        "0",
-                                        "待通知",
-                                        notifyRole));
+                //遍历需要通知的人员信息 进行通知（经办人和报销人员）
+                for (User user: informUser) {
+                    workProjectNotifyService
+                            .save(UtilNotify
+                                    .saveNotify(workReimbursement.getId(),
+                                            user,
+                                            workReimbursement.getCompanyId(),
+                                            title,
+                                            str,
+                                            "13",
+                                            "0",
+                                            "待通知",
+                                            notifyRole));
+                }
+
                 //修改还款
                 if(workReimbursement.getReimbursementBackList()!=null&&workReimbursement.getReimbursementBackList().size()>0){
                     for(WorkReimbursementBack workReimbursementBack:workReimbursement.getReimbursementBackList()){

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

@@ -62,7 +62,8 @@
 		a.report_status as "reportStatus",
 		a.process_instance_id  as "processInstanceId",
 		a.company_id as "company.id",
-		a.office_id as "office.id"
+		a.office_id as "office.id",
+		a.project_id as "projectId"
 	</sql>
 
 	
@@ -145,7 +146,8 @@
 			upload_time,
 			process_instance_id,
 			company_id,
-			office_id
+			office_id,
+			project_id
 		)
 		values
 		  (
@@ -208,7 +210,8 @@
 			now(),
 			#{processInstanceId},
 			#{company.id},
-			#{office.id}
+			#{office.id},
+			#{projectId}
 		  )
 	</insert>
 

src/main/resources/mappings/modules/workreimbursement/WorkAccountDao.xml

@@ -21,7 +21,8 @@
 		a.bills as "bills",
 		a.evection_number as "evectionNumber",
 		a.project_radio as "projectRadio",
-		a.reimburse_remarks as "reimburseRemarks"
+		a.reimburse_remarks as "reimburseRemarks",
+		a.reimbursement_name as "reimbursementUserId"
 	</sql>
 	
 	<sql id="workAccountJoins">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedForm.jsp

@@ -609,8 +609,8 @@
                 <div class="layui-item layui-col-sm6 lw6" id="d1">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="ZiXunHTBH"  value="${ruralProjectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
-                                                labelValue="${ruralProjectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
+                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

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

@@ -631,8 +631,8 @@
                 <div class="layui-item layui-col-sm6 lw6" id="d1">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="ZiXunHTBH"  value="${ruralProjectRecordsReported.ziXunHTBH}"  title="选择合同" labelName="workContractInfo.name"
-                                                labelValue="${ruralProjectRecordsReported.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
+                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

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

@@ -637,8 +637,8 @@
                 <div class="layui-item layui-col-sm6 lw6" id="d1">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="ZiXunHTBH"  value="${ruralProjectRecordsReported.ziXunHTBH}"  title="选择合同" labelName="workContractInfo.name"
-                                                labelValue="${ruralProjectRecordsReported.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
+                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp

@@ -625,8 +625,8 @@
                 <div class="layui-item layui-col-sm6 lw6" id="d1">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="ZiXunHTBH"  value="${ruralProjectRecordsReported.ziXunHTBH}"  title="选择合同" labelName="workContractInfo.name"
-                                                labelValue="${ruralProjectRecordsReported.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
+                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

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

@@ -630,8 +630,8 @@
                 <div class="layui-item layui-col-sm6 lw6" id="d1">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="ZiXunHTBH"  value="${ruralProjectRecordsReported.ziXunHTBH}"  title="选择合同" labelName="workContractInfo.name"
-                                                labelValue="${ruralProjectRecordsReported.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${ruralProjectRecordsReported.workContractInfo.id}"  title="选择合同" labelName="ZiXunHTBH"
+                                                labelValue="${ruralProjectRecordsReported.ziXunHTBH}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedView.jsp

@@ -127,7 +127,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同编号：</label>
                     <div class="layui-input-block">
-                        <input type="text" htmlEscape="false" readonly="true" value="${ruralProjectRecordsReported.workContractInfo.contractNum}" class="form-control layui-input required" style="background-color: #ffffff;">
+                        <input type="text" htmlEscape="false" readonly="true" value="${ruralProjectRecordsReported.ziXunHTBH}" class="form-control layui-input required" style="background-color: #ffffff;">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyBacklogListByMine.jsp

@@ -399,7 +399,7 @@
 						<div class="layui-input-block">
 							<form:select id="type" path="type" class="form-control simple-select">
 								<form:option value="" label=""/>
-								<form:options items="${fns:getDictList('new_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								<form:options items="${fns:getDictList('agenda_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 							</form:select>
 						</div>
 					</div>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -400,7 +400,7 @@
 						<div class="layui-input-block">
 							<form:select id="type" path="type" class="form-control simple-select">
 								<form:option value="" label=""/>
-								<form:options items="${fns:getDictList('new_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								<form:options items="${fns:getDictList('agenda_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 							</form:select>
 						</div>
 					</div>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyReadBacklogList.jsp

@@ -399,7 +399,7 @@
 						<div class="layui-input-block">
 							<form:select id="type" path="type" class="form-control simple-select">
 								<form:option value="" label=""/>
-								<form:options items="${fns:getDictList('new_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								<form:options items="${fns:getDictList('agenda_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 							</form:select>
 						</div>
 					</div>