Index: ssts-web/src/main/webapp/jasperRtp/workload.jrxml =================================================================== diff -u -r12331 -r17011 --- ssts-web/src/main/webapp/jasperRtp/workload.jrxml (.../workload.jrxml) (revision 12331) +++ ssts-web/src/main/webapp/jasperRtp/workload.jrxml (.../workload.jrxml) (revision 17011) @@ -1,5 +1,5 @@ - + @@ -49,27 +49,29 @@ + + <band height="49" splitType="Stretch"> <textField> - <reportElement uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a" x="0" y="1" width="750" height="30"/> + <reportElement uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a" x="0" y="1" width="950" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font fontName="宋体" size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="05573ce3-9678-494d-8b09-30a6eff1794a" x="189" y="31" width="180" height="18"/> + <reportElement uuid="05573ce3-9678-494d-8b09-30a6eff1794a" x="259" y="31" width="180" height="18"/> <textElement verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA["开始日期："+$P{date1}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="06fd61a6-af28-4194-9331-afd15f839498" x="369" y="31" width="180" height="18"/> + <reportElement uuid="06fd61a6-af28-4194-9331-afd15f839498" x="499" y="31" width="180" height="18"/> <textElement verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -80,7 +82,7 @@ <summary> <band height="81" splitType="Stretch"> <crosstab> - <reportElement uuid="648fe906-6aed-4eff-8977-38ddace66c2c" x="0" y="0" width="750" height="81"/> + <reportElement uuid="648fe906-6aed-4eff-8977-38ddace66c2c" x="0" y="0" width="950" height="81"/> <crosstabHeaderCell> <cellContents> <staticText> @@ -137,16 +139,16 @@ </cellContents> </crosstabColumnHeader> <crosstabTotalColumnHeader> - <cellContents backcolor="#005FB3" mode="Opaque"> + <cellContents backcolor="#005FB3" mode="Transparent"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <staticText> - <reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" x="0" y="0" width="50" height="30" forecolor="#FFFFFF"/> + <reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" style="table_CH" x="0" y="0" width="59" height="30" forecolor="#000000"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> - <text><![CDATA[合计]]></text> + <text><![CDATA[总评分]]></text> </staticText> </cellContents> </crosstabTotalColumnHeader> @@ -161,7 +163,7 @@ <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField> - <reportElement uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e" style="Crosstab Data Text" x="0" y="0" width="75" height="30"/> + <reportElement uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e" style="Crosstab Data Text" x="0" y="0" width="100" height="30"/> <textElement verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -180,63 +182,81 @@ <measure name="amountMeasure" class="java.lang.Integer" calculation="Sum"> <measureExpression><![CDATA[$F{amount}]]></measureExpression> </measure> - <crosstabCell width="75" height="25"> + <measure name="materialAmountMeasure" class="java.lang.Integer" calculation="Sum"> + <measureExpression><![CDATA[$F{materialAmount}]]></measureExpression> + </measure> + <measure name="scoreMeasure" class="java.lang.Integer" calculation="Sum"> + <measureExpression><![CDATA[$F{score}]]></measureExpression> + </measure> + <crosstabCell width="100" height="25"> <cellContents> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField> - <reportElement uuid="1de502ee-792a-4517-ae65-33bb35ce3412" style="Crosstab Data Text" x="0" y="0" width="75" height="25"/> - <textElement verticalAlignment="Middle"> + <reportElement uuid="1de502ee-792a-4517-ae65-33bb35ce3412" style="table_TD" x="0" y="0" width="50" height="25" backcolor="#EAEAEA"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression> </textField> + <textField> + <reportElement uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a" style="table_TD" x="50" y="0" width="50" height="25"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression> + </textField> </cellContents> </crosstabCell> - <crosstabCell width="75" height="25" rowTotalGroup="operator"> + <crosstabCell width="100" height="25" rowTotalGroup="operator"> <cellContents backcolor="#BFE1FF" mode="Opaque"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField> - <reportElement uuid="e277e6b2-eb9d-409f-b558-226f59b070e9" style="Crosstab Data Text" x="0" y="0" width="75" height="25"/> - <textElement verticalAlignment="Middle"> + <reportElement uuid="e277e6b2-eb9d-409f-b558-226f59b070e9" style="table_CH" x="0" y="0" width="50" height="25"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression> </textField> + <textField> + <reportElement uuid="4d5762e5-7d05-4067-a81e-93e4012380dd" style="table_CH" x="50" y="0" width="50" height="25"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="12"/> + </textElement> + <textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression> + </textField> </cellContents> </crosstabCell> - <crosstabCell width="50" columnTotalGroup="sequence"> - <cellContents backcolor="#005FB3" mode="Opaque"> + <crosstabCell width="59" height="25" columnTotalGroup="sequence"> + <cellContents backcolor="#005FB3" mode="Transparent"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField> - <reportElement uuid="af3f5d97-5513-41cd-a312-738f0b02fd04" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/> - <textElement verticalAlignment="Middle"> + <reportElement uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f" style="table_CH" x="0" y="0" width="59" height="25"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> - <textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression> + <textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression> </textField> </cellContents> </crosstabCell> - <crosstabCell rowTotalGroup="operator" columnTotalGroup="sequence"> - <cellContents backcolor="#005FB3" mode="Opaque"> + <crosstabCell width="59" rowTotalGroup="operator" columnTotalGroup="sequence"> + <cellContents backcolor="#005FB3" mode="Transparent" style="table_TH"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> - <textField> - <reportElement uuid="43857bc4-f1cd-476e-9a69-076f48bf13a1" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/> - <textElement verticalAlignment="Middle"> - <font size="12"/> - </textElement> - <textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression> - </textField> + <staticText> + <reportElement uuid="f9eeca90-2b09-46f3-a51f-2615aee39619" style="table_CH" x="0" y="0" width="59" height="25"/> + <textElement/> + <text><![CDATA[]]></text> + </staticText> </cellContents> </crosstabCell> - <crosstabCell width="0" columnTotalGroup="columnName"> + <crosstabCell width="0" height="25" columnTotalGroup="columnName"> <cellContents backcolor="#BFE1FF" mode="Opaque"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>