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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/common/LoginFilter.java

@@ -33,7 +33,7 @@ public class LoginFilter implements Filter {
 			"/yjpt/resource.*", "/yjpt/img.*", "/yjpt/messagebroker/amf.*",
 			"/yjpt/upload.*", "/yjpt/downloadImage.*",
 			"/yjpt/.*QrCodePrint.do", "/yjpt/checkcode.do", "/yjpt/state.do",
-			"/yjpt/loginForExtra.do" ,"/yjpt/jyxkzAndFz.do","/yjpt/downloadYhsc.do","/yjpt/GetmSignatureData.do"};
+			"/yjpt/loginForExtra.do" ,"/yjpt/jyxkzAndFz.do","/yjpt/downloadYhsc.do","/yjpt/GetSignatureData.do"};
 
 	/**
 	 * 初始化

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/common/systimer/ZcdcSycn.java

@@ -41,61 +41,61 @@ public class ZcdcSycn extends BaseController{
 	private DcService dcService;
 	
 	public void execute() {
-		if(Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)&&Constants.YES.equals(GlobalData.JAXWS_SYNC)){//市级系统且需要同步
+		
+		if(Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)&&Constants.YES.equals(GlobalData.JAXWS_SYNC)){
+			//市级系统且需要同步
+			
 			//============自查==================
 			List<ZcEntity> list = zcService.findBySync();
 			if(list!=null&&list.size()>0){
 				ZcWebService webService = zcService.getWebService();
 				if(webService!=null){
 					for (ZcEntity zcEntity : list) {
+						//调用webservice接口
 						webService.save(zcEntity);
 						zcEntity.setTbzt(Constants.YES);
 						zcService.save(zcEntity);
 					}
 				}
 			}
-			//=============自查隐患=================
+			//============自查隐患=================
 			List<ZcyhEntity> yhList = zcyhService.findBySync();
 			if(yhList!=null&&yhList.size()>0){
 				ZcyhWebService webService = zcyhService.getWebService();
 				if(webService!=null){
 					for (ZcyhEntity zcyhEntity : yhList) {
+						//调用webservice接口
 						webService.save(zcyhEntity);
 						zcyhEntity.setTbzt(Constants.YES);
 						zcyhService.save(zcyhEntity);
 					}
 				}
 			}
+
 			
-			System.out.println("------------dc begin-----------------");
-			//===========================督察================
-			List<DcEntity> dclist = dcService.findBySync();
-			System.out.println("------------dc 1-----------------");
-			if(dclist!=null&&dclist.size()>0){
-				System.out.println("------------dc 2-----------------");
-				DcWebService dcWebService= dcService.getWebService(null);
-				System.out.println("------------dc 3-----------------");
+			//============督察================
+			List<DcEntity> dclist = dcService.findBySync(); 
+			if(dclist!=null&&dclist.size()>0){ 
+				DcWebService dcWebService= dcService.getWebService(null); 
 				if(dcWebService!=null){
-					for (DcEntity dcEntity : dclist) {
-						System.out.println("------------dc 4-----------------");
-						System.out.println(dcEntity.getAddDate());
-						System.out.println(dcEntity);
-						dcWebService.save(dcEntity);
-						System.out.println("------------dc 5-----------------");
+					for (DcEntity dcEntity : dclist) { 
+						//调用webservice接口
+						dcWebService.save(dcEntity); 
 						dcEntity.setTbzt(Constants.YES);
 						dcService.save(dcEntity);
 					}
 				}
 			}
-			System.out.println("--------dc end---------------------");
+
 			
-			//===============专项检查======================
+			//============专项检查======================
 			List<DcZxjcEntity> zxjcList = zxjcService.findBySync();
 			if(zxjcList!=null&&zxjcList.size()>0){
 				ZxjcWebService zxjcWebService = zxjcService.getWebService(null);
 				GgWebService ggWebService = ggService.getWebService(null);
 				if(zxjcWebService!=null&&ggWebService!=null){
 					for (DcZxjcEntity dcZxjcEntity : zxjcList) {
+						//调用webservice接口
 						zxjcWebService.saveEntity(dcZxjcEntity);
 						ggWebService.save(ggService.findById(dcZxjcEntity.getGgid()));
 						dcZxjcEntity.setTbzt(Constants.YES);
@@ -103,7 +103,11 @@ public class ZcdcSycn extends BaseController{
 					}
 				}
 			}
-		}else if(Constants.DEPLOY_MODE_PROVINCE.equals(GlobalData.DEPLOY_MODE)&&Constants.YES.equals(GlobalData.JAXWS_SYNC)){//省级系统且需要同步\
+			
+		}//end if
+		else if(Constants.DEPLOY_MODE_PROVINCE.equals(GlobalData.DEPLOY_MODE)&&Constants.YES.equals(GlobalData.JAXWS_SYNC)){
+			//省级系统且需要同步
+			
 			//===============专项检查======================
 			List<DcZxjcEntity> zxjcList = zxjcService.findBySync();
 			if(zxjcList!=null&&zxjcList.size()>0){
@@ -121,6 +125,7 @@ public class ZcdcSycn extends BaseController{
 					}
 				}
 			}
+			
 			//===========================督察================
 			List<DcEntity> dclist = dcService.findBySync();
 			if(dclist!=null&&dclist.size()>0){
@@ -135,10 +140,8 @@ public class ZcdcSycn extends BaseController{
 				}
 			}
 			
-			
-			
-		}
-	}
+		}//end else if
+	}//end execute
 }
 
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/aqpjjgxx/AqpjjgxxController.java

@@ -111,8 +111,11 @@ public class AqpjjgxxController extends BaseController {
 			id = Utils.getCurrentUser().getAqpjjg().getId();
 		}
 		BusinessContext bc = createBusinessContext();
-		AqpjjgxxEntity entity = aqpjjgxxService.findOne(id);
-		entity = aqpjjgxxService.loadAccessory(entity);
+		AqpjjgxxEntity entity= new AqpjjgxxEntity();
+		if(id !=null && id!=0){
+			entity = aqpjjgxxService.findOne(id);
+			entity = aqpjjgxxService.loadAccessory(entity);
+		}
 		bc.setResult(entity);
 		return bc;
 	}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/jyr/JyrController.java

@@ -264,28 +264,30 @@ public class JyrController extends BaseController {
 	@RequestMapping(value = "jyrJasper", method = RequestMethod.POST)
 	@ResponseBody
 	@RemotingExclude
-	public void jasperPrint(@RequestParam String id,
-			HttpServletResponse response, HttpServletRequest request) {
+	public void jasperPrint(@RequestParam String id, HttpServletResponse response, HttpServletRequest request) {
 		List<JyrJasperEntity> dataList = new ArrayList<JyrJasperEntity>();
 		JyrJasperEntity data = new JyrJasperEntity();
 		JyrEntity jyr = service.findById(Long.parseLong(id));
 		if (jyr != null) {
 			BusinessContext bc = service.editInit(jyr);
 			data.setJyr(jyr);
-			data.setFzList((List<GkwxhwzyfzblFzEntity>) bc
-					.getAttribute("fzList"));
+			data.setFzList((List<GkwxhwzyfzblFzEntity>)bc.getAttribute("fzList"));
 			data.setBwList((List<BwEntity>) bc.getAttribute("bwList"));
+			data.setDcList((List<JyrdcxxEntity>) bc.getAttribute("dcList"));
 			data.setCkList((List<JyrckxxEntity>) bc.getAttribute("ckList"));
 			data.setCgList((List<CgEntity>) bc.getAttribute("cgList"));
-			data.setDcList((List<JyrdcxxEntity>) bc.getAttribute("dcList"));
 			data.setMtList((List<MtEntity>) bc.getAttribute("mtList"));
 			dataList.add(data);
 		}
 		Map<String, Object> parameters = new HashMap<String, Object>();
 		parameters.put("SUBREPORT_DIR", "iReport/jyr/");
+		String fileName="经营人基础信息-"+jyr.getGkjyr();
 		ReportExportHelper.exportFromIreport("iReport/jyr/jyr.jasper",
-				response, parameters, new JRBeanCollectionDataSource(dataList),
-				"经营人基础信息", ReportExportHelper.REPORT_EXPORT_TYPE_WORD);
+											 response, 
+											 parameters, 
+											 new JRBeanCollectionDataSource(dataList),
+											 fileName,
+											 ReportExportHelper.REPORT_EXPORT_TYPE_WORD);
 	}
 
 	@RequestMapping(value = "jyrTjJasper", method = RequestMethod.POST)
@@ -478,7 +480,6 @@ public class JyrController extends BaseController {
 	 */
 	public BusinessContext doEditInit(JyrEntity entity) {
 		BusinessContext bContext = new BusinessContext();
-
 		// 根据经营人查找堆场列表
 		bContext = service.editInit(entity);
 		return bContext;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zyfzhz/GkwxhwzyfzhzController.java

@@ -458,16 +458,15 @@ public class GkwxhwzyfzhzController extends BaseController {
 	/**
 	 * 审核 flag true 为通过 false不通过
 	 */
-	public BusinessContext audit(String shyj, Date shsj,
-			GkwxhwzyfzhzEntity entity, boolean flag,String step) {
-		
+	public BusinessContext audit(String shyj, Date shsj, GkwxhwzyfzhzEntity entity, boolean flag,String step) {
+		 
 		//flag为true批准通过，如果勾选了延续发证日期、有效期起止时间会显示，要更新其值
 		if(flag){
 			//save GkwxhwzyfzhzEntity  页面上只有：发证日期、有效期起止时间可以编辑 
 			gkwxhwzyfzhzService.save(entity);
-			
+			 
 			//第四布批准通过，如果是延续，更新附证申请中的发证日期、有效日期起止时间
-			if(step.equals("4") && entity.getByzd2().equals("Y")){
+			if(step.equals("4") && entity.getByzd2()!=null && entity.getByzd2().equals("Y")){
 				//通过办理编号找到“附证”申请的信息
 				List<GkwxhwzyfzblhhzEntity> list_fz = gkwxhwzyfzblhhzService.findByByzd1(entity.getByzd1());
 				if(list_fz!=null && list_fz.size()>0){
@@ -479,30 +478,22 @@ public class GkwxhwzyfzhzController extends BaseController {
 				}
 			}
 		}
-		
-		
 		// 先签收
-		if (gkwxhwzyfzhzService
-				.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId()
-						.toString(), entity.getId().toString()) != null) {
-			gkwxhwzyfzhzService.claim(entity.getId().toString(), Utils
-					.getCurrentUser().getId().toString());
+		if (gkwxhwzyfzhzService.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(), entity.getId().toString()) != null) {
+			gkwxhwzyfzhzService.claim(entity.getId().toString(), Utils.getCurrentUser().getId().toString());
 		}
-		boolean isDone = gkwxhwzyfzhzService.changeAudit(shyj, shsj, entity,
-				flag);
+		boolean isDone = gkwxhwzyfzhzService.changeAudit(shyj, shsj, entity,flag);
+		
+		//数据同步 涉及：换证数据、变更后的附证相关数据
 		if (isDone == true
-				&& Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)
-				&& Constants.YES.equals(GlobalData.JAXWS_SYNC)) {
+			&& Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)
+			&& Constants.YES.equals(GlobalData.JAXWS_SYNC)) {
 			List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 			entity = gkwxhwzyfzhzService.findOne(entity.getId());
 			addNotEmptyModel(filterList, "fzhz", entity.getId(), Operator.EQ);
-			Specification<GkwxhwzyfzblFzEntity> specs = SpecificationCreater
-					.searchByPredicateModels(filterList);
+			Specification<GkwxhwzyfzblFzEntity> specs = SpecificationCreater.searchByPredicateModels(filterList);
 			List<GkwxhwzyfzblFzEntity> list = gkwxhwzyfzService.findAll(specs);			
-			// 同步省级
-			// if
-			// (Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)&&Constants.YES.equals(GlobalData.JAXWS_SYNC))
-			// {
+			/** 调用webservice将数据同步到省局数据库，根据是否成功，设置相应的状态位 */
 			ZyfzhzWebService webServce = gkwxhwzyfzhzService.getWebService();
 			if (webServce != null) {
 				final ZyfzhzWebService webServce_f = webServce;
@@ -523,20 +514,21 @@ public class GkwxhwzyfzhzController extends BaseController {
 					}
 				});
 				threadPool.execute(thread1);
-			} else {
+			} 
+			else {
 				entity.setTbzt(Constants.NO);
 				gkwxhwzyfzhzService.save(entity);
 			}
-		}
+		}//换证数据同步前的if判断
+		
+		
 		if (entity.getFzsq()!=null) {
 			GkwxhwzyfzblhhzEntity vo_fz= gkwxhwzyfzblhhzService.findOne(entity.getFzsq().getId());
 			List<GkwxhwzyfzblFzEntity> list2 =gkwxhwzyfzService.findByFzsq(entity.getFzsq());
 			if (Constants.YES.equals(GlobalData.JAXWS_SYNC)
-					&& Constants.DEPLOY_MODE_CITY
-							.equals(GlobalData.DEPLOY_MODE)) {
+				&& Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)) {
 				try {
-					ZyfzblWebService webServce = gkwxhwzyfzblhhzService
-							.getWebService();
+					ZyfzblWebService webServce = gkwxhwzyfzblhhzService.getWebService();
 					if (webServce != null) {
 						webServce.saveAllFz(vo_fz, list2);
 						vo_fz.setTbzt(Constants.YES);
@@ -550,8 +542,9 @@ public class GkwxhwzyfzhzController extends BaseController {
 					vo_fz.setTbzt(Constants.NO);
 					gkwxhwzyfzblhhzService.save(vo_fz);
 				}
-			}
-		}
+			}//end if 配置需要同步且是市级部署
+		}//附证数据同步前的if判断
+		
 		return null;
 	}
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zyfzndjy/GkwxhwzyfzblhhzController.java

