Browse Source

新版订单签单新旧客户修改

anderx 5 months ago
parent
commit
cec78015dd

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -3240,7 +3240,7 @@
           and a.task_receiver = #{aid}
     </select>
     <select id="orderNewSignToList" resultType="com.goafanti.order.bo.outStatistics.OutOrderNewSignBo">
-        select a.name,department.name depName,
+        select a.name,department.name depName,(newCounts+counts)allCounts,(newAmount+amount) allAmount,
                newCounts,newAmount,(newCounts/(newCounts+counts)) newCountProportion,(newAmount/(newAmount+amount))newAmountProportion,
                counts,amount,(counts/(newCounts+counts)) countProportion,(amount/(newAmount+amount))amountProportion
         from (SELECT b.salesman_id,

+ 20 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutOrderNewSignBo.java

@@ -9,6 +9,10 @@ public class OutOrderNewSignBo {
     private String name;
     @Excel(name = "部门")
     private String depName;
+    @Excel(name = "总签单数",isStatistics = true)
+    private String allCounts;
+    @Excel(name = "总签单金额",isStatistics = true)
+    private BigDecimal allAmount;
     @Excel(name = "新客户签单数",isStatistics = true)
     private String newCounts;
     @Excel(name = "新客户签单金额",isStatistics = true)
@@ -26,6 +30,22 @@ public class OutOrderNewSignBo {
     @Excel(name = "旧客户签单金额占比", percentage = 1,scale = 2)
     private String amountProportion;
 
+    public String getAllCounts() {
+        return allCounts;
+    }
+
+    public void setAllCounts(String allCounts) {
+        this.allCounts = allCounts;
+    }
+
+    public BigDecimal getAllAmount() {
+        return allAmount;
+    }
+
+    public void setAllAmount(BigDecimal allAmount) {
+        this.allAmount = allAmount;
+    }
+
     public String getDepName() {
         return depName;
     }