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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/auth/AuthenticateController.java

@@ -10,10 +10,7 @@ import java.net.URLEncoder;
 import java.security.SecureRandom;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
@@ -358,19 +355,20 @@ public class AuthenticateController extends BaseController {
 		}
 		UserEntity user = authenticateService.doLogin(usercode, password);
 		if (null != user) {
-			Pattern p = Pattern.compile(Constants.PASSWORD_REGEX);  	  
-			Matcher m = p.matcher(password);  
-			SimpleDateFormat s = new SimpleDateFormat("yyyyMMdd");		
-			try {
-				Date yxq = Utils.getDateLastTime(s.parse(Constants.PASSWORD_YXQ));
-				//密码复杂度不够并且超出有效期外
-				if(!m.find()&&yxq.compareTo(new Date())<=0) {
-					bc.addMsg("loginPasswordError", "common", MsgLevel.ERROR);
-					return bc; 	
-				}
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}	
+			/* 之前密码复杂度不够，超过设置的期限禁止登陆，现去掉。 */
+//			Pattern p = Pattern.compile(Constants.PASSWORD_REGEX);  	  
+//			Matcher m = p.matcher(password);  
+//			SimpleDateFormat s = new SimpleDateFormat("yyyyMMdd");		
+//			try {
+//				Date yxq = Utils.getDateLastTime(s.parse(Constants.PASSWORD_YXQ));
+//				//密码复杂度不够并且超出有效期外
+//				if(!m.find()&&yxq.compareTo(new Date())<=0) {
+//					bc.addMsg("loginPasswordError", "common", MsgLevel.ERROR);
+//					return bc; 	
+//				}
+//			} catch (ParseException e) {
+//				e.printStackTrace();
+//			}
 			processLogin(bc, user);			
 		} else {
 			bc.addMsg("loginError", "common", MsgLevel.ERROR);
@@ -379,7 +377,6 @@ public class AuthenticateController extends BaseController {
 	}
 
 	private void processLogin(BusinessContext bc, UserEntity user) {
-		user = userService.findOne(user.getId());
 		if (user.getAddUser() != null) {
 			user.getAddUser().getCode();
 		}
@@ -397,8 +394,7 @@ public class AuthenticateController extends BaseController {
 			bc.setAttribute("szd", codeService.findOne(user.getSzd().getId()));
 		}
 		bc.setAttribute("deployMode", GlobalData.DEPLOY_MODE);
-		bc.setAttribute("deploySzd",
-				codeService.findOne(new Long(GlobalData.CITY_CODE)));
+		bc.setAttribute("deploySzd",codeService.findOne(new Long(GlobalData.CITY_CODE)));
 		bc.setAttribute("birtUrl", Constants.BIRT_URL);
 		bc.setAttribute("adminId", GlobalData.adminID);
 		bc.setAttribute("tbUserId", GlobalData.TB_USER.getId());
@@ -418,12 +414,10 @@ public class AuthenticateController extends BaseController {
 		
 		if (Constants.NO.equals(user.getSfjyr())) {
 			// 非经营人
-			bc.setAttribute("initMenu",
-					menuService.findByCode(GlobalData.INIT_MENU));
+			bc.setAttribute("initMenu",menuService.findByCode(GlobalData.INIT_MENU));
 		} else {
 			// 经营人
-			bc.setAttribute("initMenu",
-					menuService.findByCode(GlobalData.JJR_MENU));
+			bc.setAttribute("initMenu",menuService.findByCode(GlobalData.JJR_MENU));
 		}
 	}
 
@@ -435,8 +429,7 @@ public class AuthenticateController extends BaseController {
 	public BusinessContext doLogout() {
 		authenticateService.doLogout();
 		BusinessContext bc = createBusinessContext();
-		bc.setAttribute("szd",
-				codeService.findOne(new Long(GlobalData.CITY_CODE)));
+		bc.setAttribute("szd",codeService.findOne(new Long(GlobalData.CITY_CODE)));
 		return bc;
 	}
 
@@ -449,8 +442,7 @@ public class AuthenticateController extends BaseController {
 	 * @param changeByAdmin
 	 * @return
 	 */
-	public BusinessContext changePwd(String userCode, String oldPwd,
-			String newPwd, Boolean changeByAdmin) {
+	public BusinessContext changePwd(String userCode, String oldPwd,String newPwd, Boolean changeByAdmin) {
 		BusinessContext bc = createBusinessContext();
 		Pattern p = Pattern.compile(Constants.PASSWORD_REGEX);  	  
 		Matcher m = p.matcher(newPwd);  

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

@@ -1244,8 +1244,7 @@ public class ZysqbpController extends BaseController {
 				public void run() {
 					ZysqbpEntity vo_f = zysqbpService.findOne(tempid);
 					try {
-						ZysqbpWebService webService = zysqbpService
-								.getWebService();
+						ZysqbpWebService webService = zysqbpService.getWebService();
 						if (webService != null) {
 							webService.save(vo_f);
 							vo_f.setTbzt(Constants.YES);
@@ -1479,9 +1478,9 @@ public class ZysqbpController extends BaseController {
 		Calendar cal = Calendar.getInstance();
 		Calendar today = Calendar.getInstance();
 		cal.setTime(fzDate);
-		if (cal.get(Calendar.YEAR) + 2 == today.get(Calendar.YEAR)) {
+		if (cal.get(Calendar.YEAR) + 1 == today.get(Calendar.YEAR)) {
 			nsns = 1;
-		} else if (cal.get(Calendar.YEAR) + 3 == today.get(Calendar.YEAR)) {
+		} else if (cal.get(Calendar.YEAR) + 2 == today.get(Calendar.YEAR)) {
 			nsns = 2;
 		}
 		List<JyrNsEntity> list = nsService.findByJyrAndNsns(vo.getZyddqybh()

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/zysqbp/ZysqbpDao.java

@@ -132,7 +132,7 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 	@Query(value = "select F.ID , C.B  from T_YJPT_GGDM  F "
 			+ " LEFT JOIN ( SELECT G.GQSZSYLX A,SUM(W.TEU) B FROM T_YJPT_GQ  G ,T_YJPT_WXHWGKZYSBD W "
 			+ " WHERE   G.RECORD_STATUS <> 9  AND W.ZYDD='10000501' AND (W.RECORD_STATUS=2 OR W.RECORD_STATUS=10) AND W.QXZYSJ IS NULL and  W.SZGQ=G.ID AND (W.SZD like ?1)  AND W.BGSJ > =?2 AND  W.BGSJ <= ?3 "
-			+ " AND (G.WXWPMC =?4 OR ?4 IS NULL) GROUP BY G.GQSZSYLX order by G.GQSZSYLX)  C ON F.ID= C.A  WHERE F.GROUPCODE='SYLX'", nativeQuery = true)
+			+ " AND (W.WXWPMC =?4 OR ?4 IS NULL) GROUP BY G.GQSZSYLX order by G.GQSZSYLX)  C ON F.ID= C.A  WHERE F.GROUPCODE='SYLX'", nativeQuery = true)
 	public List<Object[]> findQsbyAndbasjContainer(String szd, Date tjsjq,
 			Date tjsjz, String wxwpmc);
 

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

@@ -1,1373 +0,0 @@
-<?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="7a1af753-6b2b-48d3-b76d-11716729aeab">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="216"/>
-	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["G:\\workplace\\yjpt-ireport\\"]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="bwList" class="java.util.List">
-		<fieldDescription><![CDATA[bwList]]></fieldDescription>
-	</field>
-	<field name="cgList" class="java.util.List">
-		<fieldDescription><![CDATA[cgList]]></fieldDescription>
-	</field>
-	<field name="ckList" class="java.util.List">
-		<fieldDescription><![CDATA[ckList]]></fieldDescription>
-	</field>
-	<field name="class" class="java.lang.Class">
-		<fieldDescription><![CDATA[class]]></fieldDescription>
-	</field>
-	<field name="dcList" class="java.util.List">
-		<fieldDescription><![CDATA[dcList]]></fieldDescription>
-	</field>
-	<field name="fzList" class="java.util.List">
-		<fieldDescription><![CDATA[fzList]]></fieldDescription>
-	</field>
-	<field name="jyr" class="com.jtgh.yjpt.entity.jyr.JyrEntity">
-		<fieldDescription><![CDATA[jyr]]></fieldDescription>
-	</field>
-	<field name="mtList" class="java.util.List">
-		<fieldDescription><![CDATA[mtList]]></fieldDescription>
-	</field>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band height="50" splitType="Stretch">
-			<staticText>
-				<reportElement x="0" y="0" width="560" height="50" uuid="4237d389-9e85-45e9-b184-77778b375d2d"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="宋体" size="24" isBold="true"/>
-				</textElement>
-				<text><![CDATA[经营人基础信息]]></text>
-			</staticText>
-		</band>
-	</title>
-	<detail>
-		<band height="798" splitType="Immediate">
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="1ee5b6d5-d52b-401a-a5e2-a18cb4f63a30"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getSzgq().getGqmc()]]></textFieldExpression>
-				</textField>
-				<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">
-						<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>
-					<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" 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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="16000710-a42b-4886-b523-2df4e2565d6f"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getGkjyr()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="53be5abb-0c6f-43e6-a8a0-265394399f62"/>
-					<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="cee31547-4af1-4151-88c6-9ffefc81aa98"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getQylx()=="1"?"沿海港口企业":($F{jyr}.getQylx()=="2"?"内河港口企业":($F{jyr}.getQylx()=="3"?"沿江港口企业":""))]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="6ab6919e-5a95-423f-969b-d04f5ca8defc"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getGkjyxkzh()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="bf55cb24-9942-4b30-8a68-9d81ad804d2f"/>
-					<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="05cbe23f-f84a-49f5-b1dd-481ee6321d2a"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getYzbm()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="5a55f929-8321-4e42-b4af-4ec904181b73"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getByzd1()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="f2d4a245-d6b0-4b64-b060-7d3051107b83"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getBgdz()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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" pattern="yyyy-MM-dd" isBlankWhenNull="true">
-					<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"/>
-						<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getBafzrq()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="a7a065cf-222e-4cda-a497-4e9a7ff7d7cb"/>
-					<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" pattern="yyyy-MM-dd" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="5006f65e-b9b7-4090-af52-3a72b37f01e4"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getFzrq()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="86cebd9f-0a79-40db-b7f5-6b68febc7154"/>
-					<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="0e610cdd-74b5-4023-a824-4ebeae754e9a"/>
-					<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="578de47a-a981-479e-9e20-56ae1dd420fa"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getFzjg()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="18da740f-7065-4a92-a166-f4497afa7da5"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getJyfw()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="dbe5e304-36fb-41aa-9c11-768b6e9dd67a"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getJyqy()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="e731e296-a6e6-4871-a8fd-987ccb8bdbad"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getZyhz()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="2fef613f-373f-4d03-a328-324aae13fd22"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getLxdh()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="4ae7b03e-f8da-4924-8ae9-81943b579151"/>
-					<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="19217b86-283d-4b57-8267-d411105ddb82"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getFddbr()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="bdcbf8a3-4e2d-4a84-bf9a-437b2ab91b8a"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getAqbmfzr()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="f787f4d3-d428-4d8d-8ecc-cb0cf01838d1"/>
-					<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="070c5bc1-3541-4f55-b72a-c843b19314f3"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getCz()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="a3f18724-e792-4c46-88a5-1184c7f7d7c2"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getAqfzrsj()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="cf741867-e4f7-43ce-b311-7ed2e9e268ca"/>
-					<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="ee959855-e57b-4dbd-b480-9d24c2800423"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getAqfzrlxdh()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="4970a8bf-d379-481a-82ba-86e8897f2df5"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getAqzgbm()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="ca6a1ec0-76c4-4c9c-ae83-e83d6c7f535a"/>
-					<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="eb860946-9f28-438b-ba70-e7eeb2b96dd0"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getAqfzrzbdh()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="a05fce90-28e4-4836-8bbd-2ae71ac2637e"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getZzagrysl()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="13c524bb-9d0a-43db-ba48-37610a6e4e4b"/>
-					<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="36e5a73a-11c2-4772-9650-292482ff2b72"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getAqgljg()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="dd183655-542c-4552-b6f4-460da6bf743d"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getXsje()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="9a946801-d531-4706-8755-d3fb577aac0f"/>
-					<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="42c0df4c-ee47-4f88-a075-6b13e7e69627"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getZcze()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="3ae54620-9928-40f8-b74d-13b47ee558b4"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getTzze()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="a300379d-d082-4efa-bf55-4a3ebe9eb72e"/>
-					<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="b1f896b2-df71-4cf4-b285-1c4bf5f18155"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getGsyyzzbh()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="6af0caa2-4c97-40b6-851e-3fc98b97738b"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getQyzzjgdm()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="92914956-4265-4afe-83cc-c358d935a4cf"/>
-					<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="54ae114e-1b7e-4b56-b0f8-4e4301c1406a"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getZczb()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="f545f7d7-9a49-4183-b11d-072628586448"/>
-					<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>
-					<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{jyr}.getSshyz().getName())]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="65e4bad0-c7f6-4110-84ac-5d001a5ef551"/>
-					<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="396e2c99-9d7d-42b0-bd7a-a9b6b443154f"/>
-					<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>
-					<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{jyr}.getSshydl().getName())]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="7fb792a4-e34f-49f3-8c6b-098474ed1180"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getRs()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="6f72855c-ed36-449a-810e-f03a867bdfd3"/>
-					<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="2202dae2-b88c-4ba7-9642-167438f33398"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getQyaqdj()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="d5a79401-5c86-40ac-820c-701cec611f94"/>
-					<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="746eb989-614e-4d0a-9fb5-e7b690e4f410"/>
-					<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="bb290ed9-3519-41a2-a48b-3b6a2a56e896"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getSfwhqy()=="Y"?"是(无重大危险源)":($F{jyr}.getSfwhqy()=="W"?"是（有重大危险源）":($F{jyr}.getSfwhqy()=="N"?"否":""))]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="428" height="30" forecolor="#000000" backcolor="#FFFFFF" uuid="12b70078-3e00-4d77-860e-0f7c6da1ec4f"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getGkwxhwzyfzbh()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="e12a522c-e074-4f0d-9377-fedd186eabe7"/>
-					<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="0100fb63-cf26-425b-a818-a7840721c65b"/>
-					<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" pattern="yyyy-MM-dd" isBlankWhenNull="true">
-					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="c90305dd-3ed5-44de-b009-5738b78c5e3c"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getFzyxq()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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" pattern="yyyy-MM-dd" isBlankWhenNull="true">
-					<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"/>
-						<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getBayxq()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="120" height="20" uuid="93b55073-59c4-4098-b175-5e0deefd7b9c"/>
-					<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="cc4c02b1-b0be-4a35-a3cf-e2454e66d28e"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getGkssbafhzsbh()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="148" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="35ef4f13-258e-4133-9417-d2b9dc7d5ff4"/>
-					<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="3e140409-019f-46f3-95fc-3490ab4dc851"/>
-					<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="60a65edf-a162-4f33-8633-c116b27efa35"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getBafzjg()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<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">
-						<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="428" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="8277c253-f704-418b-942b-592a95b846d3"/>
-					<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>
-					<textFieldExpression><![CDATA[$F{jyr}.getZywxhwpm()]]></textFieldExpression>
-				</textField>
-			</frame>
-			<subreport isUsingCache="false">
-				<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="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="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="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="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="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>
-		</band>
-	</detail>
-</jasperReport>

gkaq/yjpt-java/trunk/resources/log4j.properties

@@ -1,6 +0,0 @@
-log4j.rootLogger=INFO, CA
-
-# ConsoleAppender
-log4j.appender.CA=org.apache.log4j.ConsoleAppender
-log4j.appender.CA.layout=org.apache.log4j.PatternLayout
-log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %m%n

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

@@ -18,6 +18,7 @@
 			<list>
 					<!--
 					<value>classpath*:/deployments/*</value> 
+					<value>classpath*:/deployments/jdjc.*</value>
 					<value>classpath*:/deployments/bgzysbsp-city.*</value>
 					<value>classpath*:/deployments/qxzysbsp-city.*</value>
 					<value>classpath*:/deployments/autoAudit.*</value>
@@ -32,9 +33,7 @@
 					<value>classpath*:/deployments/yjyaba-city.*</value>
 					<value>classpath*:/deployments/zdsgyhpc-city.*</value>
 					<value>classpath*:/deployments/zysbsp-city.*</value>
-					<value>classpath*:/deployments/jdjc.*</value>
 				-->
-
 			</list>
 		</property>
 		<property name="customSessionFactories">

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

@@ -163,6 +163,9 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
 	<bean id="yxqJob" class="com.jtgh.yjpt.common.servlet.YxqValid"/> 
+	
+	
+	
 	<!-- 危货作业申请用户锁定-->
 	<!--bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">  
        <property name="triggers">  

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

@@ -32,10 +32,10 @@
 	<context-param>
 		<description>是否在危险品审批中启用签章功能(Y/N)</description>
 		<param-name>iSignature</param-name>
-		<param-value>Y</param-value>
+		<param-value>N</param-value>
 	</context-param>
 	<context-param>
-		<description>是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）(Y/N)</description>
+		<description>是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）(Y：关闭/N：不关闭)</description>
 		<param-name>JyrDisbleEdit</param-name>
 		<param-value>Y</param-value>
 	</context-param>