Index: ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml
===================================================================
diff -u -r29584 -r29890
--- ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml	(.../monthIntegralReport.jrxml)	(revision 29584)
+++ ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml	(.../monthIntegralReport.jrxml)	(revision 29890)
@@ -31,6 +31,9 @@
 	<parameter name="totalIntegral" class="java.lang.Double">
 		<parameterDescription><![CDATA[0.00]]></parameterDescription>
 	</parameter>
+	<parameter name="amountFormat" class="java.lang.String">
+		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
+	</parameter>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -86,6 +89,9 @@
 				<crosstabParameter name="totalIntegralPara" class="java.lang.Double">
 					<parameterValueExpression><![CDATA[$P{totalIntegral}]]></parameterValueExpression>
 				</crosstabParameter>
+				<crosstabParameter name="amountFormatParam">
+					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
+				</crosstabParameter>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
@@ -269,17 +275,21 @@
 				<measure name="departIntegralMeasure" class="java.lang.Double" calculation="Sum">
 					<measureExpression><![CDATA[$F{integral}]]></measureExpression>
 				</measure>
+				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
+				</measure>
 				<crosstabCell width="79" height="25">
 					<cellContents>
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField isStretchWithOverflow="true" pattern="###0.0000">
+						<textField isStretchWithOverflow="true" pattern="">
 							<reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25"/>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
-							<textFieldExpression><![CDATA[$V{moneyMeasure}]]></textFieldExpression>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
@@ -288,12 +298,13 @@
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField pattern="###0.0000">
+						<textField pattern="">
 							<reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000"/>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[$V{moneyMeasure}]]></textFieldExpression>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
@@ -316,12 +327,13 @@
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField isStretchWithOverflow="true" pattern="###0.0000">
+						<textField isStretchWithOverflow="true" pattern="">
 							<reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25"/>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
-							<textFieldExpression><![CDATA[$V{moneyMeasure}]]></textFieldExpression>
+							<textFieldExpression><![CDATA[($V{amountMeasure}>0)?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{amountMeasure}>0)?"###0":$P{amountFormatParam}]]></patternExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
@@ -330,12 +342,13 @@
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField pattern="###0.0000">
+						<textField pattern="">
 							<reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000"/>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[$V{moneyMeasure}]]></textFieldExpression>
+							<textFieldExpression><![CDATA[($V{amountMeasure}>0)?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{amountMeasure}>0)?"###0":$P{amountFormatParam}]]></patternExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>