git-svn-id: https://192.168.57.71/svn/jsgkj@1726 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/qytz/qytzmain.jsp

@@ -124,10 +124,8 @@
 					    <th width="5%">序号</th>
 						<th width="10%">投资人名称</th>
 						<th width="10%">投资金额</th>
-						<th width="10%">投资金额单位</th>
 						<th width="10%">港口经营人</th>
 						<th width="10%">投资总金额</th>
-						<th width="10%">投资总金额单位</th>
 						<th width="10%">是否外商</th>
 						<th width="1%" class="operatetd">操作</th>
 				    </tr>
@@ -135,11 +133,23 @@
 						<tr class="tr_bg">
 							 <td >${status.index+1}</td>
 							 <td >${qytz.tzrmc }</td>
-							 <td >${qytz.je }</td>
-							 <td >${qytz.tzjedw }</td>
+							  <c:choose>
+		   						<c:when test="${not empty qytz.tzjedw }">  
+							       <td >${qytz.je }(${qytz.tzjedw })</td>
+							    </c:when>
+							    <c:otherwise> 
+							 	   <td >${qytz.je }</td>
+							    </c:otherwise>
+							 </c:choose>
 							 <td >${qytz.ssjyrzw}</td>
-							 <td >${qytz.tzzje }</td>
-							 <td >${qytz.tzje }</td>
+							 <c:choose>
+		   						<c:when test="${not empty qytz.tzje }">  
+							       <td >${qytz.tzzje }(${qytz.tzje })</td>
+							    </c:when>
+							    <c:otherwise> 
+							 	   <td >${qytz.tzzje }</td>
+							    </c:otherwise>
+							 </c:choose>
 							 <td >${qytz.sfwszw }</td>
 							<td class="operatetd">
 							<authz:hasPermission name="${appName}:qytzxx:main">

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/qytz/service/impl/QytzServiceImpl.java

@@ -58,7 +58,7 @@ public class QytzServiceImpl extends JyglBaseService<QytzEntity, String> impleme
 	
 	@Override
 	public void setSheet(List<QytzVo> voList, ServletOutputStream outputStream, XSSFWorkbook workBook) {
-		String[] titles = { "序号", "所在地", "所在港口", "所在港区", "经营人", "经济类型", "投资人名称", "是否外商", "资产类型", "投资金额", "投资金额单位（人民币，美元等）", "投资总金额", "投资金额单位（人民币，美元等）", "注册资本", "注册资本单位（人民币，美元等）", "所占份额%", "注册地址" };
+		String[] titles = { "序号", "所在地", "所在港口", "所在港区", "经营人", "经济类型", "投资人名称", "是否外商", "资产类型", "投资金额", "投资总金额", "注册资本", "所占份额%", "注册地址" };
 		// 在workbook中添加一个sheet,对应Excel文件中的sheet
 		XSSFSheet qytzSheet = workBook.createSheet("企业投资信息");
 		ExportUtil exportUtil = new ExportUtil(workBook, qytzSheet);
@@ -117,38 +117,38 @@ public class QytzServiceImpl extends JyglBaseService<QytzEntity, String> impleme
 				cell = bodyRow.createCell(9);
 				cell.setCellStyle(bodyStyle);
 				if (null != vo.getJe()) {
-					cell.setCellValue(vo.getJe());
+					if(null != vo.getTzjedw()){
+						cell.setCellValue(vo.getJe() + "(" + vo.getTzjedw() + ")");
+					}else{
+						cell.setCellValue(vo.getJe());
+					}
 				}
 				
 				cell = bodyRow.createCell(10);
 				cell.setCellStyle(bodyStyle);
-				cell.setCellValue(vo.getTzjedw());
-				
-				cell = bodyRow.createCell(11);
-				cell.setCellStyle(bodyStyle);
 				if (null != vo.getTzzje()) {
-					cell.setCellValue(vo.getTzzje());
+					if(null != vo.getTzje()){
+						cell.setCellValue(vo.getTzzje() + "(" + vo.getTzje() + ")");
+					}else{
+						cell.setCellValue(vo.getTzzje());
+					}
 				}
 				
-				cell = bodyRow.createCell(12);
-				cell.setCellStyle(bodyStyle);
-				cell.setCellValue(vo.getTzje());
-				
-				cell = bodyRow.createCell(13);
+				cell = bodyRow.createCell(11);
 				cell.setCellStyle(bodyStyle);
 				if (null != vo.getZczb()) {
-					cell.setCellValue(vo.getZczb());
+					if(null != vo.getZczbdw()){
+						cell.setCellValue(vo.getZczb() + "(" + vo.getZczbdw() + ")");
+					}else{
+						cell.setCellValue(vo.getZczb());
+					}
 				}
 				
-				cell = bodyRow.createCell(14);
-				cell.setCellStyle(bodyStyle);
-				cell.setCellValue(vo.getZczbdw());
-				
-				cell = bodyRow.createCell(15);
+				cell = bodyRow.createCell(12);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue(vo.getSzb());
 				
-				cell = bodyRow.createCell(16);
+				cell = bodyRow.createCell(13);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue(vo.getZcdz());
 			}