Index: ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jrxml
===================================================================
diff -u -r12331 -r15147
--- ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jrxml	(.../packingUnqualifieReport.jrxml)	(revision 12331)
+++ ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jrxml	(.../packingUnqualifieReport.jrxml)	(revision 15147)
@@ -37,7 +37,7 @@
 	<field name="date" class="java.lang.String">
 		<fieldDescription><![CDATA[date]]></fieldDescription>
 	</field>
-	<field name="result" class="java.lang.String">
+	<field name="result" class="java.lang.Integer">
 		<fieldDescription><![CDATA[result]]></fieldDescription>
 	</field>
 	<field name="title" class="java.lang.String">
@@ -46,6 +46,9 @@
 	<field name="titleSort" class="java.lang.Integer">
 		<fieldDescription><![CDATA[titleSort]]></fieldDescription>
 	</field>
+	<field name="unqualifiedRate" class="java.lang.Double"/>
+	<field name="unqualifiedAmount" class="java.lang.Integer"/>
+	<field name="totalAmount" class="java.lang.Integer"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -63,29 +66,29 @@
 	<summary>
 		<band height="130" splitType="Stretch">
 			<crosstab>
-				<reportElement uuid="379372bc-a239-4c54-b7ca-7bc34d090ba7" x="0" y="0" width="1100" height="130"/>
+				<reportElement uuid="fab48d91-295d-471c-a94b-e32667599b24" x="0" y="0" width="1100" height="130"/>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="8624ba5e-eb66-4055-b92c-d39c7840af01" style="table_TH" x="0" y="0" width="81" height="36"/>
+							<reportElement uuid="c2669219-e345-46ab-a0d7-7de189751f5c" style="table_CH" mode="Opaque" x="0" y="0" width="70" height="30"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
+								<font size="14" isBold="true"/>
 							</textElement>
 							<text><![CDATA[日期]]></text>
 						</staticText>
 					</cellContents>
 				</crosstabHeaderCell>
-				<rowGroup name="date" width="81">
+				<rowGroup name="date" width="70" totalPosition="End">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{date}]]></bucketExpression>
 					</bucket>
 					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Transparent">
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="4eea7e32-0203-4574-a96d-de814b603e5a" style="Crosstab Data Text" x="0" y="0" width="81" height="25"/>
+								<reportElement uuid="3e96194b-39f4-49da-9585-9b9fb0bfad4f" style="Crosstab Data Text" x="0" y="0" width="70" height="25"/>
 								<textElement verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -94,10 +97,21 @@
 						</cellContents>
 					</crosstabRowHeader>
 					<crosstabTotalRowHeader>
-						<cellContents/>
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement uuid="25bb9441-71b5-423f-b5e2-14657fe16a8d" x="0" y="0" width="70" height="25"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12"/>
+								</textElement>
+								<text><![CDATA[合计 ]]></text>
+							</staticText>
+						</cellContents>
 					</crosstabTotalRowHeader>
 				</rowGroup>
-				<columnGroup name="titleSort" height="0">
+				<columnGroup name="titleSort" height="0" totalPosition="End">
 					<bucket class="java.lang.Integer">
 						<bucketExpression><![CDATA[$F{titleSort}]]></bucketExpression>
 					</bucket>
@@ -109,10 +123,21 @@
 						</cellContents>
 					</crosstabColumnHeader>
 					<crosstabTotalColumnHeader>
-						<cellContents/>
+						<cellContents backcolor="#005FB3" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement uuid="1d978b78-db56-4cce-9849-0b5da6a8f9a0" x="0" y="0" width="69" height="30" forecolor="#FFFFFF"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12"/>
+								</textElement>
+								<text><![CDATA[不合格率]]></text>
+							</staticText>
+						</cellContents>
 					</crosstabTotalColumnHeader>
 				</columnGroup>
-				<columnGroup name="title" height="36">
+				<columnGroup name="title" height="30" totalPosition="End">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{title}]]></bucketExpression>
 					</bucket>
@@ -122,93 +147,107 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="8bbf4c6b-bcb2-415f-b04c-8461e8b07e96" style="Crosstab Data Text" x="0" y="0" width="97" height="36"/>
+								<reportElement uuid="916dbaeb-7013-4b1c-905a-aed9d53db0f5" style="Crosstab Data Text" x="0" y="0" width="93" height="30"/>
 								<textElement verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
