项目数据导出处理

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.ruralprojectrecords.entity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.ActEntity;
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchProInfo;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
@@ -689,7 +690,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	}
 	@ExcelField(title="主委托方", align=2, sort=6)
 	public String getClientName() {
-		if (workContractInfo!=null && workContractInfo.getClient()!=null){
+		if (workContractInfo!=null && StringUtils.isNotBlank(workContractInfo.getClientName())){
 			return workContractInfo.getClientName();
 		}else {
 			return "";

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

@@ -787,7 +787,7 @@ public class RuralCostProjectRecordsController extends BaseController {
     /**
      * 下载导入造价审核B类项目数据模板
      */
-    @RequestMapping(value = "importBTemplate")
+    @RequestMapping(value = "importB/template")
     public String importFileTemplateB(HttpServletResponse response, HttpServletRequest request,RuralProjectRecords projectRecords) {
         String companyType = projectRecords.getCompanyType();
         try {

src/main/webapp/WEB-INF/tags/table/importMultiparameterExcel.tag

@@ -1,13 +1,14 @@
 <%@ tag language="java" pageEncoding="UTF-8"%>
 <%@ include file="/webpage/include/taglib.jsp"%>
 <%@ attribute name="url" type="java.lang.String" required="true"%>
+<%@ attribute name="companyType" type="java.lang.String" required="true"%>
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入controller的url --%>
 <button id="btnImport" class="layui-btn layui-btn-sm layui-bg-blue" data-toggle="tooltip" data-placement="left" title="导入">
 <%--	<i class="fa fa-folder-open-o"></i>--%>
 	导入
 </button>
 <div id="importBox" class="hide">
-		<form id="importForm" action="${url}" method="post" enctype="multipart/form-data"
+		<form id="importForm" action="${url}?companyType=${companyType}" method="post" enctype="multipart/form-data"
 			 style="padding-left:20px;text-align:center;" onsubmit="loading('正在导入，请稍等...');"><br/>
 			<input id="uploadFile" name="file" type="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　
 			
@@ -25,7 +26,7 @@ $(document).ready(function() {
 		    content:$("#importBox").html() ,
 		    btn: ['下载模板','确定', '关闭'],
 			    btn1: function(index, layero){
-				  window.location.href='${url}';
+				  window.location.href='${url}/template?companyType=${companyType}';
 			  },
 		    btn2: function(index, layero){
 			        var inputForm =top.$("#importForm");

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

@@ -509,7 +509,7 @@
 							<%--<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->--%>
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:importB">
-							<table:importMultiparameterExcel url="${ctx}/ruralProject/ruralCostProjectRecords/importBTemplate?companyType=${companyType}"></table:importMultiparameterExcel><!-- 导入按钮 -->
+							<table:importMultiparameterExcel url="${ctx}/ruralProject/ruralCostProjectRecords/importB" companyType="${companyType}"></table:importMultiparameterExcel><!-- 导入按钮 -->
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:export">
 							<table:exportExcel url="${ctx}/ruralProject/ruralCostProjectRecords/export?companyType=${companyType}"></table:exportExcel><!-- 导出按钮 -->