添加合同借用归还通知，修改上报咨询员必填信息

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

@@ -479,8 +479,13 @@ public class WorkContractBorrowService extends CrudService<WorkContractBorrowDao
 				}
 				workActivityProcessService.deleteProcessIdAuditUsers(workCntractBorrow.getProcessInstanceId());
 			}else{
-				str =  "合同【"+workCntractBorrow.getWorkContractInfo().getName() + "】借用被驳回";
-				title = "合同【"+workCntractBorrow.getWorkContractInfo().getName() + "】借用被驳回";
+				if(StringUtils.isNotBlank(workCntractBorrow.getAct().getComment())){
+					str =  "合同【"+workCntractBorrow.getWorkContractInfo().getName() + "】借用被驳回，驳回意见：" + workCntractBorrow.getAct().getComment();
+					title = "合同【"+workCntractBorrow.getWorkContractInfo().getName() + "】借用被驳回，驳回意见：" + workCntractBorrow.getAct().getComment();
+				}else{
+					str =  "合同【"+workCntractBorrow.getWorkContractInfo().getName() + "】借用被驳回";
+					title = "合同【"+workCntractBorrow.getWorkContractInfo().getName() + "】借用被驳回";
+				}
 				users.add(workCntractBorrow.getCreateBy());
 
 				workCntractBorrow.setStatus("4");
@@ -624,6 +629,23 @@ public class WorkContractBorrowService extends CrudService<WorkContractBorrowDao
 		workCntractBorrow.setActualGiveDate(new Date());
 		workCntractBorrow.preUpdate();
 		dao.updateGiveDate(workCntractBorrow);
+
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+		String aboutGiveDateStr = formatter.format(workCntractBorrow.getActualGiveDate());
+		String str =  "合同【"+workCntractBorrow.getWorkContractInfo().getName() + "】合同归还成功，归还日期：" + aboutGiveDateStr;
+		String title = "合同【"+workCntractBorrow.getWorkContractInfo().getName() + "】合同归还成功";
+		workProjectNotifyService
+				.save(UtilNotify
+						.saveNotify(workCntractBorrow.getId(),
+								workCntractBorrow.getCreateBy(),
+								workCntractBorrow.getCompanyId(),
+								title,
+								str,
+								"93",
+								"0",
+								"待通知",
+								""));
+
 	}
 
 	/**

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

@@ -1174,8 +1174,8 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 
 				} else {
 					if (!"yes".equals(workInvoice.getAct().getFlag())) {//驳回待办提醒
-						title = "项目【"+ projectRecords.getProjectName() +"】发票重新申请或作废";
-						str = "项目【"+ projectRecords.getProjectName() +"】发票重新申请或作废";
+						title = "项目【"+ projectRecords.getProjectName() +"】发票申请被驳回";
+						str = "项目【"+ projectRecords.getProjectName() +"】发票申请被驳回，请选择重新申请或作废";
 						WorkProjectNotify notify = new WorkProjectNotify();
 						notify.setNotifyId(workInvoice.getId());
 						userList = workProjectNotifyService.readByNotifyId(notify);

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

@@ -658,7 +658,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>咨询员</h2></div>
+                <div class="form-group-label"><h2><span class="require-item">*</span>咨询员</h2></div>
                 <div class="layui-item layui-col-sm12 lw6">
                     <div class="layui-item nav-btns">
                         <div class="layui-item nav-btns" style="padding-left:0px;">
@@ -670,11 +670,11 @@
                             <thead>
                             <tr>
                                 <th width="60px">编号</th>
-                                <th >咨询员名称</th>
-                                <th >注册/资格证号</th>
-                                <th >本人负责内容</th>
-                                <th >完成营业收入比例（%）</th>
-                                <th >完成营业收入（元）</th>
+                                <th ><span class="require-item">*</span>咨询员名称</th>
+                                <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th ><span class="require-item">*</span>本人负责内容</th>
+                                <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
+                                <th ><span class="require-item">*</span>完成营业收入（元）</th>
                                 <th width="100px">操作</th>
                             </tr>
                             </thead>

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

@@ -674,7 +674,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>咨询员</h2></div>
+                <div class="form-group-label"><h2><span class="require-item">*</span>咨询员</h2></div>
                 <div class="layui-item layui-col-sm12 lw6">
                     <div class="layui-item nav-btns">
                         <div class="layui-item nav-btns" style="padding-left:0px;">
@@ -686,11 +686,11 @@
                             <thead>
                             <tr>
                                 <th width="60px">编号</th>
-                                <th >咨询员名称</th>
-                                <th >注册/资格证号</th>
-                                <th >本人负责内容</th>
-                                <th >完成营业收入比例（%）</th>
-                                <th >完成营业收入（元）</th>
+                                <th ><span class="require-item">*</span>咨询员名称</th>
+                                <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th ><span class="require-item">*</span>本人负责内容</th>
+                                <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
+                                <th ><span class="require-item">*</span>完成营业收入（元）</th>
                                 <th width="100px">操作</th>
                             </tr>
                             </thead>

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

@@ -680,7 +680,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>咨询员</h2></div>
+                <div class="form-group-label"><h2><span class="require-item">*</span>咨询员</h2></div>
                 <div class="layui-item layui-col-sm12 lw6">
                     <div class="layui-item nav-btns">
                         <div class="layui-item nav-btns" style="padding-left:0px;">
@@ -692,11 +692,11 @@
                             <thead>
                             <tr>
                                 <th width="60px">编号</th>
-                                <th >咨询员名称</th>
-                                <th >注册/资格证号</th>
-                                <th >本人负责内容</th>
-                                <th >完成营业收入比例（%）</th>
-                                <th >完成营业收入（元）</th>
+                                <th ><span class="require-item">*</span>咨询员名称</th>
+                                <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th ><span class="require-item">*</span>本人负责内容</th>
+                                <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
+                                <th ><span class="require-item">*</span>完成营业收入（元）</th>
                                 <th width="100px">操作</th>
                             </tr>
                             </thead>

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

@@ -674,7 +674,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>咨询员</h2></div>
+                <div class="form-group-label"><h2><span class="require-item">*</span>咨询员</h2></div>
                 <div class="layui-item layui-col-sm12 lw6">
                     <div class="layui-item nav-btns">
                         <div class="layui-item nav-btns" style="padding-left:0px;">
@@ -686,11 +686,11 @@
                             <thead>
                             <tr>
                                 <th width="60px">编号</th>
-                                <th >咨询员名称</th>
-                                <th >注册/资格证号</th>
-                                <th >本人负责内容</th>
-                                <th >完成营业收入比例（%）</th>
-                                <th >完成营业收入（元）</th>
+                                <th ><span class="require-item">*</span>咨询员名称</th>
+                                <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th ><span class="require-item">*</span>本人负责内容</th>
+                                <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
+                                <th ><span class="require-item">*</span>完成营业收入（元）</th>
                                 <th width="100px">操作</th>
                             </tr>
                             </thead>

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

@@ -673,7 +673,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>咨询员</h2></div>
+                <div class="form-group-label"><h2><span class="require-item">*</span></h2></div>
                 <div class="layui-item layui-col-sm12 lw6">
                     <div class="layui-item nav-btns">
                         <div class="layui-item nav-btns" style="padding-left:0px;">
@@ -685,11 +685,11 @@
                             <thead>
                             <tr>
                                 <th width="60px">编号</th>
-                                <th >咨询员名称</th>
-                                <th >注册/资格证号</th>
-                                <th >本人负责内容</th>
-                                <th >完成营业收入比例（%）</th>
-                                <th >完成营业收入（元）</th>
+                                <th ><span class="require-item">*</span>咨询员名称</th>
+                                <th ><span class="require-item">*</span>注册/资格证号</th>
+                                <th ><span class="require-item">*</span>本人负责内容</th>
+                                <th ><span class="require-item">*</span>完成营业收入比例（%）</th>
+                                <th ><span class="require-item">*</span>完成营业收入（元）</th>
                                 <th width="100px">操作</th>
                             </tr>
                             </thead>