+									<font size="12"/>
 								</textElement>
 								<textFieldExpression><![CDATA[$V{title}]]></textFieldExpression>
 							</textField>
 						</cellContents>
 					</crosstabColumnHeader>
 					<crosstabTotalColumnHeader>
-						<cellContents/>
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
 					</crosstabTotalColumnHeader>
 				</columnGroup>
-				<measure name="resultMeasure" class="java.lang.String" calculation="First">
+				<measure name="resultMeasure" class="java.lang.Integer" calculation="Sum">
 					<measureExpression><![CDATA[$F{result}]]></measureExpression>
 				</measure>
-				<crosstabCell width="97" height="25">
+				<measure name="unqualifiedAmount" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{unqualifiedAmount}]]></measureExpression>
+				</measure>
+				<measure name="totalAmount" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{totalAmount}]]></measureExpression>
+				</measure>
+				<crosstabCell width="93" height="25">
 					<cellContents>
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="b035ac3c-3126-4846-8c8e-fa7b678e6d1f" style="Crosstab Data Text" x="0" y="0" width="97" height="25"/>
+						<textField isBlankWhenNull="true">
+							<reportElement uuid="66f90b39-228a-49e2-8b96-558990aed419" style="Crosstab Data Text" x="0" y="0" width="93" height="25"/>
 							<textElement verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{resultMeasure}==null?0:$V{resultMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell height="25" rowTotalGroup="date">
+				<crosstabCell width="93" height="25" rowTotalGroup="date">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="ded44ea3-9d94-46cc-a1a9-8c63e3e65e30" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
+						<textField isBlankWhenNull="true">
+							<reportElement uuid="84d6dca3-8c71-4a82-bee8-7967a725b683" style="Crosstab Data Text" x="0" y="0" width="93" height="25"/>
+							<textElement verticalAlignment="Middle">
+								<font size="12"/>
+							</textElement>
 							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="50" columnTotalGroup="titleSort">
+				<crosstabCell width="69" columnTotalGroup="titleSort">
 					<cellContents backcolor="#005FB3" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="efa32149-276f-4a19-8c58-5cef58a36b5a" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
+						<textField pattern="#,##0.0000 %" isBlankWhenNull="false">
+							<reportElement uuid="68f613bd-dc15-4747-a46a-d7513bbfdb0f" style="Crosstab Data Text" x="0" y="0" width="69" height="25" forecolor="#FFFFFF">
+								<property name="net.sf.jasperreports.export.jxl.cell.complex.format" value="true"/>
+							</reportElement>
+							<textElement verticalAlignment="Middle">
+								<font size="12"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{unqualifiedAmount}==null||$V{unqualifiedAmount}==0)
+||($V{totalAmount}==null||$V{totalAmount}==0)
+?0.00:($V{unqualifiedAmount}/$V{totalAmount})]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="date" columnTotalGroup="titleSort">
+				<crosstabCell width="69" height="25" rowTotalGroup="date" columnTotalGroup="titleSort">
 					<cellContents backcolor="#005FB3" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="eac17810-335e-40f6-98a5-35b8db82493d" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
+						<textField pattern="#,##0.0000 %" isBlankWhenNull="true">
+							<reportElement uuid="504975b2-0b96-473d-96f3-c7bbce3564e6" style="Crosstab Data Text" x="0" y="0" width="69" height="25" forecolor="#FFFFFF">
+								<property name="net.sf.jasperreports.export.jxl.cell.complex.format" value="true"/>
+							</reportElement>
+							<textElement verticalAlignment="Middle">
+								<font size="12"/>
+							</textElement>
+							<textFieldExpression><![CDATA[($V{unqualifiedAmount}==null||$V{unqualifiedAmount}==0)
+||($V{totalAmount}==null||$V{totalAmount}==0)
+?0:($V{unqualifiedAmount}/$V{totalAmount})]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="50" columnTotalGroup="title">
+				<crosstabCell width="0" columnTotalGroup="title">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="0f08ffe2-b153-49fe-ba0e-42e7a02d34f7" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
-						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="date" columnTotalGroup="title">
+				<crosstabCell width="0" height="25" rowTotalGroup="date" columnTotalGroup="title">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="0cd14c4f-d048-4998-88a3-605b965a5464" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
-						</textField>
 					</cellContents>
 				</crosstabCell>
 			</crosstab>