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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglmain.jsp

@@ -33,12 +33,12 @@
 			initgqSelect('gqsel','${szgq }',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
 		}
 		
-		function exportExcelAll(data1,data2,data3,data4,data5,data6,data7,data8){
+		function exportExcelAll(data1,data2,data3,data4,data5,data6,data7,data8,data9){
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中，请耐心等待！',
 			    confirm: function(){
-			    	location.href=$.app+"/xmxxgl/exportExcelAll?xmmc="+data1+"&xmfr="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&xmhzjbid="+data6+"&sfyzjbzid="+data7+"&xmbm="+data8;
+			    	location.href=$.app+"/xmxxgl/exportExcelAll?xmmc="+data1+"&xmfr="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&xmhzjbid="+data6+"&sfyzjbzid="+data7+"&xmbm="+data8+"&jyrmc="+data9;
 				 }
 			});
 		}
@@ -139,7 +139,7 @@
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
 							            </authz:hasPermission>
-					            <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${xmmc}','${xmfr}','${szd}','${szgk}','${szgq}','${xmhzjbid}','${sfyzjbzid}','${xmbm}')">
+					            <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${xmmc}','${xmfr}','${szd}','${szgk}','${szgq}','${xmhzjbid}','${sfyzjbzid}','${xmbm}','${jyrmc}')">
 							   		<i class="glyphicon glyphicon-download-alt"></i>导出
 							   	</a>
                      </td>

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -819,7 +819,7 @@ public class XmxxglCtl extends BaseWebCtl {
 
 	// 导出
 	@RequestMapping(value = "/exportExcelAll")
-	public String exportExcelAll(HttpServletResponse response, final String xmmc, final String xmfr, final String szdid, final String szgkid, final String szgqid, final String xmhzjbid, final String sfyzjbzid, final String xmbm) {
+	public String exportExcelAll(HttpServletResponse response, final String xmmc, final String xmfr, final String szdid, final String szgkid, final String szgqid, final String xmhzjbid, final String sfyzjbzid, final String xmbm, final String jyrmc) {
 		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
 			// 查询条件
 			@Override
@@ -832,8 +832,8 @@ public class XmxxglCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(xmbm)) {
 					list.add(cb.like(root.get("xmbm").as(String.class), "%" + xmbm + "%"));
 				}
-				if (StringUtils.isNotEmpty(xmfr)) {
-					list.add(cb.like(root.get("xmfr").as(String.class), "%" + xmfr + "%"));
+				if (StringUtils.isNotEmpty(jyrmc)) {
+					list.add(cb.like(root.get("jyrid").get("gkjyr").as(String.class), "%" + jyrmc + "%"));
 				}
 				if (StringUtils.isNotEmpty(xmhzjbid)) {
 					list.add(cb.like(root.get("xmhzjb").get("id").as(String.class), "%" + xmhzjbid + "%"));
@@ -938,7 +938,7 @@ public class XmxxglCtl extends BaseWebCtl {
 			ServletOutputStream outputStream = response.getOutputStream();
 			String fileName = new String(("项目信息全部").getBytes(), "iso-8859-1");
 			response.setHeader("Content-disposition", "attachment; filename=" + fileName + ".xlsx");// 组装附件名称和格式
-			String[] titles = { "序号", "项目编码", "项目名称", "所属单位", "所在地", "所在港口", "所在港区", "项目法人", "项目类型", "建设地点", "建设规模", "投资类型", "总投资（万元）", "项目核准级别", "政府投资（万元）", "政府投资占比（%）", "岸线审批级别", "岸线长度（米）", "通过能力（万吨）", "泊位用途", "水域类型", "建成时间", "码头前沿位置_上端点X", "码头前沿位置_上端点Y", "码头前沿位置_下端点X", "码头前沿位置_下端点Y" };
+			String[] titles = { "序号", "项目编码", "项目名称", "所属单位", "所在地", "所在港口", "所在港区", "项目法人", "项目类型", "建设地点", "建设规模", "投资类型", "总投资（万元）", "项目核准级别", "政府投资（万元）", "政府投资占比（%）", "岸线审批级别", "岸线长度（米）", "通过能力（万吨）", "水域类型", "建成时间" };
 			xmxxglService.exportExcelAll(voList, titles, outputStream);
 		} catch (IOException e) {
 			e.printStackTrace();

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/service/impl/XmxxglServiceImpl.java

@@ -260,31 +260,11 @@ public class XmxxglServiceImpl extends BaseWorkFlowServiceImpl<XmxxglEntity, Str
 
 				cell = bodyRow.createCell(19);
 				cell.setCellStyle(bodyStyle);
-				cell.setCellValue(xmxxgl.getBwytzw());
-
-				cell = bodyRow.createCell(20);
-				cell.setCellStyle(bodyStyle);
 				cell.setCellValue(xmxxgl.getSylxzw());
 
-				cell = bodyRow.createCell(21);
+				cell = bodyRow.createCell(20);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue(xmxxgl.getJcsjstr());
-
-				cell = bodyRow.createCell(22);
-				cell.setCellStyle(bodyStyle);
-				cell.setCellValue(xmxxgl.getSddx());
-
-				cell = bodyRow.createCell(23);
-				cell.setCellStyle(bodyStyle);
-				cell.setCellValue(xmxxgl.getSddy());
-
-				cell = bodyRow.createCell(24);
-				cell.setCellStyle(bodyStyle);
-				cell.setCellValue(xmxxgl.getXddx());
-
-				cell = bodyRow.createCell(25);
-				cell.setCellStyle(bodyStyle);
-				cell.setCellValue(xmxxgl.getXddy());
 			}
 		}
 		try {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrck/ctl/CkCtl.java

@@ -412,7 +412,7 @@ public class CkCtl extends BaseWebCtl {
 			
 			if (!StringUtils.isEmpty(kcsclxid)) {
 				CodeEntity kcsclx = new CodeEntity(kcsclxid);
-				code.setKcsclx(kcsclx);
+				entity.setKcsclx(kcsclx);
 			}
 
 			MtEntity ssmt = new MtEntity();

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/ry/ctl/RyCtl.java

@@ -246,7 +246,7 @@ public class RyCtl extends BaseWebCtl {
 		model.addAttribute("jyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jyr"));
 		model.addAttribute("szd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));
 		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
-		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgzid"));
+		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));
 		model.addAttribute("rylxid", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "rylxid"));
 
 		// 翻页共通

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/sssb/ctl/SssbCtl.java

@@ -688,7 +688,7 @@ public class SssbCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));
 				}
 				if (StringUtils.isNotEmpty(ssmc)) {
-					list.add(cb.like(root.get("ssmc").get("ssmc").as(String.class), "%" + ssmc + "%"));
+					list.add(cb.like(root.get("ssmc").as(String.class), "%" + ssmc + "%"));
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (isJyr()) {
@@ -746,6 +746,7 @@ public class SssbCtl extends BaseWebCtl {
 				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
 				vo.setYjfl(entity.getYjfl() != null ? entity.getYjfl().getId() : "");
 				vo.setEjfl(entity.getEjfl() != null ? entity.getEjfl().getId() : "");
+				vo.setSldw(entity.getSldw() != null ? entity.getSldw().getId() : "");
 				vo.setSzzyq(entity.getSzzyq() != null ? entity.getSzzyq().getId() : "");
 				vo.setSzzyqzw(entity.getSzzyq() != null ? entity.getSzzyq().getZyqmc() : "");
 				if (null != entity.getYxq()) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/sssb/service/impl/SssbServiceImpl.java

@@ -259,7 +259,7 @@ public class SssbServiceImpl extends JyglBaseService<SssbEntity, String> impleme
 				
 				cell = bodyRow.createCell(9);
 				cell.setCellStyle(bodyStyle);
-				cell.setCellValue(vo.getSldw());
+				cell.setCellValue(vo.getSldwzw());
 				
 				cell = bodyRow.createCell(10);
 				cell.setCellStyle(bodyStyle);