@@ -2839,11 +2839,11 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		}
 
 		List<WxhwzysqVo> dataList = new ArrayList<WxhwzysqVo>();
-		GkwxhwzyfzblhhzEntity gkwxhwzyfzData = gkwxhwzyfzblhhzService
-				.findOne(Long.parseLong(id));
+		GkwxhwzyfzblhhzEntity gkwxhwzyfzData = gkwxhwzyfzblhhzService.findOne(Long.parseLong(id));
 		// 附证场所
-		List<GkwxhwzyfzblFzEntity> csfzList = gkwxhwzyfzblhhzService
-				.findByFzsq(gkwxhwzyfzData.getId());
+		List<GkwxhwzyfzblFzEntity> csfzList = gkwxhwzyfzblhhzService.findByFzsq(gkwxhwzyfzData.getId());
+		
+		//管理制度数据  管理制度分：安全管理制度、操作规程 两类  注：页面填报未设置必填
 		List<GlzdxxEntity> glzdList = findGlzdxxList(gkwxhwzyfzData);
 		// 安全管理制度数据
 		List<GlzdxxEntity> aqglzdList = new ArrayList<GlzdxxEntity>();
@@ -2851,14 +2851,17 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		List<GlzdxxEntity> czgcList = new ArrayList<GlzdxxEntity>();
 		if (glzdList != null && glzdList.size() > 0) {
 			for (GlzdxxEntity glzd : glzdList) {
-				if (Constants.GGDM_ID_GLZD_AQGLZD
-						.equals(glzd.getZdfl().getId())) {
-					aqglzdList.add(glzd);
-				} else {
-					czgcList.add(glzd);
-				}
-			}
-		}
+				if(glzd.getZdfl()!=null){
+					if (Constants.GGDM_ID_GLZD_AQGLZD.equals(glzd.getZdfl().getId())) {
+						aqglzdList.add(glzd);
+					} 
+					else {
+						czgcList.add(glzd);
+					}
+				}//管理制度非必填，做非null判断
+			}//end for 
+		}// end if glzdList is not empty
+		
 		// 特种设备作业人员及安全管理人员从业资质证汇总
 		List<RyjbxxEntity> jyrdryxx = findRyjbxxList(gkwxhwzyfzData);
 		// 应急救援装置设备及物资

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -4882,11 +4882,11 @@ public class ZysqbpController extends BaseController {
 
 	/*
 	 * 批量签章时，获取所要保护的数据 xh 2016.7.4 ( public String
-	 * GetmSignatureData(@RequestParam String documentID,HttpSession session) )
+	 * GetSignatureData(@RequestParam String documentID,HttpSession session) )
 	 */
-	@RequestMapping(value = "GetmSignatureData", method = RequestMethod.GET)
+	@RequestMapping(value = "GetSignatureData", method = RequestMethod.GET)
 	@ResponseBody
-	public String GetmSignatureData(@RequestParam String documentID) {
+	public String GetSignatureData(@RequestParam String documentID) {
 		ZysqbpEntity data = zysqbpService.findOne(Long.parseLong(documentID));
 
 		String audit_user = "", audit_date = "", audit_op = "";

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/zyfzndjy/Gkwxhwzyfzbl_fzbDao.java

@@ -32,7 +32,7 @@ public interface Gkwxhwzyfzbl_fzbDao extends
 	 * 根据附证申请主表记录查询附证信息
 	 * 
 	 * @param fzsqId
-	 *            申请id
+	 * 申请id
 	 * @return
 	 */
 	@Query("from GkwxhwzyfzblFzEntity o where o.fzsq.id=?1 and recordStatus<>9 ")
@@ -46,12 +46,13 @@ public interface Gkwxhwzyfzbl_fzbDao extends
 			long id, String name);
 
 	/** 根据附证所有的经营信息 */
-	@Query(value = "select distinct t.jyr from T_YJPT_GKWXHWZYFZBL_FZ t where t.record_status<>9 and t.zycs=?1 and t.fzhz is null ", nativeQuery = true)
+	@Query(value = "select distinct t.jyr from T_YJPT_GKWXHWZYFZBL_FZ t where t.record_status<>9 and t.zycs=?1 and t.fzhz is null ", 
+			nativeQuery = true)
 	public List<Object[]> findJyrList(Long zycsId);
 
-	@Query("from GkwxhwzyfzblFzEntity o where o.jyr=?1 and o.recordStatus<>?2 and o.fzhz is null and o.fzcsbh is not null")
-	public List<GkwxhwzyfzblFzEntity> findByJyrAndRecordStatusNotAndFzhzIsNull(
-			JyrEntity qymc, int recordStatus);
+	@Query("from GkwxhwzyfzblFzEntity o where o.jyr=?1 and o.recordStatus<>?2 and o.fzhz is null " +
+			"and o.fzcsbh is not null and o.fzsq.yxqkssj<=TRUNC(SYSDATE) AND o.fzsq.yxqjssj>=TRUNC(SYSDATE) ")
+	public List<GkwxhwzyfzblFzEntity> findByJyrAndRecordStatusNotAndFzhzIsNull(JyrEntity qymc, int recordStatus);
 
 	@Query("from GkwxhwzyfzblFzEntity o where o.fzhz.id=?1 and recordStatus<>9 ")
 	public List<GkwxhwzyfzblFzEntity> findByFzhzId(Long id);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/check/ZcServiceImpl.java

@@ -199,15 +199,12 @@ public class ZcServiceImpl extends BaseService<ZcEntity, Long> implements
 
 	@Override
 	public ZcWebService getWebService() {
-		URL wsdlLocation = com.jtgh.yjpt.client.zcdc.zc.ZcService
-				.getWsdlLocationByIp(Constants.WEBSERVICE_IP,
-						Constants.WEBSERVICE_PORT);
+		URL wsdlLocation = com.jtgh.yjpt.client.zcdc.zc.ZcService.getWsdlLocationByIp(Constants.WEBSERVICE_IP,Constants.WEBSERVICE_PORT);
 		try {
 			com.jtgh.yjpt.client.zcdc.zc.ZcService service = new com.jtgh.yjpt.client.zcdc.zc.ZcService(
 					wsdlLocation,
 					com.jtgh.yjpt.client.zcdc.zc.ZcService.ZCSERVICE_QNAME);
-			service.setHandlerResolver(new AuthHandlerResolver(
-					com.jtgh.yjpt.client.zcdc.zc.ZcService.ZCSERVICE_QNAME));
+			service.setHandlerResolver(new AuthHandlerResolver(com.jtgh.yjpt.client.zcdc.zc.ZcService.ZCSERVICE_QNAME));
 			ZcWebService webService = service.getZcWebServicePort();
 			return webService;
 		} catch (Exception e) {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/jyr/JyrServiceImpl.java

@@ -559,12 +559,12 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 
 	public BusinessContext editInit(JyrEntity entity) {
 		BusinessContext bc = new BusinessContext();
-		bc.setAttribute("dcList", jyrdcxxDao.findByQymc(entity));
+		bc.setAttribute("fzList", fzbDao.findByJyrAndRecordStatusNotAndFzhzIsNull(entity,JyrEntity.RECORD_STATE_DELETE));
 		bc.setAttribute("bwList", jyrbwxxDao.findByQymc(entity));
+		bc.setAttribute("dcList", jyrdcxxDao.findByQymc(entity));
 		bc.setAttribute("ckList", jyrckxxDao.findBySsjyrAndRecordStatusNot(entity, JyrEntity.RECORD_STATE_DELETE));
 		bc.setAttribute("cgList", cgDao.findByDwmcAndRecordStatusNot(entity,JyrEntity.RECORD_STATE_DELETE));
 		bc.setAttribute("mtList", mtDao.findByJyrAndRecordStatusNot(entity,JyrEntity.RECORD_STATE_DELETE));
-		bc.setAttribute("fzList", fzbDao.findByJyrAndRecordStatusNotAndFzhzIsNull(entity,JyrEntity.RECORD_STATE_DELETE));
 		bc.setAttribute("shxxList",jyrShxxDao.findByGnmkAndSsid(Constants.GNMK_JYRJCXX,entity.getId()));
 		return bc;
 	}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/zcdc/dc/DcWebService.java

@@ -28,11 +28,17 @@ public class DcWebService extends BaseWebService {
 	private DcService dcService;
 	
 	public DcEntity save(DcEntity entity) {
+		System.out.println(entity.getId());
+		int i=0;
+		System.out.println(++i);
 		entity.setSzd(entity.getSzd());
 		entity.setAddUser(GlobalData.TB_USER);
 		entity.setUpdateUser(GlobalData.TB_USER);
 		//督查同步的数据设置状态为Y
 		entity.setTbzt(Constants.YES);
+		
+		System.out.println(++i);
+		
 		if(GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)){//省级同步到市级只发送提醒
 			dcService.warnToXingzheng(entity);//发送提醒
 //			if(dcService.findOne(entity.getId())!=null){//如果市级已经有了，说明流程已经启动
@@ -41,7 +47,11 @@ public class DcWebService extends BaseWebService {
 //				entity = dcService.save(entity);
 //				dcService.startFlow(entity);
 //			}
+			System.out.println("yiyiyi");
+			System.out.println(++i);
 		}else{
+			System.out.println("erererer");
+			System.out.println(++i);
 			entity = dcService.save(entity);
 		}
 		return entity;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/zysqbp/WhsqbpWebService.java

@@ -398,16 +398,18 @@ public class WhsqbpWebService extends BaseController {
 	 * 3:您好，根据《港口危险货物安全管理规定》，危险货物港口经营人在危险货物港口装卸
 	 * 、过驳作业开始24小时前，应当向所在地港口行政管理部门报告。报告人在取得作业批准后72小时内未开始作业的
 	 * ，应当重新报告。现间隔超过72小时，请重新填写！ 4:您选择的作业场所被禁止作业，请重新选择！
+	 * 5:作业数量超过泊位核查靠泊能力
 	 */
 	public String submit(ZysqbpEntity sqbp) {
-		if (null == sqbp.getId() || sqbp.getId().equals(0l)) {
+		if (null == sqbp.getId() || sqbp.getId().equals(0L)) {//add
 			sqbp.setAddDate(new Date());
 			sqbp.setAddUser(Utils.getWebServiceUser());
 			sqbp.setRecordCode("90");
-		} else {
+		} else {//edit
 			sqbp.setUpdateDate(new Date());
 			sqbp.setUpdateUser(Utils.getWebServiceUser());
 		}
+		
 		if (sqbp.getZyddqybh() != null) {
 			GkwxhwzyfzblFzEntity zyddqybh = new GkwxhwzyfzblFzEntity();
 			zyddqybh = gkwxhwzyfzService.findOne(sqbp.getZyddqybh().getId());
@@ -422,8 +424,7 @@ public class WhsqbpWebService extends BaseController {
 			} else if (cal.get(Calendar.YEAR) + 2 == today.get(Calendar.YEAR)) {
 				nsns = 2;
 			}
-			List<JyrNsEntity> list = nsService.findByJyrAndNsns(zyddqybh
-					.getFzsq().getByzd1(), nsns);
+			List<JyrNsEntity> list = nsService.findByJyrAndNsns(zyddqybh.getFzsq().getByzd1(), nsns);
 			if (!(list.size() > 0 && list.get(0).getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED)
 					&& ((Constants.FZNS_CHECK_DATE) < today.get(Calendar.YEAR))
 					&& nsns > 0) {
@@ -431,6 +432,7 @@ public class WhsqbpWebService extends BaseController {
 			}
 		}
 
+		//开工报、完工报
 		if (sqbp.getZydw() != null) {
 			List<ZysqbpEntity> l = zysqbpService.wxhwSqValid(sqbp.getZydw());
 			if (l != null && l.size() > 0) {
@@ -441,18 +443,10 @@ public class WhsqbpWebService extends BaseController {
 		// 只能提交72小时以内的申报
 		if (Constants.YES.equals(Constants.ZYSB_CHECK_72)
 				&& sqbp.getZysjq().after(sqbp.getBgsj())
-				&& ((sqbp.getZysjq().getTime() - sqbp.getBgsj().getTime()) * 1
-						/ (60 * 60 * 1000) >= 96)) {
+				&& ((sqbp.getZysjq().getTime() - sqbp.getBgsj().getTime()) * 1 / (60 * 60 * 1000) >= 72)) {
 			return "3";
 		}
-		if (null == sqbp.getId() || sqbp.getId().equals(0l)) {
-			sqbp.setAddDate(new Date());
-			sqbp.setAddUser(Utils.getWebServiceUser());
-			sqbp.setRecordCode("90");
-		} else {
-			sqbp.setUpdateDate(new Date());
-			sqbp.setUpdateUser(Utils.getWebServiceUser());
-		}
+		
 		// 确保报告时间和提交时间一致
 		sqbp.setBgsj(new Date());
 		if (sqbp.getZydd() != null && sqbp.getZyddqybh() != null
@@ -479,8 +473,21 @@ public class WhsqbpWebService extends BaseController {
 				return "4";
 			}
 		}
+		
+		
+
+		//校验作业数量和泊位核查靠泊能力
+		if(sqbp.getZyddqybh()!=null && sqbp.getZyddqybh().getZycs()!=null && sqbp.getZyddqybh().getZycs().getId()==10000501L){
+			if(sqbp.getZyddqybh().getQynbbh()!=null && !sqbp.getZyddqybh().getQynbbh().equals("")){
+				BwEntity bwEntity = bwService.findOne(Long.parseLong(sqbp.getZyddqybh().getQynbbh()));
+				if((Double.parseDouble(bwEntity.getHckpnl())*10000)<sqbp.getZysl()){
+					return "5";
+				}
+			}
+		}
+		
 		sqbp = zysqbpService.submitWebService(sqbp);
-		// 自动审批
+		// 自动审批完成的数据同步
 		if (sqbp.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
 			// 同步到省级
 			if (Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)
@@ -501,10 +508,9 @@ public class WhsqbpWebService extends BaseController {
 					sqbp.setTbzt(Constants.NO);
 					zysqbpService.save(sqbp);
 				}
-
-			}
-
-		}
+			} 
+		}//end同步
+		
 		return "0";
 	}
 

gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr.jrxml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr" language="groovy" pageWidth="600" pageHeight="855" columnWidth="560" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="7a1af753-6b2b-48d3-b76d-11716729aeab">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr" language="groovy" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="7a1af753-6b2b-48d3-b76d-11716729aeab">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="33"/>
+	<property name="ireport.y" value="216"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
 		<defaultValueExpression><![CDATA["G:\\workplace\\yjpt-ireport\\"]]></defaultValueExpression>
 	</parameter>
@@ -48,9 +48,9 @@
 		</band>
 	</title>
 	<detail>
-		<band height="770" splitType="Immediate">
+		<band height="798" splitType="Immediate">
 			<frame>
-				<reportElement positionType="Float" x="0" y="0" width="560" height="20" uuid="128a8a0b-0f45-40e8-a2e6-262df53277a1"/>
+				<reportElement positionType="Float" x="0" y="0" width="560" height="20" backcolor="#000000" uuid="128a8a0b-0f45-40e8-a2e6-262df53277a1"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="0182edd3-8cde-45d7-b7b7-42ac3166f833"/>
 					<box leftPadding="5" rightPadding="5">
@@ -65,7 +65,7 @@
 					<text><![CDATA[所在港区]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="1ee5b6d5-d52b-401a-a5e2-a18cb4f63a30"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="1ee5b6d5-d52b-401a-a5e2-a18cb4f63a30"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -78,19 +78,6 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$F{jyr}.getSzgq().getGqmc()]]></textFieldExpression>
 				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="d35be443-d00e-4341-9cf9-d428ac3da8aa"/>
-					<box leftPadding="5" rightPadding="5">
-						<topPen lineWidth="0.5"/>
-						<leftPen lineWidth="0.5"/>
-						<bottomPen lineWidth="0.5"/>
-						<rightPen lineWidth="0.5"/>
-					</box>
-					<textElement verticalAlignment="Middle">
-						<font fontName="宋体" size="10" isBold="true"/>
-					</textElement>
-					<text><![CDATA[所在地]]></text>
-				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="72b88f78-c54f-465b-9b1b-cdb9f0191044"/>
 					<box leftPadding="5">
@@ -105,9 +92,22 @@
 					</textElement>
 					<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{jyr}.getSzd().getName())]]></textFieldExpression>
 				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="d35be443-d00e-4341-9cf9-d428ac3da8aa"/>
+					<box leftPadding="5" rightPadding="5">
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[所在地]]></text>
+				</staticText>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="20" width="560" height="20" uuid="5966313a-7392-4764-8a30-88b02b1a4ddd"/>
+				<reportElement positionType="Float" x="0" y="20" width="560" height="20" backcolor="#000000" uuid="5966313a-7392-4764-8a30-88b02b1a4ddd"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="472b7a4a-1c0a-435d-be31-eaa89fe541e6"/>
 					<box leftPadding="5" rightPadding="5">
@@ -122,7 +122,7 @@
 					<text><![CDATA[港口经营人]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="16000710-a42b-4886-b523-2df4e2565d6f"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="16000710-a42b-4886-b523-2df4e2565d6f"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -164,7 +164,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="40" width="560" height="20" uuid="65ab25ef-5f52-40d2-a558-66df387ead55"/>
+				<reportElement positionType="Float" x="0" y="40" width="560" height="20" backcolor="#000000" uuid="65ab25ef-5f52-40d2-a558-66df387ead55"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="a7ee3c43-a02a-4689-af7d-c021a340b0da"/>
 					<box leftPadding="5" rightPadding="5">
@@ -179,7 +179,7 @@
 					<text><![CDATA[港口经营许可证号]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="6ab6919e-5a95-423f-969b-d04f5ca8defc"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="6ab6919e-5a95-423f-969b-d04f5ca8defc"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -221,7 +221,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="60" width="560" height="20" uuid="d4a0ead7-f62e-48dc-8408-a54d895dc248"/>
+				<reportElement positionType="Float" x="0" y="60" width="560" height="20" backcolor="#000000" uuid="d4a0ead7-f62e-48dc-8408-a54d895dc248"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="275f7e47-173d-4deb-84e0-05dad978b451"/>
 					<box leftPadding="5" rightPadding="5">
@@ -236,7 +236,7 @@
 					<text><![CDATA[类别]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="440" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="5a55f929-8321-4e42-b4af-4ec904181b73"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="5a55f929-8321-4e42-b4af-4ec904181b73"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -251,7 +251,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="80" width="560" height="20" uuid="dd7c22cc-c6dd-454d-b6a0-8675aa97d61a"/>
+				<reportElement positionType="Float" x="0" y="80" width="560" height="20" backcolor="#000000" uuid="dd7c22cc-c6dd-454d-b6a0-8675aa97d61a"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="4ad85921-ed86-4729-bb54-036caa23c865"/>
 					<box leftPadding="5" rightPadding="5">
@@ -266,7 +266,7 @@
 					<text><![CDATA[办公地址]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="440" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="f2d4a245-d6b0-4b64-b060-7d3051107b83"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="f2d4a245-d6b0-4b64-b060-7d3051107b83"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -281,7 +281,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="100" width="560" height="20" uuid="d323fa31-8c6e-42dd-bed8-167cfe0debbf"/>
+				<reportElement positionType="Float" x="0" y="100" width="560" height="20" backcolor="#000000" uuid="d323fa31-8c6e-42dd-bed8-167cfe0debbf"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="2d1afc90-fde3-453e-ba50-871bbde55385"/>
 					<box leftPadding="5" rightPadding="5">
@@ -296,7 +296,7 @@
 					<text><![CDATA[有效期]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" pattern="yyyy-MM-dd" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="9446cf48-79f2-4a3b-b222-62112a4c3f1c"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="9446cf48-79f2-4a3b-b222-62112a4c3f1c"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -338,7 +338,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="120" width="560" height="20" uuid="0b7d575d-ce1f-4119-ac7c-cc77bcc309b4"/>
+				<reportElement positionType="Float" x="0" y="120" width="560" height="20" backcolor="#000000" uuid="0b7d575d-ce1f-4119-ac7c-cc77bcc309b4"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="56f6e33b-47f8-458e-9b2b-7b781e7c448e"/>
 					<box leftPadding="5" rightPadding="5">
@@ -353,7 +353,7 @@
 					<text><![CDATA[]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="86cebd9f-0a79-40db-b7f5-6b68febc7154"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="86cebd9f-0a79-40db-b7f5-6b68febc7154"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -394,7 +394,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="140" width="560" height="20" uuid="e73fb11b-ca36-4c70-8be3-e6952153b965"/>
+				<reportElement positionType="Float" x="0" y="140" width="560" height="20" backcolor="#000000" uuid="e73fb11b-ca36-4c70-8be3-e6952153b965"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="cfb56f14-4d5e-4405-87c9-129eef4b820a"/>
 					<box leftPadding="5" rightPadding="5">
@@ -409,7 +409,7 @@
 					<text><![CDATA[经营范围]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="440" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="18da740f-7065-4a92-a166-f4497afa7da5"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="18da740f-7065-4a92-a166-f4497afa7da5"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -424,7 +424,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="160" width="560" height="20" uuid="e6d7e75e-a92d-449f-b451-c9d1a5ecadc6"/>
+				<reportElement positionType="Float" x="0" y="160" width="560" height="20" backcolor="#000000" uuid="e6d7e75e-a92d-449f-b451-c9d1a5ecadc6"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="e24cb324-fa1f-40ed-af29-ea450aeadded"/>
 					<box leftPadding="5" rightPadding="5">
@@ -439,7 +439,7 @@
 					<text><![CDATA[经营区域]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="440" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="dbe5e304-36fb-41aa-9c11-768b6e9dd67a"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="dbe5e304-36fb-41aa-9c11-768b6e9dd67a"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -454,7 +454,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="180" width="560" height="20" uuid="cfd44743-0882-4115-b57b-9cfdda4d7f70"/>
+				<reportElement positionType="Float" x="0" y="180" width="560" height="20" backcolor="#000000" uuid="cfd44743-0882-4115-b57b-9cfdda4d7f70"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="665e2b55-aa39-47e6-a88d-df8f7c42a7dc"/>
 					<box leftPadding="5" rightPadding="5">
@@ -469,7 +469,7 @@
 					<text><![CDATA[主营货种]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="440" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="e731e296-a6e6-4871-a8fd-987ccb8bdbad"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="e731e296-a6e6-4871-a8fd-987ccb8bdbad"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -484,7 +484,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="200" width="560" height="20" uuid="b36ec7da-68a7-4215-9146-98398918e2b2"/>
+				<reportElement positionType="Float" x="0" y="200" width="560" height="20" backcolor="#000000" uuid="b36ec7da-68a7-4215-9146-98398918e2b2"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="c383f895-5df0-49d9-9570-c6f25925c8e5"/>
 					<box leftPadding="5" rightPadding="0">
@@ -499,7 +499,7 @@
 					<text><![CDATA[联系电话（法定代表人）]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="2fef613f-373f-4d03-a328-324aae13fd22"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="2fef613f-373f-4d03-a328-324aae13fd22"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -541,7 +541,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="220" width="560" height="20" uuid="3c07e396-9a6a-449d-bc20-25732aedc59b"/>
+				<reportElement positionType="Float" x="0" y="220" width="560" height="20" backcolor="#000000" uuid="3c07e396-9a6a-449d-bc20-25732aedc59b"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="ae0799e2-9231-4a37-8fe7-173adf414991"/>
 					<box leftPadding="5" rightPadding="5">
@@ -556,7 +556,7 @@
 					<text><![CDATA[安全部门负责人]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="bdcbf8a3-4e2d-4a84-bf9a-437b2ab91b8a"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="bdcbf8a3-4e2d-4a84-bf9a-437b2ab91b8a"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -598,7 +598,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="240" width="560" height="20" uuid="b482da98-f6c3-48de-98f9-4c0c804a4e56"/>
+				<reportElement positionType="Float" x="0" y="240" width="560" height="20" backcolor="#000000" uuid="b482da98-f6c3-48de-98f9-4c0c804a4e56"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="6d4a1bf5-e7db-44a7-b8d8-3270acac718e"/>
 					<box leftPadding="5" rightPadding="5">
@@ -613,7 +613,7 @@
 					<text><![CDATA[手机（安全部门）]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="a3f18724-e792-4c46-88a5-1184c7f7d7c2"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="a3f18724-e792-4c46-88a5-1184c7f7d7c2"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -655,7 +655,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="260" width="560" height="20" uuid="faf058de-a5e4-4205-b597-789f61bbe3f2"/>
+				<reportElement positionType="Float" x="0" y="260" width="560" height="20" backcolor="#000000" uuid="faf058de-a5e4-4205-b597-789f61bbe3f2"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="c28e56e1-ef3d-46bb-8bbf-bf7964734879"/>
 					<box leftPadding="5" rightPadding="5">
@@ -670,7 +670,7 @@
 					<text><![CDATA[安全主管部门]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="4970a8bf-d379-481a-82ba-86e8897f2df5"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="4970a8bf-d379-481a-82ba-86e8897f2df5"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -712,7 +712,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="280" width="560" height="20" uuid="b0335321-c631-4472-ba15-0026dd4a149e"/>
+				<reportElement positionType="Float" x="0" y="280" width="560" height="20" backcolor="#000000" uuid="b0335321-c631-4472-ba15-0026dd4a149e"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="22836601-dfcf-4c2f-b620-c677633f2be4"/>
 					<box leftPadding="5" rightPadding="5">
@@ -727,7 +727,7 @@
 					<text><![CDATA[专职安管人员数量]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="a05fce90-28e4-4836-8bbd-2ae71ac2637e"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="a05fce90-28e4-4836-8bbd-2ae71ac2637e"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -769,7 +769,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="300" width="560" height="20" uuid="e9b3b4cb-19e0-42f8-accf-7c208782df34"/>
+				<reportElement positionType="Float" x="0" y="300" width="560" height="20" backcolor="#000000" uuid="e9b3b4cb-19e0-42f8-accf-7c208782df34"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="39a0e4f8-7c2e-4214-a7ba-18e1a98ab755"/>
 					<box leftPadding="5" rightPadding="5">
@@ -784,7 +784,7 @@
 					<text><![CDATA[销售金额]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="dd183655-542c-4552-b6f4-460da6bf743d"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="dd183655-542c-4552-b6f4-460da6bf743d"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -826,7 +826,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="320" width="560" height="20" uuid="fa2cb80f-2156-4163-a310-5a5ea12df71b"/>
+				<reportElement positionType="Float" x="0" y="320" width="560" height="20" backcolor="#000000" uuid="fa2cb80f-2156-4163-a310-5a5ea12df71b"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="65ba3abc-61cf-4b57-82ed-bacd02d46331"/>
 					<box leftPadding="5" rightPadding="5">
@@ -841,7 +841,7 @@
 					<text><![CDATA[投资总额（万元）]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="3ae54620-9928-40f8-b74d-13b47ee558b4"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="3ae54620-9928-40f8-b74d-13b47ee558b4"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -883,7 +883,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="340" width="560" height="20" uuid="ba0cb52f-17cd-480b-bdfa-60216540128d"/>
+				<reportElement positionType="Float" x="0" y="340" width="560" height="20" backcolor="#000000" uuid="ba0cb52f-17cd-480b-bdfa-60216540128d"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="9dc42087-30eb-4b0c-886b-46090d966e09"/>
 					<box leftPadding="5" rightPadding="5">
@@ -898,7 +898,7 @@
 					<text><![CDATA[企业组织机构代码]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="6af0caa2-4c97-40b6-851e-3fc98b97738b"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="6af0caa2-4c97-40b6-851e-3fc98b97738b"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -940,7 +940,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="360" width="560" height="20" uuid="862421f0-f375-4542-9865-04e1a6c2daea"/>
+				<reportElement positionType="Float" x="0" y="360" width="560" height="20" backcolor="#000000" uuid="862421f0-f375-4542-9865-04e1a6c2daea"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="516af134-bca4-4738-9e63-74c38f848569"/>
 					<box leftPadding="5" rightPadding="5">
@@ -955,7 +955,7 @@
 					<text><![CDATA[所属行业中类]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="f545f7d7-9a49-4183-b11d-072628586448"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="f545f7d7-9a49-4183-b11d-072628586448"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -997,7 +997,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="380" width="560" height="20" uuid="5d50cbf6-d520-4505-a667-2bf3dc714fd6"/>
+				<reportElement positionType="Float" x="0" y="380" width="560" height="20" backcolor="#000000" uuid="5d50cbf6-d520-4505-a667-2bf3dc714fd6"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="54f6f243-bb60-4c5c-ab70-d947c2241e8d"/>
 					<box leftPadding="5" rightPadding="5">
@@ -1012,7 +1012,7 @@
 					<text><![CDATA[人数]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="7fb792a4-e34f-49f3-8c6b-098474ed1180"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="7fb792a4-e34f-49f3-8c6b-098474ed1180"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -1054,7 +1054,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="400" width="560" height="20" uuid="cf0c0112-57d6-4d77-9f6f-8b79a189a4cf"/>
+				<reportElement positionType="Float" x="0" y="400" width="560" height="20" backcolor="#000000" uuid="cf0c0112-57d6-4d77-9f6f-8b79a189a4cf"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="b28cfa5a-3b21-4548-b354-1dbb541827a8"/>
 					<box leftPadding="5" rightPadding="5">
@@ -1069,7 +1069,7 @@
 					<text><![CDATA[]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="d5a79401-5c86-40ac-820c-701cec611f94"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="d5a79401-5c86-40ac-820c-701cec611f94"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -1110,7 +1110,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="420" width="560" height="30" uuid="363ac9cc-e145-44cb-9e6c-86c4695d9694"/>
+				<reportElement positionType="Float" x="0" y="420" width="560" height="30" backcolor="#000000" uuid="363ac9cc-e145-44cb-9e6c-86c4695d9694"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="30" uuid="8a331fb9-7f9d-4b0e-bf0c-fbcc72ee04e0"/>
 					<box leftPadding="5" rightPadding="5">
@@ -1125,7 +1125,7 @@
 					<text><![CDATA[港口危险货物作业附证编号]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="440" height="30" forecolor="#000000" backcolor="#FFFFFF" uuid="12b70078-3e00-4d77-860e-0f7c6da1ec4f"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="428" height="30" forecolor="#000000" backcolor="#FFFFFF" uuid="12b70078-3e00-4d77-860e-0f7c6da1ec4f"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -1140,7 +1140,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="450" width="560" height="20" uuid="67ba978b-4dd7-4e37-adc0-716d3f2aaf5c"/>
+				<reportElement positionType="Float" x="0" y="450" width="560" height="20" backcolor="#000000" uuid="67ba978b-4dd7-4e37-adc0-716d3f2aaf5c"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="1bf49233-bd98-42ef-9857-3d005722059b"/>
 					<box leftPadding="5" rightPadding="5">
@@ -1155,7 +1155,7 @@
 					<text><![CDATA[]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="e12a522c-e074-4f0d-9377-fedd186eabe7"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="e12a522c-e074-4f0d-9377-fedd186eabe7"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -1196,7 +1196,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="470" width="560" height="20" uuid="b50e4dd2-2dc7-4f3a-b29a-c6a68862caeb"/>
+				<reportElement positionType="Float" x="0" y="470" width="560" height="20" backcolor="#000000" uuid="b50e4dd2-2dc7-4f3a-b29a-c6a68862caeb"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="cb1d03e1-a6a7-4315-bc92-341a7616bad5"/>
 					<box leftPadding="5" rightPadding="5">
@@ -1211,7 +1211,7 @@
 					<text><![CDATA[有效期]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" pattern="yyyy-MM-dd" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="60db7124-da38-4693-9a0e-ac02999f1285"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="60db7124-da38-4693-9a0e-ac02999f1285"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -1253,7 +1253,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="490" width="560" height="20" uuid="55e01bfc-3581-4592-ae92-8cdb774f8c51"/>
+				<reportElement positionType="Float" x="0" y="490" width="560" height="20" backcolor="#000000" uuid="55e01bfc-3581-4592-ae92-8cdb774f8c51"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="2888a30c-a365-4d02-98c7-f23646014286"/>
 					<box leftPadding="5" rightPadding="5">
@@ -1268,7 +1268,7 @@
 					<text><![CDATA[]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="160" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="35ef4f13-258e-4133-9417-d2b9dc7d5ff4"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="35ef4f13-258e-4133-9417-d2b9dc7d5ff4"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -1309,7 +1309,7 @@
 				</textField>
 			</frame>
 			<frame>
-				<reportElement positionType="Float" x="0" y="510" width="560" height="20" uuid="2bb07e30-39f2-4886-ba0b-d778953fc0df"/>
+				<reportElement positionType="Float" x="0" y="510" width="560" height="24" backcolor="#000000" uuid="2bb07e30-39f2-4886-ba0b-d778953fc0df"/>
 				<staticText>
 					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="7063ef1a-ac6f-4490-91e1-c7191f24e9b1"/>
 					<box leftPadding="5" rightPadding="5">
@@ -1324,7 +1324,7 @@
 					<text><![CDATA[作业危险货物品名]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="440" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="8277c253-f704-418b-942b-592a95b846d3"/>
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="8277c253-f704-418b-942b-592a95b846d3"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -1339,32 +1339,32 @@
 				</textField>
 			</frame>
 			<subreport isUsingCache="false">
-				<reportElement positionType="Float" x="0" y="530" width="560" height="40" uuid="3a6f6d91-20b4-4e3f-9a2e-015c4a097808"/>
+				<reportElement positionType="Float" x="0" y="550" width="548" height="40" uuid="3a6f6d91-20b4-4e3f-9a2e-015c4a097808"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{fzList})]]></dataSourceExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_fz.jasper"]]></subreportExpression>
 			</subreport>
 			<subreport isUsingCache="false">
-				<reportElement positionType="Float" x="0" y="570" width="560" height="40" uuid="2ebbc611-904a-4df6-b6f6-d2e6ffedfb75"/>
+				<reportElement positionType="Float" x="0" y="590" width="548" height="40" uuid="2ebbc611-904a-4df6-b6f6-d2e6ffedfb75"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{bwList})]]></dataSourceExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_bw.jasper"]]></subreportExpression>
 			</subreport>
 			<subreport isUsingCache="false">
-				<reportElement positionType="Float" x="0" y="610" width="560" height="40" uuid="92a3a441-09e2-4300-bb1f-030823a16845"/>
+				<reportElement positionType="Float" x="0" y="630" width="548" height="40" uuid="92a3a441-09e2-4300-bb1f-030823a16845"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{dcList})]]></dataSourceExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_dc.jasper"]]></subreportExpression>
 			</subreport>
 			<subreport isUsingCache="false">
-				<reportElement positionType="Float" x="0" y="650" width="560" height="40" uuid="6822fd28-a1da-45ed-89e1-195bb929f136"/>
+				<reportElement positionType="Float" x="0" y="670" width="548" height="40" uuid="6822fd28-a1da-45ed-89e1-195bb929f136"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{ckList})]]></dataSourceExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_ck.jasper"]]></subreportExpression>
 			</subreport>
 			<subreport isUsingCache="false">
-				<reportElement positionType="Float" x="0" y="690" width="560" height="40" uuid="9389fdb3-a977-4735-9167-2e44a7817169"/>
+				<reportElement positionType="Float" x="0" y="710" width="548" height="40" uuid="9389fdb3-a977-4735-9167-2e44a7817169"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{cgList})]]></dataSourceExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_cg.jasper"]]></subreportExpression>
 			</subreport>
 			<subreport isUsingCache="false">
-				<reportElement positionType="Float" x="0" y="730" width="560" height="40" uuid="1c8ff2c6-6b4c-4acc-8fac-ae75b5a209e5"/>
+				<reportElement positionType="Float" x="0" y="750" width="548" height="40" uuid="1c8ff2c6-6b4c-4acc-8fac-ae75b5a209e5"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{mtList})]]></dataSourceExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_mt.jasper"]]></subreportExpression>
 			</subreport>

gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_bw.jrxml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_bw" language="groovy" pageWidth="560" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="560" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a7ed9b62-0a29-4144-ab6f-42ef25fff83d">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_bw" language="groovy" pageWidth="547" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="547" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a7ed9b62-0a29-4144-ab6f-42ef25fff83d">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -153,7 +153,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="560" height="30" uuid="17f707f3-dea6-4508-b329-01370893e24c"/>
+				<reportElement x="0" y="0" width="547" height="30" uuid="17f707f3-dea6-4508-b329-01370893e24c"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -164,7 +164,7 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="90" height="20" uuid="6295e3a7-97d6-4d34-9332-c6ad926add85"/>
+				<reportElement x="0" y="0" width="80" height="20" uuid="6295e3a7-97d6-4d34-9332-c6ad926add85"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -177,7 +177,7 @@
 				<text><![CDATA[泊位名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="90" y="0" width="95" height="20" uuid="97e8ab70-e6ad-40df-8c49-77c0f9479511"/>
+				<reportElement x="80" y="0" width="95" height="20" uuid="97e8ab70-e6ad-40df-8c49-77c0f9479511"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -190,7 +190,7 @@
 				<text><![CDATA[码头名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="185" y="0" width="105" height="20" uuid="217e1d8f-74dd-4187-8580-d4ee68b13714"/>
+				<reportElement x="175" y="0" width="102" height="20" isPrintWhenDetailOverflows="true" uuid="217e1d8f-74dd-4187-8580-d4ee68b13714"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -203,7 +203,7 @@
 				<text><![CDATA[设计靠泊能力（万吨）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="290" y="0" width="105" height="20" uuid="5b5e7afe-c029-455f-b4de-9e2551a315ca"/>
+				<reportElement x="277" y="0" width="105" height="20" isPrintWhenDetailOverflows="true" uuid="5b5e7afe-c029-455f-b4de-9e2551a315ca"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -216,7 +216,7 @@
 				<text><![CDATA[核查靠泊能力（万吨）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="395" y="0" width="75" height="20" uuid="cbf4b5a0-385c-4484-9917-615fcd2d671a"/>
+				<reportElement x="382" y="0" width="75" height="20" isPrintWhenDetailOverflows="true" uuid="cbf4b5a0-385c-4484-9917-615fcd2d671a"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -229,7 +229,7 @@
 				<text><![CDATA[泊位长度（米）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="470" y="0" width="90" height="20" uuid="65480d93-a1f2-4c0e-9b43-4d4ec7d7330a"/>
+				<reportElement x="457" y="0" width="90" height="20" uuid="65480d93-a1f2-4c0e-9b43-4d4ec7d7330a"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -246,7 +246,7 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="90" height="20" uuid="f4f52e11-20a8-44f4-b10b-d9a054ad90cb"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="f4f52e11-20a8-44f4-b10b-d9a054ad90cb"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -259,7 +259,7 @@
 				<textFieldExpression><![CDATA[$F{bwmc}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="90" y="0" width="95" height="20" uuid="9ad5613f-3b26-47c0-9c21-2d694aa8d202"/>
+				<reportElement stretchType="RelativeToTallestObject" x="80" y="0" width="95" height="20" isPrintWhenDetailOverflows="true" uuid="9ad5613f-3b26-47c0-9c21-2d694aa8d202"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -271,8 +271,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{mtmc}.getMtmc()]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="185" y="0" width="105" height="20" uuid="0f26a0b6-6d2c-4673-951d-ac315f13f13a"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="175" y="0" width="102" height="20" isPrintWhenDetailOverflows="true" uuid="0f26a0b6-6d2c-4673-951d-ac315f13f13a"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -284,8 +284,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sjkpnl}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="290" y="0" width="105" height="20" uuid="9443f6dc-7e69-4bba-8309-30c8f75db011"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="277" y="0" width="105" height="20" isPrintWhenDetailOverflows="true" uuid="9443f6dc-7e69-4bba-8309-30c8f75db011"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -297,8 +297,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{hckpnl}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="395" y="0" width="75" height="20" uuid="466769af-7ad5-422e-a2e7-19e4b2e806b6"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="382" y="0" width="75" height="20" isPrintWhenDetailOverflows="true" uuid="466769af-7ad5-422e-a2e7-19e4b2e806b6"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -311,7 +311,7 @@
 				<textFieldExpression><![CDATA[$F{bwcd}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="470" y="0" width="90" height="20" uuid="fbd79eb0-6ec0-410b-99f2-9e38b56ef86d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="457" y="0" width="90" height="20" isPrintWhenDetailOverflows="true" uuid="fbd79eb0-6ec0-410b-99f2-9e38b56ef86d"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>

gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_cg.jrxml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_dc" language="groovy" pageWidth="560" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="560" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cdd1edfc-a777-414a-986f-f804e59bac63">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_dc" language="groovy" pageWidth="547" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="547" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cdd1edfc-a777-414a-986f-f804e59bac63">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -231,7 +231,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="560" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
+				<reportElement x="0" y="0" width="547" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -242,7 +242,7 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="140" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
+				<reportElement x="0" y="0" width="124" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -255,7 +255,7 @@
 				<text><![CDATA[储罐名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="140" y="0" width="140" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
+				<reportElement x="124" y="0" width="140" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -268,7 +268,7 @@
 				<text><![CDATA[储罐区名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="280" y="0" width="110" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
+				<reportElement x="264" y="0" width="110" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -281,7 +281,7 @@
 				<text><![CDATA[储罐区面积（平方米）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="390" y="0" width="75" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
+				<reportElement x="374" y="0" width="60" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -294,7 +294,7 @@
 				<text><![CDATA[储罐个数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="465" y="0" width="95" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
+				<reportElement x="434" y="0" width="112" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -310,8 +310,8 @@
 	</columnHeader>
 	<detail>
 		<band height="20" splitType="Stretch">
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="140" height="20" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
+			<textField isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="124" height="20" isPrintWhenDetailOverflows="true" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -323,8 +323,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cgmc}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="140" y="0" width="140" height="20" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
+			<textField isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="124" y="0" width="140" height="20" isPrintWhenDetailOverflows="true" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -336,8 +336,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cgqmc}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="280" y="0" width="110" height="20" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="264" y="0" width="110" height="20" isPrintWhenDetailOverflows="true" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -349,8 +349,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cgqmj}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="390" y="0" width="75" height="20" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="374" y="0" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -362,8 +362,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{cggs}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="465" y="0" width="95" height="20" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="434" y="0" width="112" height="20" isPrintWhenDetailOverflows="true" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>

gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_ck.jrxml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_dc" language="groovy" pageWidth="560" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="560" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cdd1edfc-a777-414a-986f-f804e59bac63">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_dc" language="groovy" pageWidth="547" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="547" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cdd1edfc-a777-414a-986f-f804e59bac63">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -123,7 +123,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="560" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
+				<reportElement x="0" y="0" width="547" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -134,7 +134,7 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="130" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
+				<reportElement x="0" y="0" width="125" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -147,7 +147,7 @@
 				<text><![CDATA[仓库名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="130" y="0" width="80" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
+				<reportElement x="125" y="0" width="80" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -157,10 +157,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="10"/>
 				</textElement>
-				<text><![CDATA[仓库个数]]></text>
+				<text><![CDATA[仓库个数（个）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="210" y="0" width="150" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
+				<reportElement x="205" y="0" width="166" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -173,7 +173,7 @@
 				<text><![CDATA[仓库用途]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="360" y="0" width="100" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
+				<reportElement x="371" y="0" width="87" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -186,7 +186,7 @@
 				<text><![CDATA[仓库面积]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="460" y="0" width="100" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
+				<reportElement x="458" y="0" width="88" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -203,7 +203,7 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="130" height="20" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="125" height="20" isPrintWhenDetailOverflows="true" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -215,8 +215,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{ckmc}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="130" y="0" width="80" height="20" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="125" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -229,7 +229,7 @@
 				<textFieldExpression><![CDATA[$F{ckgs}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="210" y="0" width="150" height="20" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
+				<reportElement stretchType="RelativeToTallestObject" x="205" y="0" width="166" height="20" isPrintWhenDetailOverflows="true" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -241,8 +241,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{zwckyt}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="360" y="0" width="100" height="20" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="371" y="0" width="87" height="20" isPrintWhenDetailOverflows="true" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -254,8 +254,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{scyckmj}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="460" y="0" width="100" height="20" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="458" y="0" width="88" height="20" isPrintWhenDetailOverflows="true" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>

gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_dc.jrxml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_dc" language="groovy" pageWidth="555" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cdd1edfc-a777-414a-986f-f804e59bac63">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_dc" language="groovy" pageWidth="547" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="547" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cdd1edfc-a777-414a-986f-f804e59bac63">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -117,7 +117,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="555" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
+				<reportElement x="0" y="0" width="547" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -128,7 +128,7 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="130" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
+				<reportElement x="0" y="0" width="116" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -141,7 +141,7 @@
 				<text><![CDATA[堆场名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="130" y="0" width="140" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
+				<reportElement x="116" y="0" width="141" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -154,7 +154,7 @@
 				<text><![CDATA[主要用途]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="270" y="0" width="110" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
+				<reportElement x="257" y="0" width="110" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -167,7 +167,7 @@
 				<text><![CDATA[堆场总面积（平方米）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="380" y="0" width="90" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
+				<reportElement x="367" y="0" width="90" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -180,7 +180,7 @@
 				<text><![CDATA[堆场总容量（吨）]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="470" y="0" width="85" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
+				<reportElement x="457" y="0" width="90" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -197,7 +197,7 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="130" height="20" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="116" height="20" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -210,7 +210,7 @@
 				<textFieldExpression><![CDATA[$F{dcmc}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="130" y="0" width="140" height="20" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="116" y="0" width="141" height="20" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -222,8 +222,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{zwdcyt}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="270" y="0" width="110" height="20" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="257" y="0" width="110" height="20" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -235,8 +235,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{dczmj}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="470" y="0" width="85" height="20" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="457" y="0" width="90" height="20" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -248,8 +248,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{wxpdc}=="Y"?"是":"否"]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="380" y="0" width="90" height="20" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="367" y="0" width="90" height="20" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>

gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_fz.jrxml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_fz" language="groovy" pageWidth="560" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="560" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f8ec6a28-d893-4aa5-b476-1bc970e2811e">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_fz" language="groovy" pageWidth="547" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="547" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f8ec6a28-d893-4aa5-b476-1bc970e2811e">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -93,7 +93,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="560" height="30" uuid="aae536b5-7143-4b68-b04a-119e2f7be77b"/>
+				<reportElement x="0" y="0" width="547" height="30" uuid="aae536b5-7143-4b68-b04a-119e2f7be77b"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -104,7 +104,7 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="170" height="20" uuid="33e0c774-a8a1-4172-8f74-6b36546d084c"/>
+				<reportElement x="170" y="0" width="222" height="20" uuid="33e0c774-a8a1-4172-8f74-6b36546d084c"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -117,7 +117,7 @@
 				<text><![CDATA[附证编号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Transparent" x="170" y="0" width="80" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="1f2295f1-76d4-4432-b710-bcf5f40a8a42"/>
+				<reportElement mode="Transparent" x="0" y="0" width="170" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="1f2295f1-76d4-4432-b710-bcf5f40a8a42"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -131,21 +131,7 @@
 				<text><![CDATA[作业地点]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Transparent" x="250" y="0" width="180" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="f6f45b83-af3b-4418-894d-47fdb0626a86"/>
-				<box>
-					<topPen lineWidth="0.5"/>
-					<leftPen lineWidth="0.5"/>
-					<bottomPen lineWidth="0.5"/>
-					<rightPen lineWidth="0.5"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="宋体" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<text><![CDATA[附证场所编号]]></text>
-			</staticText>
-			<staticText>
-				<reportElement mode="Transparent" x="430" y="0" width="130" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="c0934221-c942-4302-954d-d18f6983351e"/>
+				<reportElement mode="Transparent" x="392" y="0" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="c0934221-c942-4302-954d-d18f6983351e"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -163,7 +149,7 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="170" height="20" uuid="8f2e2f73-94c1-4fd7-963b-5d51dbf3b45f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="170" y="0" width="222" height="20" isPrintWhenDetailOverflows="true" uuid="8f2e2f73-94c1-4fd7-963b-5d51dbf3b45f"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -173,10 +159,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Serif"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{fzsq}.getBh()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{fzcsbh}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="170" y="0" width="80" height="20" uuid="dfa48ca3-bfc5-458d-ba65-8d2637e31211"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="170" height="20" isPrintWhenDetailOverflows="true" uuid="dfa48ca3-bfc5-458d-ba65-8d2637e31211"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -189,20 +175,7 @@
 				<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{zycs}.getName())]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="250" y="0" width="180" height="20" uuid="c568c983-b665-4e83-93b2-8e9d0d8b6ed8"/>
-				<box leftPadding="5">
-					<topPen lineWidth="0.5"/>
-					<leftPen lineWidth="0.5"/>
-					<bottomPen lineWidth="0.5"/>
-					<rightPen lineWidth="0.5"/>
-				</box>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Serif"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{fzcsbh}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="430" y="0" width="130" height="20" uuid="cb779700-9d5a-425d-b38f-8c4352a489fd"/>
+				<reportElement stretchType="RelativeToTallestObject" x="392" y="0" width="155" height="20" isPrintWhenDetailOverflows="true" uuid="cb779700-9d5a-425d-b38f-8c4352a489fd"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>

gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_mt.jrxml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_dc" language="groovy" pageWidth="560" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="560" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cdd1edfc-a777-414a-986f-f804e59bac63">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_dc" language="groovy" pageWidth="547" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="547" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cdd1edfc-a777-414a-986f-f804e59bac63">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -108,7 +108,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="560" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
+				<reportElement x="0" y="0" width="547" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -119,7 +119,7 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="160" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
+				<reportElement x="0" y="0" width="124" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -132,7 +132,7 @@
 				<text><![CDATA[码头名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="160" y="0" width="100" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
+				<reportElement x="124" y="0" width="100" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -145,7 +145,7 @@
 				<text><![CDATA[年货物通过能力]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="260" y="0" width="100" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
+				<reportElement x="224" y="0" width="100" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -158,7 +158,7 @@
 				<text><![CDATA[设计货物吞吐量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="360" y="0" width="100" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
+				<reportElement x="324" y="0" width="100" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -171,7 +171,7 @@
 				<text><![CDATA[设计旅客吞吐量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="460" y="0" width="100" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
+				<reportElement x="424" y="0" width="123" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -188,7 +188,7 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="160" height="20" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="124" height="20" isPrintWhenDetailOverflows="true" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -200,8 +200,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{mtmc}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="160" y="0" width="100" height="20" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="124" y="0" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -213,8 +213,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nhwtgnl}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="260" y="0" width="100" height="20" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="224" y="0" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -226,8 +226,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sjhwttl}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="360" y="0" width="100" height="20" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="324" y="0" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -239,8 +239,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sjlkttl}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="460" y="0" width="100" height="20" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="424" y="0" width="123" height="20" isPrintWhenDetailOverflows="true" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -26,7 +26,7 @@ web.service.url=192.168.57.76
 web.service.port=8089
 
 # Province WebService 
-web.province.service.url=192.168.57.71
+web.province.service.url=192.168.57.36
 web.province.service.port=8089
 
 #\u4f5c\u4e1a\u7533\u62a5\uff0c\u95f4\u9694\u7684\u65f6\u95f4\uff0c\u5fc5\u987b\u5b8c\u6210

gkaq/yjpt-java/trunk/resources/spring/applicationContext.xml

@@ -183,7 +183,10 @@
         <!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	<!--/bean> 
 	<bean id="whzrsbJob" class="com.jtgh.yjpt.common.servlet.WhzyValid"/--> 
-	<!-- 经营人的定时任务-->
+	
+	
+	<!-- ******************************quartz定时任务********************************* -->
+	<!-- quartz定时任务设置及相关trigger引用 -->
 	<bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">  
        <property name="triggers">  
            <list>  
@@ -200,7 +203,10 @@
            </list>  
        </property>  
        <property name="autoStartup" value="true"/>  
-	</bean>  
+	</bean> 
+	
+	<!-- ******************************1****************************** -->
+	<!-- trigger:jyrSynTimerTrigger -->
 	<bean id="jyrSynTimerTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
        <property name="jobDetail" ref="jyrSynTimejobDetail"/>  
        <property name="cronExpression" value="0 30 1 * * ?"/>
@@ -212,6 +218,9 @@
         <!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
 	<bean id="jyrSynTimer" class="com.jtgh.yjpt.common.systimer.JyrSynTimer"/> 
+	
+	<!-- ******************************2****************************** -->
+	<!-- trigger:baTrigger -->
 	<!-- 安全备案模块的同步 -->
 	<bean id="baTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="baJobDetail"/>  
@@ -224,6 +233,9 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
 	<bean id="baJob" class="com.jtgh.yjpt.common.systimer.BaSycn"/> 
+	
+	<!-- ******************************3****************************** -->
+	<!-- trigger:spTrigger -->
 	<!-- 安全审批模块的同步 -->
 	<bean id="spTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="spJobDetail"/>  
@@ -235,11 +247,14 @@
 		<property name="concurrent" value="false"/>
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
-	<bean id="spJob" class="com.jtgh.yjpt.common.systimer.SpSycn"/> 
+	<bean id="spJob" class="com.jtgh.yjpt.common.systimer.SpSycn"/>
+	
+	<!-- ******************************4****************************** -->
+	<!-- trigger:zcdcTrigger -->
 	<!-- 自查督查的同步 -->
 	<bean id="zcdcTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="zcdcJobDetail"/>  
-		<property name="cronExpression" value="0 0 3 * * ?"/>
+		<property name="cronExpression" value="0 0/1 * * * ?"/>
 	</bean> 
 	<bean id="zcdcJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">   
 		<property name="targetObject" ref="zcdcJob"/>  
@@ -248,10 +263,13 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
 	<bean id="zcdcJob" class="com.jtgh.yjpt.common.systimer.ZcdcSycn"/> 
+	
+	<!-- ******************************5****************************** -->
+	<!-- trigger:taskTrigger -->	
 	<!-- 任务的同步 -->
 	<bean id="taskTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="taskJobDetail"/>  
-		<property name="cronExpression" value="0 0/10 * * * ?"/>
+		<property name="cronExpression" value="0 0 * * * ?"/>
 	</bean> 
 	<bean id="taskJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">   
 		<property name="targetObject" ref="taskJob"/>  
@@ -260,6 +278,9 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
 	<bean id="taskJob" class="com.jtgh.yjpt.common.systimer.TaskSycn"/> 
+	
+	<!-- ******************************6****************************** -->
+	<!-- trigger:yjglSynTimerTrigger -->
 	<!-- 应急管理模块 -->
 	<bean id="yjglSynTimerTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
        <property name="jobDetail" ref="yjglSynTimerjobDetail"/>  
@@ -271,8 +292,10 @@
         <property name="concurrent" value="true"/>
         <!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
+	<bean id="yjglSynTimer" class="com.jtgh.yjpt.common.systimer.YjglSynTimer"/>
 	
-	<bean id="yjglSynTimer" class="com.jtgh.yjpt.common.systimer.YjglSynTimer"/> 
+	<!-- ******************************7****************************** -->
+	<!-- trigger:sysSynTimerTrigger -->
 	<!-- 系统设置模块 -->
 	<bean id="sysSynTimerTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
        <property name="jobDetail" ref="sysSynTimerjobDetail"/>  
@@ -284,9 +307,10 @@
         <property name="concurrent" value="true"/>
         <!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
-	
 	<bean id="sysSynTimer" class="com.jtgh.yjpt.common.systimer.SysSynTimer"/> 
 	
+	<!-- ******************************8****************************** -->
+	<!-- trigger:yhTxTrigger -->
 	<!-- 每月上报隐患到期提醒 -->
 	<bean id="yhTxTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
 		<property name="jobDetail" ref="yhTxJobDetail"/>
@@ -299,7 +323,9 @@
 	</bean>
 	<bean id="yhTxJob" class="com.jtgh.yjpt.common.systimer.YhTxTimer"/>
 	
-		<!--海事数据的获取 -->
+	<!-- ******************************9****************************** -->
+	<!-- trigger:hsTrigger -->
+	<!--海事数据的获取 -->
 	<bean id="hsDataGetTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="hsJobDataGetDetail"/>  
 		<property name="cronExpression" value="0 0-20/10 * * * ?"/>
@@ -312,6 +338,8 @@
 	 </bean> 
 	<bean id="hsDataGetJob" class="com.jtgh.yjpt.common.systimer.HsDataGet"/>
 	
+	<!-- ******************************10****************************** -->
+	<!-- trigger:hsDataGetTrigger -->
 	<!--海事的同步 -->
 	<bean id="hsTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="hsJobDetail"/>  
@@ -324,4 +352,5 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	 </bean> 
 	<bean id="hsJob" class="com.jtgh.yjpt.common.systimer.HsSycn"/>
+	
 </beans>

gkaq/yjpt-java/trunk/yjpt/WEB-INF/lib/jyr.jrxml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr" language="groovy" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="65f58359-d5f3-469d-8e77-e695bf345f58">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="50" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="0" width="555" height="50" uuid="202acbd2-35ae-4e0c-90d5-96d8a1840880"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="24" isBold="true"/>
+				</textElement>
+				<text><![CDATA[经营人基础信息]]></text>
+			</staticText>
+		</band>
+	</title>
+	<detail>
+		<band height="125" splitType="Stretch">
+			<frame>
+				<reportElement positionType="Float" x="0" y="0" width="560" height="20" uuid="51c0c5b6-1cde-4653-aa41-f43f091bf464"/>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="125" height="20" uuid="0fe15b02-e234-4e4f-81ee-449a4e0188b5"/>
+					<box leftPadding="5" rightPadding="5">
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[所在港区]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="0" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="ea4b9555-76ba-453a-9e0e-c470be9c13f2"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="82d54cf6-f91e-4b56-a6b1-533c8e97e8b9"/>
+					<box leftPadding="5" rightPadding="5">
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[所在地]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="b38589ff-a9fc-49c7-a458-b52a18fa4a32"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+				</textField>
+			</frame>
+		</band>
+	</detail>
+	<columnFooter>
+		<band height="45" splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="54" splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="42" splitType="Stretch"/>
+	</summary>
+</jasperReport>

gkaq/yjpt-java/trunk/yjpt/WEB-INF/lib/report1.jrxml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" language="groovy" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="09f98f28-e6bd-4745-bc61-8fe82112b439">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="79" splitType="Stretch"/>
+	</title>
+	<pageHeader>
+		<band height="35" splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band height="61" splitType="Stretch"/>
+	</columnHeader>
+	<detail>
+		<band height="125" splitType="Stretch"/>
+	</detail>
+	<columnFooter>
+		<band height="45" splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="54" splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="42" splitType="Stretch"/>
+	</summary>
+</jasperReport>

gkaq/yjpt-java/trunk/yjpt/WEB-INF/web.xml

@@ -103,7 +103,7 @@
 	<context-param>
 		<description>是否jax-ws同步(Y/N)</description>
 		<param-name>jaxws_sync</param-name>
-		<param-value>N</param-value>
+		<param-value>Y</param-value>
 	</context-param>
 	<context-param>
 		<description>同步UserId</description>

gkaq/yjpt-java/trunk/yjpt/iSignature/jspServer/OfficeServer.jsp

@@ -479,7 +479,7 @@
       try {
     	  
   		targetUrl+=mRecordID;
-      	//String targetUrl= "http://192.168.57.76:8080/yjpt/GetmSignatureData.do?documentID=" + mRecordID ;
+      	//String targetUrl= "http://192.168.57.76:8080/yjpt/GetSignatureData.do?documentID=" + mRecordID ;
 		URL url = new URL(targetUrl);
 		HttpURLConnection connection = (HttpURLConnection) url
 				.openConnection();// 此时cnnection只是为一个连接对象,待连接中 
@@ -842,7 +842,7 @@
       //获得应用服务器起地址端口等相关信息初始化获得数据的接口的url
       targetUrl = "http://" + request.getServerName() + ":"
    				+ request.getServerPort() + request.getContextPath()
-   				+ "/GetmSignatureData.do" + "?documentID=";
+   				+ "/GetSignatureData.do" + "?documentID=";
     	
       DbaObj = new DBstep.iDBManager2000(); //创建数据库对象
       MsgObj = new DBstep.iMsgServer2000(); //创建信息包对象

gkaq/yjpt-java/trunk/yjpt/iSignature/jspServer/Service.jsp

@@ -212,7 +212,7 @@
 		 
 		String targetUrl = "http://" + request.getServerName() + ":"
 				+ request.getServerPort() + request.getContextPath()
-				+ "/GetmSignatureData.do" + "?documentID="
+				+ "/GetSignatureData.do" + "?documentID="
 				+ mDocumentID;
 		try {
 			URL url = new URL(targetUrl);

gkaq/yjpt-java/trunk/yjpt/iSignature/view/ZysqbpPrintSignature.jsp

@@ -59,19 +59,17 @@
 	try {
 		String targetUrl = "http://" + request.getServerName() + ":"
 				+ request.getServerPort() + request.getContextPath()
-				+ "/GetmSignatureData.do" + "?documentID=" + DocumentID;
+				+ "/GetSignatureData.do" + "?documentID=" + DocumentID;
 
 		URL url = new URL(targetUrl);
-		HttpURLConnection connection = (HttpURLConnection) url
-				.openConnection();// 此时cnnection只是为一个连接对象,待连接中 
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();// 此时cnnection只是为一个连接对象,待连接中 
 		connection.setRequestMethod("GET");
 
 		connection.connect();
 
 		//System.out.println(connection.getResponseCode());
 
-		BufferedReader bf = new BufferedReader(new InputStreamReader(
-				connection.getInputStream(), "gb2312"));
+		BufferedReader bf = new BufferedReader(new InputStreamReader(connection.getInputStream(), "gb2312"));
 		String line;
 		StringBuilder sb = new StringBuilder(); // 用来存储响应数据
 
@@ -84,8 +82,7 @@
 
 		String result = "";
 		try {
-			result = java.net.URLDecoder
-					.decode(sb.toString(), "gb2312");
+			result = java.net.URLDecoder.decode(sb.toString(), "gb2312");
 		} catch (UnsupportedEncodingException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();