Index: ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartment.jasper =================================================================== diff -u -r21345 -r39195 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartmentNew.jasper =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartment.jrxml =================================================================== diff -u -r21345 -r39195 --- ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartment.jrxml (.../tousseApplyDepartment.jrxml) (revision 21345) +++ ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartment.jrxml (.../tousseApplyDepartment.jrxml) (revision 39195) @@ -1,5 +1,5 @@ - + @@ -16,13 +16,14 @@ + <band height="40" splitType="Stretch"> <textField> - <reportElement uuid="d8e60ec9-1c4a-40c1-ab15-fba2427aff26" x="0" y="0" width="590" height="40"/> + <reportElement uuid="d8e60ec9-1c4a-40c1-ab15-fba2427aff26" x="0" y="0" width="730" height="40"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -58,7 +59,7 @@ <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> - <text><![CDATA[单价]]></text> + <text><![CDATA[技术难度]]></text> </staticText> <staticText> <reportElement uuid="12c66ad9-cd80-4aa8-8ad1-d33ab38b3336" x="150" y="0" width="200" height="40"/> @@ -75,7 +76,7 @@ <text><![CDATA[器械包名称]]></text> </staticText> <staticText> - <reportElement uuid="0d602321-7cb3-4505-b256-a4a902752fa3" x="420" y="0" width="70" height="40"/> + <reportElement uuid="0d602321-7cb3-4505-b256-a4a902752fa3" x="560" y="0" width="70" height="40"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -89,7 +90,7 @@ <text><![CDATA[数量]]></text> </staticText> <staticText> - <reportElement uuid="e1a6c645-301e-4adb-b845-b0512d7ff92b" x="490" y="0" width="100" height="40"/> + <reportElement uuid="e1a6c645-301e-4adb-b845-b0512d7ff92b" x="630" y="0" width="100" height="40"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -102,6 +103,34 @@ </textElement> <text><![CDATA[金额]]></text> </staticText> + <staticText> + <reportElement uuid="fc989d61-68ec-4b7c-abe0-c9cb3090d4d1" x="420" y="0" width="70" height="40"/> + <box> + <pen lineWidth="1.0"/> + <topPen lineWidth="1.0"/> + <leftPen lineWidth="1.0"/> + <bottomPen lineWidth="1.0"/> + <rightPen lineWidth="1.0"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="14" isBold="true"/> + </textElement> + <text><![CDATA[权重分]]></text> + </staticText> + <staticText> + <reportElement uuid="fc989d61-68ec-4b7c-abe0-c9cb3090d4d1" x="490" y="0" width="70" height="40"/> + <box> + <pen lineWidth="1.0"/> + <topPen lineWidth="1.0"/> + <leftPen lineWidth="1.0"/> + <bottomPen lineWidth="1.0"/> + <rightPen lineWidth="1.0"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="14" isBold="true"/> + </textElement> + <text><![CDATA[单价]]></text> + </staticText> </band> </columnHeader> <detail> @@ -121,17 +150,18 @@ <textFieldExpression><![CDATA[$F{departmentName}]]></textFieldExpression> </textField> <subreport> - <reportElement uuid="cb111ba9-ddae-4f99-a8b8-830c146fc855" x="150" y="0" width="440" height="40"/> + <reportElement uuid="cb111ba9-ddae-4f99-a8b8-830c146fc855" x="150" y="0" width="580" height="40"/> <dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{items})]]></dataSourceExpression> <returnValue subreportVariable="totalPriceSum" toVariable="totalPriceSum" calculation="Sum"/> + <returnValue subreportVariable="totalAmountSum" toVariable="totalAmountSum" calculation="Sum"/> <subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "tousseApplyDepartment_child.jasper"]]></subreportExpression> </subreport> </band> </detail> <summary> <band height="40" splitType="Stretch"> <staticText> - <reportElement uuid="0f91e7bf-2cfa-46d4-96aa-d1e6de7bfbfc" x="0" y="0" width="490" height="40"/> + <reportElement uuid="0f91e7bf-2cfa-46d4-96aa-d1e6de7bfbfc" x="0" y="0" width="560" height="40"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -145,7 +175,7 @@ <text><![CDATA[汇总]]></text> </staticText> <textField pattern="###0.00;(###0.00)"> - <reportElement uuid="9c07e769-13e5-4a79-88e5-11481ed1cbe6" stretchType="RelativeToBandHeight" x="490" y="0" width="100" height="40" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="9c07e769-13e5-4a79-88e5-11481ed1cbe6" stretchType="RelativeToBandHeight" x="630" y="0" width="100" height="40" isPrintWhenDetailOverflows="true"/> <box> <pen lineWidth="1.0"/> <topPen lineWidth="1.0"/> @@ -158,6 +188,20 @@ </textElement> <textFieldExpression><![CDATA[$V{totalPriceSum}]]></textFieldExpression> </textField> + <textField pattern="###0;(###0)"> + <reportElement uuid="9c07e769-13e5-4a79-88e5-11481ed1cbe6" stretchType="RelativeToBandHeight" x="560" y="0" width="70" height="40" isPrintWhenDetailOverflows="true"/> + <box> + <pen lineWidth="1.0"/> + <topPen lineWidth="1.0"/> + <leftPen lineWidth="1.0"/> + <bottomPen lineWidth="1.0"/> + <rightPen lineWidth="1.0"/> + </box> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="14"/> + </textElement> + <textFieldExpression><![CDATA[$V{totalAmountSum}]]></textFieldExpression> + </textField> </band> </summary> </jasperReport> Index: ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartmentNew.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartmentNew.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartmentNew.jrxml (revision 39195) @@ -0,0 +1,272 @@ +<?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="tousseApplyDepartment" language="groovy" pageWidth="580" pageHeight="640" columnWidth="580" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="e6c187fa-e96a-4bf6-b797-7bf0f5dfdbfb"> + <property name="ireport.zoom" value="1.0"/> + <property name="ireport.x" value="0"/> + <property name="ireport.y" value="0"/> + <parameter name="title" class="java.lang.String"> + <parameterDescription><![CDATA[title]]></parameterDescription> + </parameter> + <parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false"> + <defaultValueExpression><![CDATA["C:\\workspace\\sterile\\WebContent\\jasperRtp\\"]]></defaultValueExpression> + </parameter> + <field name="tousseName" class="java.lang.String"> + <fieldDescription><![CDATA[tousseName]]></fieldDescription> + </field> + <field name="amount" class="java.lang.Integer"> + <fieldDescription><![CDATA[amount]]></fieldDescription> + </field> + <field name="price" class="java.lang.Double"> + <fieldDescription><![CDATA[price]]></fieldDescription> + </field> + <field name="totalPrice" class="java.lang.Double"> + <fieldDescription><![CDATA[totalPrice]]></fieldDescription> + </field> + <field name="technicalDifficulty" class="java.lang.String"> + <fieldDescription><![CDATA[technicalDifficulty]]></fieldDescription> + </field> + <field name="weightScore" class="java.lang.Double"> + <fieldDescription><![CDATA[weightScore]]></fieldDescription> + </field> + <variable name="totalPriceSum" class="java.lang.Double" calculation="Sum"> + <variableExpression><![CDATA[$F{totalPrice}]]></variableExpression> + </variable> + <variable name="totalAmountSum" class="java.lang.Integer" calculation="Sum"> + <variableExpression><![CDATA[$F{amount}]]></variableExpression> + </variable> + <background> + <band splitType="Stretch"/> + </background> + <title> + <band height="40" splitType="Stretch"> + <textField> + <reportElement uuid="d8e60ec9-1c4a-40c1-ab15-fba2427aff26" x="0" y="0" width="580" height="40"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="14" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartment_child.jrxml =================================================================== diff -u -r21345 -r39195 --- ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartment_child.jrxml (.../tousseApplyDepartment_child.jrxml) (revision 21345) +++ ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartment_child.jrxml (.../tousseApplyDepartment_child.jrxml) (revision 39195) @@ -1,5 +1,5 @@ - + @@ -15,9 +15,18 @@ + + + + + + + + + @@ -37,7 +46,7 @@ - + @@ -49,10 +58,10 @@ - + - + @@ -66,7 +75,7 @@ - + @@ -79,6 +88,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ssts-web/src/main/webapp/jasperRtp/tousseApplyDepartment_child.jasper =================================================================== diff -u -r21345 -r39195 Binary files differ