Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,8 @@
  */
 package com.jeeplus.modules.projectcontentinfo.web;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -190,11 +192,12 @@ public class ProjectBasedDataController extends BaseController {
 
 
     @RequestMapping("selectList")
-    public String gridSelect(ProjectBasedData projectBasedData,Model model,String searchLabel,HttpServletRequest request,HttpServletResponse response){
+    public String gridSelect(ProjectBasedData projectBasedData,Model model,String searchLabel,HttpServletRequest request,HttpServletResponse response) throws UnsupportedEncodingException {
         Page<ProjectBasedData> page = projectBasedDataService.findPage(new Page<ProjectBasedData>(request,response), projectBasedData);
+		String searchLabel1 = URLDecoder.decode(searchLabel,"utf-8");
         model.addAttribute("obj", projectBasedData);
         model.addAttribute("page", page);
-        model.addAttribute("searchLabel",searchLabel);
+        model.addAttribute("searchLabel",searchLabel1);
         return "modules/sys/gridselectProjbasedata";
     }
 

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

@@ -3,6 +3,8 @@
  */
 package com.jeeplus.modules.projectcontentinfo.web;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -126,7 +128,8 @@ public class ProjectReportDataController extends BaseController {
 	}
 
 	@RequestMapping("selectreportData")
-	public String gridSelectData(ProjectReportData projectReportData, String searchLabel , HttpServletRequest request, HttpServletResponse response, Model model){
+	public String gridSelectData(ProjectReportData projectReportData, String searchLabel , HttpServletRequest request, HttpServletResponse response, Model model) throws UnsupportedEncodingException {
+		searchLabel = URLDecoder.decode(searchLabel, "UTF-8");
 		projectReportData.setFileStatus("1");
 		Page<ProjectReportData> page = projectReportDataService.findInfoPageByStatus(new Page<ProjectReportData>(request, response), projectReportData);
 		model.addAttribute("obj", projectReportData);

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

@@ -378,6 +378,8 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
             }
             processType = "projectAlter";
             variables.put("applyUserId", projectRecordsAlter.getCreateBy().getId());
+            variables.put("bmzrCount",bmzrs.size());
+            variables.put("bmzrList",bmzrs);
             users.addAll(bmzrs);
         }
         List<String> userIds = new ArrayList<>(users.size());

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

@@ -211,7 +211,7 @@ public class ProjectRecordsAlterController extends BaseController {
 	 */
 	@RequiresPermissions(value={"project:projectRecords:add","project:projectRecords:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
-	public String save(ProjectRecordsAlter projectRecords, Model model, RedirectAttributes redirectAttributes){
+	public String save(ProjectRecordsAlter projectRecords, Model model, RedirectAttributes redirectAttributes) {
 		if (!beanValidator(model, projectRecords)){
 			return form(projectRecords, model,redirectAttributes);
 		}

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

@@ -103,7 +103,7 @@
 					<label class="layui-form-label"><span class="require-item">*</span>报告编号：</label>
 					<div class="layui-input-block with-icon">
 						<sys:gridselectreportrecord url="${ctx}/projectcontentinfo/projectReportData/selectreportData" id="report" name="report.id"  value="${projectReportRecord.report.id}"  title="选择报告" labelName="report.number"
-													labelValue="${projectReportRecord.report.number}" cssClass="form-control layui-input " fieldLabels="报告" fieldKeys="name" searchLabel="报告名称" searchKey="name" ></sys:gridselectreportrecord>
+													labelValue="${projectReportRecord.report.number}" cssClass="form-control layui-input " fieldLabels="${fns:urlEncode('报告')}" fieldKeys="name" searchLabel="${fns:urlEncode('报告名称')}" searchKey="name" ></sys:gridselectreportrecord>
 
 					</div>
 				</div>

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

@@ -340,7 +340,7 @@
 					<a href="javascript:void(0)" onclick="openDialogre('新增依据性资料', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=basedData&dictType=${projectcontentinfo.dictType}&id=${projectcontentinfo.id}&parentIds=${projectcontentinfo.parentIds}','90%','90%','inputForm')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
 
 					<sys:gridselectBaseData url="${ctx}/projectcontentinfo/projectBasedData/selectList" id="baseData" title="选择依据资料"
-											cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="依据资料名称" searchKey="name"></sys:gridselectBaseData>
+											cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="${fns:urlEncode('依据资料名称')}" searchKey="name"></sys:gridselectBaseData>
 				</div>
 				<div class="layui-item layui-col-xs12 form-table-container">
 					<table id="contentTableBase" class="table table-bordered table-condensed details">

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

@@ -518,7 +518,7 @@
                     <a href="javascript:void(0)" onclick="openDialogre('新增依据性资料', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=basedData&dictType=${projectcontentinfo.dictType}&id=${projectcontentinfo.id}&parentIds=${projectcontentinfo.parentIds}','90%','90%','inputForm')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
 
                     <sys:gridselectBaseData url="${ctx}/projectcontentinfo/projectBasedData/selectList" id="baseData" title="选择依据资料"
-                                            cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="依据资料名称" searchKey="name"></sys:gridselectBaseData>
+                                            cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="${fns:urlEncode('依据资料名称')}" searchKey="name"></sys:gridselectBaseData>
                 </div>
                 <div class="layui-item layui-col-xs12 form-table-container">
                     <table id="contentTableBase" class="table table-bordered table-condensed details">

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

@@ -598,7 +598,7 @@
                 <div class="form-group-label"><h2>施工方信息</h2></div>
                 <div class="layui-item nav-btns">
                     <sys:gridselectClientLink url="${ctx}/workclientinfo/workClientInfo/clientInfolist" id="constructionOrgList"   title="选择施工单位"
-                                              cssClass="form-control required" fieldLabels="客户编号" fieldKeys="name"  searchLabel="客户名称" searchKey="name"></sys:gridselectClientLink>
+                                              cssClass="form-control required" fieldLabels="${fns:urlEncode('客户编号')}" fieldKeys="name"  searchLabel="${fns:urlEncode('客户名称')}" searchKey="name"></sys:gridselectClientLink>
                 </div>
                 <div class="layui-item layui-col-xs12 form-table-container">
                     <table id="contentTable2" class="table table-bordered table-condensed details">