Index: ssts-web/src/main/webapp/jasperRtp/departSatisfy-child.jrxml =================================================================== diff -u -r22063 -r25959 --- ssts-web/src/main/webapp/jasperRtp/departSatisfy-child.jrxml (.../departSatisfy-child.jrxml) (revision 22063) +++ ssts-web/src/main/webapp/jasperRtp/departSatisfy-child.jrxml (.../departSatisfy-child.jrxml) (revision 25959) @@ -1,5 +1,5 @@ - + @@ -89,56 +89,56 @@ - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + @@ -150,47 +150,47 @@ - + - + - + - + - + - + Index: ssts-web/src/main/webapp/jasperRtp/departSatisfyReport.jasper =================================================================== diff -u -r25927 -r25959 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/departSatisfy-child.jasper =================================================================== diff -u -r25927 -r25959 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/departSatisfyReport.jrxml =================================================================== diff -u -r25927 -r25959 --- ssts-web/src/main/webapp/jasperRtp/departSatisfyReport.jrxml (.../departSatisfyReport.jrxml) (revision 25927) +++ ssts-web/src/main/webapp/jasperRtp/departSatisfyReport.jrxml (.../departSatisfyReport.jrxml) (revision 25959) @@ -1,5 +1,5 @@ - + @@ -93,7 +93,7 @@ <band height="37" splitType="Stretch"> <textField isBlankWhenNull="true"> - <reportElement uuid="a767d0af-7571-4e20-812b-b743d96e30d0" x="0" y="0" width="879" height="37"/> + <reportElement uuid="a767d0af-7571-4e20-812b-b743d96e30d0" x="0" y="0" width="914" height="37"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="22"/> </textElement> @@ -120,55 +120,55 @@ <text><![CDATA[评价内容]]></text> </staticText> <staticText> - <reportElement uuid="52c7d55a-51ce-4e6a-a036-191d45a52201" style="table_TH" mode="Opaque" x="321" y="0" width="73" height="23" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="52c7d55a-51ce-4e6a-a036-191d45a52201" style="table_TH" mode="Opaque" x="318" y="0" width="85" height="23" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="宋体" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[较满意(%)]]></text> </staticText> <staticText> - <reportElement uuid="0300f413-7f3e-43f1-8e1f-9dd7c5e6f7d3" style="table_TH" mode="Opaque" x="394" y="0" width="92" height="23" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="0300f413-7f3e-43f1-8e1f-9dd7c5e6f7d3" style="table_TH" mode="Opaque" x="403" y="0" width="105" height="23" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="宋体" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[基本满意(%)]]></text> </staticText> <staticText> - <reportElement uuid="1167ad5d-5635-43a4-bd05-75e87028d413" style="table_TH" mode="Opaque" x="486" y="0" width="101" height="23" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="1167ad5d-5635-43a4-bd05-75e87028d413" style="table_TH" mode="Opaque" x="508" y="0" width="105" height="23" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="宋体" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[不太满意(%)]]></text> </staticText> <staticText> - <reportElement uuid="1b4499a4-8782-4a22-92f0-d73e446a6e0f" style="table_TH" mode="Opaque" x="587" y="0" width="85" height="23" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="1b4499a4-8782-4a22-92f0-d73e446a6e0f" style="table_TH" mode="Opaque" x="613" y="0" width="85" height="23" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="宋体" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[不满意(%)]]></text> </staticText> <staticText> - <reportElement uuid="182fc377-b69e-40a5-8a05-0b5b34bc73ad" style="table_TH" mode="Opaque" x="672" y="0" width="76" height="23" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="182fc377-b69e-40a5-8a05-0b5b34bc73ad" style="table_TH" mode="Opaque" x="698" y="0" width="85" height="23" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="宋体" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[满意率(%)]]></text> </staticText> <staticText> - <reportElement uuid="3f84a95b-6c35-4b89-8731-7acb4a458962" style="table_TH" mode="Opaque" x="748" y="0" width="131" height="23" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="3f84a95b-6c35-4b89-8731-7acb4a458962" style="table_TH" mode="Opaque" x="783" y="0" width="131" height="23" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="宋体" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <text><![CDATA[问题及建议]]></text> </staticText> <staticText> - <reportElement uuid="0412482a-3db3-4097-b188-c873b9e2ba5d" style="table_TH" mode="Opaque" x="245" y="0" width="76" height="23" forecolor="#000000" backcolor="#D9EEDE"/> + <reportElement uuid="0412482a-3db3-4097-b188-c873b9e2ba5d" style="table_TH" mode="Opaque" x="245" y="0" width="73" height="23" forecolor="#000000" backcolor="#D9EEDE"/> <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="宋体" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -188,7 +188,7 @@ <textFieldExpression><![CDATA[$F{departName}]]></textFieldExpression> </textField> <subreport> - <reportElement uuid="84997202-331b-43e1-882b-2520a98011e5" style="table_TD" stretchType="RelativeToBandHeight" mode="Transparent" x="45" y="0" width="703" height="50" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="84997202-331b-43e1-882b-2520a98011e5" style="table_TD" stretchType="RelativeToBandHeight" mode="Transparent" x="45" y="0" width="738" height="50" forecolor="#000000" backcolor="#FFFFFF"/> <dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{satisfyItems})]]></dataSourceExpression> <returnValue subreportVariable="avg_absSatisfy" toVariable="avg_absSatisfy" calculation="First"/> <returnValue subreportVariable="avg_ratherSatisfy" toVariable="avg_ratherSatisfy" calculation="First"/> @@ -199,7 +199,7 @@ <subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "departSatisfy-child.jasper"]]></subreportExpression> </subreport> <textField pattern="" isBlankWhenNull="true"> - <reportElement uuid="a7170707-4811-4dee-817e-8f690d27c352" style="table_TH" stretchType="RelativeToBandHeight" mode="Opaque" x="748" y="0" width="131" height="50" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="a7170707-4811-4dee-817e-8f690d27c352" style="table_TH" stretchType="RelativeToBandHeight" mode="Opaque" x="783" y="0" width="131" height="50" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="宋体" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -217,46 +217,43 @@ </textElement> <text><![CDATA[合计]]></text> </staticText> - <rectangle> - <reportElement uuid="64ae6433-f3f1-4408-9b1d-d7733fa8ae5d" style="table_TH" x="748" y="0" width="131" height="24" backcolor="#FFFFFF"/> - </rectangle> - <textField> - <reportElement uuid="3f7bef1c-9f60-4cf0-96f3-fc21355f504b" style="table_CH" x="245" y="0" width="76" height="24" backcolor="#FFFFFF"/> + <textField pattern="###0.00"> + <reportElement uuid="3f7bef1c-9f60-4cf0-96f3-fc21355f504b" style="table_CH" x="245" y="0" width="73" height="24" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font fontName="宋体" size="12"/> </textElement> <textFieldExpression><![CDATA[$V{avg_absSatisfy}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="f5d4d9ed-ebcf-4038-94a5-66f354de95df" style="table_CH" x="321" y="0" width="73" height="24" backcolor="#FFFFFF"/> + <textField pattern="###0.00"> + <reportElement uuid="f5d4d9ed-ebcf-4038-94a5-66f354de95df" style="table_CH" x="318" y="0" width="85" height="24" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font fontName="宋体" size="12"/> </textElement> <textFieldExpression><![CDATA[$V{avg_ratherSatisfy}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="cdcff9c2-4fd0-4e33-b9f7-f1b5185b5385" style="table_CH" x="394" y="0" width="92" height="24" backcolor="#FFFFFF"/> + <textField pattern="###0.00"> + <reportElement uuid="cdcff9c2-4fd0-4e33-b9f7-f1b5185b5385" style="table_CH" x="403" y="0" width="105" height="24" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font fontName="宋体" size="12"/> </textElement> <textFieldExpression><![CDATA[$V{avg_basicSatisfy}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="17109096-5c05-409e-a244-cc6b226fd016" style="table_CH" x="486" y="0" width="101" height="24" backcolor="#FFFFFF"/> + <textField pattern="###0.00"> + <reportElement uuid="17109096-5c05-409e-a244-cc6b226fd016" style="table_CH" x="508" y="0" width="105" height="24" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font fontName="宋体" size="12"/> </textElement> <textFieldExpression><![CDATA[$V{avg_noRatherSatisfy}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="8e0d0530-9509-4fb6-8241-a9440e9f8aae" style="table_CH" x="587" y="0" width="85" height="24" backcolor="#FFFFFF"/> + <textField pattern="###0.00"> + <reportElement uuid="8e0d0530-9509-4fb6-8241-a9440e9f8aae" style="table_CH" x="613" y="0" width="85" height="24" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font fontName="宋体" size="12"/> </textElement> <textFieldExpression><![CDATA[$V{avg_noSatisfy}]]></textFieldExpression> </textField> - <textField> - <reportElement uuid="78a3a21b-0c48-4bad-aa54-121172d0ed22" style="table_CH" x="672" y="0" width="76" height="24" backcolor="#FFFFFF"/> + <textField pattern="###0.00"> + <reportElement uuid="78a3a21b-0c48-4bad-aa54-121172d0ed22" style="table_CH" x="698" y="0" width="85" height="24" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font fontName="宋体" size="12"/> </textElement> @@ -269,13 +266,20 @@ </textElement> <text><![CDATA[总结]]></text> </staticText> - <textField> - <reportElement uuid="6ac691e3-0d69-4c5c-acce-46d8dddc8877" style="table_CH" mode="Opaque" x="245" y="24" width="634" height="24" backcolor="#FFFFFF"/> + <textField isBlankWhenNull="true"> + <reportElement uuid="6ac691e3-0d69-4c5c-acce-46d8dddc8877" style="table_CH" mode="Opaque" x="245" y="24" width="669" height="24" backcolor="#FFFFFF"/> <textElement> <font fontName="宋体" size="12"/> </textElement> <textFieldExpression><![CDATA[$V{totalSummary}]]></textFieldExpression> </textField> + <staticText> + <reportElement uuid="86d4db28-b39e-4b88-b124-14e5beb5a34d" style="table_TH" x="783" y="0" width="131" height="24" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="宋体" size="12"/> + </textElement> + <text><![CDATA[]]></text> + </staticText> </band> </summary> </jasperReport>