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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -2259,7 +2259,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		list.add(gkjyrEntity);
 		List<GkjyrVo> voList = entityToVo(list);
 		//许可证信息
-//		List<XkzxxVo> xkzxxVos = exportXkzxx(id);
+		List<XkzxxVo> xkzxxVos = exportXkzxx(id);
 		//许可证附证
 		List<CodeEntity> listZycs = securityMgr.codeService().findValidCodesByGroupCode("ZYCS");
 		List<GqEntity> listgq = gqService.findGq();
@@ -2288,8 +2288,8 @@ public class GkjyrCtl extends BaseWebCtl {
 			ServletOutputStream outputStream = response.getOutputStream();
 			String fileName = new String((jyr+"信息").getBytes(), "iso-8859-1");
 			response.setHeader("Content-disposition", "attachment; filename=" + fileName + ".xlsx");// 组装附件名称和格式
-//			gkjyrService.exportJyr(xkzxxVos,sssbVos, outputStream);
-			gkjyrService.exportJyr(voList, xkzfzVos, mtVos, bwVos, cgVos, ckVos, dcVos, ryVos, sssbVos, qytzVos, zxjxVos, outputStream, listZycs, listgq, listgk);
+//			gkjyrService.exportJyr(voList, xkzfzVos, mtVos, bwVos, cgVos, ckVos, dcVos, ryVos, sssbVos, qytzVos, zxjxVos, outputStream, listZycs, listgq, listgk);
+			gkjyrService.exportJyr(voList, xkzxxVos, xkzfzVos, mtVos, bwVos, cgVos, ckVos, dcVos, ryVos, sssbVos, qytzVos, zxjxVos, outputStream, listZycs, listgq, listgk);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/service/GkjyrService.java

@@ -64,7 +64,7 @@ public interface GkjyrService {
 
 	public void exportExcelAll(List<GkjyrVo> voList, ServletOutputStream outputStream);
 
-//	public void exportJyr(List<XkzxxVo> xkzxxVos, List<SssbVo> sssbVos, ServletOutputStream outputStream);
-	public void exportJyr(List<GkjyrVo> voList, List<XkzfzVo> xkzfzVos, List<MtVo> mtVos, List<BwVo> bwVos, List<CgVo> cgVos, List<CkVo> ckVos, List<DcVo> dcVos, List<RyVo> ryVos, List<SssbVo> sssbVos, List<QytzVo> qytzVos, List<ZxjxVo> zxjxVos, ServletOutputStream outputStream, List<CodeEntity> listZycs, List<GqEntity> listgq, List<GkEntity> listgk);
+//	public void exportJyr(List<GkjyrVo> voList, List<XkzfzVo> xkzfzVos, List<MtVo> mtVos, List<BwVo> bwVos, List<CgVo> cgVos, List<CkVo> ckVos, List<DcVo> dcVos, List<RyVo> ryVos, List<SssbVo> sssbVos, List<QytzVo> qytzVos, List<ZxjxVo> zxjxVos, ServletOutputStream outputStream, List<CodeEntity> listZycs, List<GqEntity> listgq, List<GkEntity> listgk);
+	public void exportJyr(List<GkjyrVo> voList, List<XkzxxVo> xkzxxVos, List<XkzfzVo> xkzfzVos, List<MtVo> mtVos, List<BwVo> bwVos, List<CgVo> cgVos, List<CkVo> ckVos, List<DcVo> dcVos, List<RyVo> ryVos, List<SssbVo> sssbVos, List<QytzVo> qytzVos, List<ZxjxVo> zxjxVos, ServletOutputStream outputStream, List<CodeEntity> listZycs, List<GqEntity> listgq, List<GkEntity> listgk);
 
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/service/impl/GkjyrServiceImpl.java

@@ -45,6 +45,7 @@ import com.xt.jygl.gkjygl.gkjyr.sssb.vo.SssbVo;
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.vo.XkzfzVo;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.vo.XkzxxVo;
 import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
 import com.xt.jygl.gkjygl.gkjyr.zxjx.vo.ZxjxVo;
 import com.xtframe.core.webService.AuthHandlerResolver;
@@ -424,14 +425,14 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 	}
 
 	@Override
-//	public void exportJyr(List<XkzxxVo> xkzxxVos, List<SssbVo> sssbVos, ServletOutputStream outputStream) {
-	public void exportJyr(List<GkjyrVo> voList, List<XkzfzVo> xkzfzVos, List<MtVo> mtVos, List<BwVo> bwVos, List<CgVo> cgVos, List<CkVo> ckVos, List<DcVo> dcVos, List<RyVo> ryVos, List<SssbVo> sssbVos, List<QytzVo> qytzVos, List<ZxjxVo> zxjxVos, ServletOutputStream outputStream, List<CodeEntity> listZycs, List<GqEntity> listgq, List<GkEntity> listgk) {
+	public void exportJyr(List<GkjyrVo> voList, List<XkzxxVo> xkzxxVos, List<XkzfzVo> xkzfzVos, List<MtVo> mtVos, List<BwVo> bwVos, List<CgVo> cgVos, List<CkVo> ckVos, List<DcVo> dcVos, List<RyVo> ryVos, List<SssbVo> sssbVos, List<QytzVo> qytzVos, List<ZxjxVo> zxjxVos, ServletOutputStream outputStream, List<CodeEntity> listZycs, List<GqEntity> listgq, List<GkEntity> listgk) {
+//	public void exportJyr(List<GkjyrVo> voList, List<XkzfzVo> xkzfzVos, List<MtVo> mtVos, List<BwVo> bwVos, List<CgVo> cgVos, List<CkVo> ckVos, List<DcVo> dcVos, List<RyVo> ryVos, List<SssbVo> sssbVos, List<QytzVo> qytzVos, List<ZxjxVo> zxjxVos, ServletOutputStream outputStream, List<CodeEntity> listZycs, List<GqEntity> listgq, List<GkEntity> listgk) {
 		// 创建一个workbook 对应一个excel应用文件
 		XSSFWorkbook workBook = new XSSFWorkbook();
 		//经营人信息
 		setSheet(voList, outputStream, workBook);
 		//许可证信息
-//		xkzxxService.setXkzxxSheet(xkzxxVos, outputStream, workBook);
+		xkzxxService.setXkzxxSheet(xkzxxVos, outputStream, workBook);
 		//许可证附证信息
 		xkzfzService.setSheet(xkzfzVos, outputStream, listZycs, listgq, listgk, workBook);
 		//码头