Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/webpage/modules/signatureManagement/electronicSignature/ElectronicSignatureList.jsp

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

@@ -63,10 +63,6 @@ public class SubProjectInfoService extends CrudService<SubProjectInfoDao, SubPro
     private WorkattachmentDao workattachmentDao;
     @Autowired
     private WorkattachmentService workattachmentService;
-    @Autowired
-    private ProjectTemplateService projectTemplateService;
-    @Autowired
-    private RuralProjectMessageService ruralProjectMessageService;
 
     /**
      * 获取项目附件模板类型

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

@@ -578,6 +578,11 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 		}
 		//根据项目id查找报告咨询员信息
 		List<RuralReportConsultant> consultantList = ruralProjectMessageNewService.getConsultantsList(ruralProjectRecords.getId());
+
+		for (RuralReportConsultant ruralReportConsultant : consultantList) {
+			ruralReportConsultant.setSignatureStampUrl("");
+		}
+
 		Iterator<RuralReportConsultant> it = consultantList.iterator();
 		while(it.hasNext()){
 			RuralReportConsultant consultant = it.next();
@@ -797,15 +802,29 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 
 		Integer zxyFlag = 0;
 		//根据咨询员id查询咨询员信息以及咨询员的专业和资格
-		for (RuralReportConsultant consultant : consultants) {
-			if("咨询员".equals(consultant.getRole()) && 0 == zxyFlag){
-				zxyFlag ++;
+		for (int i = 0;i<consultants.size(); i ++ ){
+			RuralReportConsultant consultant = consultants.get(i);
+			if("咨询员".equals(consultant.getRole())){
 				User consultantUser = UserUtils.get(consultant.getZixunyuan());
 				data.put("consultantName1",consultantUser.getName());
 				if(StringUtils.isNotBlank(consultant.getMajor())){
 					data.put("consultantMajor1",consultant.getMajor());
 				}
 
+				for (RuralReportConsultant ruralReportConsultant : consultantList) {
+					if(consultants.get(i).getZixunyuanName().equals(ruralReportConsultant.getZixunyuanName())){
+						//如果咨询员不为空，则对项咨询员进行获取签字章并存储
+						if(org.apache.commons.lang3.StringUtils.isNotBlank(consultantUser.getId())){
+							String base64String = base64String(consultantUser.getId());
+							data.put("handSignature4",base64String);
+							ruralReportConsultant.setSignatureStampUrl(base64String);
+						}else{
+							data.put("handSignature4","");
+						}
+						break;
+					}
+				}
+
 				//如果咨询员不为空，则对项咨询员进行获取签字章并存储
 				if(org.apache.commons.lang3.StringUtils.isNotBlank(consultantUser.getId())){
 					String base64String = base64String(consultantUser.getId());
@@ -841,6 +860,7 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 		}
 
 
+		data.put("list",consultantList);
 		//咨询报告日期
 		if(null != projectReportSignatureInfo && null != projectReportSignatureInfo.getStampDate()){
 			data.put("projectReportDate",dateStr(projectReportSignatureInfo.getStampDate()));

src/main/webapp/webpage/modules/filialeWorkInvoice/filialeConditionWorkInvoiceForm.jsp

@@ -39,7 +39,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/filialeWorkInvoice/filialeConditionWorkInvoiceModify.jsp

@@ -39,7 +39,7 @@
 				if (this.optional(element)){
 					return true;
 				}
-				var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+				var uscCode = /^\w{1,20}$/;
 				return uscCode.test(value);
 			}, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/filialeWorkInvoice/filialeWorkInvoiceForm.jsp

@@ -254,7 +254,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/filialeWorkInvoice/filialeWorkInvoiceModify.jsp

@@ -172,7 +172,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/ElectronicSignatureList.jsp

@@ -386,6 +386,8 @@
                             </c:if>
                         </shiro:hasPermission>
                         <button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                        <c:if test="${isArea != '1'}">
+                            <button class="layui-btn layui-btn-sm layui-bg-blue" title="地区负责人申请" onclick="openDialogDis('地区负责人申请','${ctx}/districtDirectorApplication/districtDirectorApplication/form','95%','95%')">&nbsp;地区负责人申请</button>
                         <c:if test="${masterState == 1 && isArea != '1'}">
                             <button class="layui-btn layui-btn-sm layui-bg-blue" title="地区负责人申请" onclick="openDialogre('地区负责人申请','${ctx}/districtDirectorApplication/districtDirectorApplication/form','95%','95%','','送审,关闭')">&nbsp;地区负责人申请</button>
                         </c:if>

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceAllForm.jsp

@@ -39,7 +39,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceAllTwoForm.jsp

@@ -39,7 +39,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceAllTwoModify.jsp

@@ -39,7 +39,7 @@
 				if (this.optional(element)){
 					return true;
 				}
-				var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+				var uscCode = /^\w{1,20}$/;
 				return uscCode.test(value);
 			}, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceForm.jsp

@@ -39,7 +39,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceModify.jsp

@@ -39,7 +39,7 @@
 				if (this.optional(element)){
 					return true;
 				}
-				var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+				var uscCode = /^\w{1,20}$/;
 				return uscCode.test(value);
 			}, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceTwoForm.jsp

@@ -39,7 +39,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceTwoModify.jsp

@@ -39,7 +39,7 @@
 				if (this.optional(element)){
 					return true;
 				}
-				var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+				var uscCode = /^\w{1,20}$/;
 				return uscCode.test(value);
 			}, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp

@@ -231,7 +231,7 @@
 				if (this.optional(element)){
 					return true;
 				}
-				var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+				var uscCode = /^\w{1,20}$/;
 				return uscCode.test(value);
 			}, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllModify.jsp

@@ -180,7 +180,7 @@
 				if (this.optional(element)){
 					return true;
 				}
-				var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+				var uscCode = /^\w{1,20}$/;
 				return uscCode.test(value);
 			}, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllNotProjectModify.jsp

@@ -144,7 +144,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoForm.jsp

@@ -231,7 +231,7 @@
 				if (this.optional(element)){
 					return true;
 				}
-				var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+				var uscCode = /^\w{1,20}$/;
 				return uscCode.test(value);
 			}, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoModify.jsp

@@ -38,7 +38,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceExamineModify.jsp

@@ -97,7 +97,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceForm.jsp

@@ -111,7 +111,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -192,7 +192,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceNotProjectModify.jsp

@@ -155,7 +155,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoForm.jsp

@@ -254,7 +254,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoModify.jsp

@@ -188,7 +188,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceUploadElectronicInvoiceForm.jsp

@@ -39,7 +39,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceForma.jsp

@@ -46,7 +46,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 			validateForm = $("#inputForm").validate({

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceFormas.jsp

@@ -45,7 +45,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
 			validateForm = $("#inputForm").validate({

src/main/webapp/webpage/modules/workinvoicealter/workInvoiceModifya.jsp

@@ -45,7 +45,7 @@
                 if (this.optional(element)){
                     return true;
                 }
-                var uscCode = /^((\w{15})|(\w{18})|(\w{20}))$/;
+                var uscCode = /^\w{1,20}$/;
                 return uscCode.test(value);
             }, "请填写正确的纳税人识别号");
             validateForm = $("#inputForm").validate({