فهرست منبع

Merge branch 'V2.0.1' into test

zhaoxian 3 سال پیش
والد
کامیت
5d32b28b15

+ 2 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/ManagerSaleValueMapper.xml

@@ -450,7 +450,7 @@
         t1.project_name as 'projectName',
         ( SELECT realname FROM `jeecg-boot`.sys_user us WHERE us.id = t1.sale_id ) AS 'saleName',
         SUM( t1.charge ) AS 'charge',
-        CONCAT( CAST( IFNULL( ROUND(( t1.charge - t3.charge ) / t3.charge * 100, 2 ), 0.00 ) AS CHAR ), '%' ) AS
+        CONCAT( CAST( IFNULL( ROUND(( SUM( t1.charge ) - t3.charge ) / t3.charge * 100, 2 ), 0.00 ) AS CHAR ), '%' ) AS
         'chargeRoi',
         IFNULL(t2.realCharge,0.00) AS 'realCharge',
         IFNULL(t2.jlCharge,0.00) AS 'jlCharge'
@@ -505,7 +505,7 @@
         t1.project_name as 'projectName',
         ( SELECT realname FROM `jeecg-boot`.sys_user us WHERE us.id = t1.sale_id ) AS 'saleName',
         SUM( t1.cost ) AS 'charge',
-        CONCAT( CAST( IFNULL( ROUND(( t1.cost - t3.charge ) / t3.charge * 100, 2 ), 0 ) AS CHAR ), '%' ) AS
+        CONCAT( CAST( IFNULL( ROUND(( SUM( t1.cost ) - t3.charge ) / t3.charge * 100, 2 ), 0 ) AS CHAR ), '%' ) AS
         'chargeRoi',
         IFNULL(t2.realCharge,0.00) AS 'realCharge',
         IFNULL(t2.jlCharge,0.00) AS 'jlCharge'