|
@@ -564,7 +564,7 @@ public class DatadetailController {
|
|
int pendingCount = list.stream().filter(x -> x.getStatus() == null || x.getStatus() == 0).collect(Collectors.toList()).size();
|
|
int pendingCount = list.stream().filter(x -> x.getStatus() == null || x.getStatus() == 0).collect(Collectors.toList()).size();
|
|
result.setPendingCount(pendingCount);
|
|
result.setPendingCount(pendingCount);
|
|
|
|
|
|
- String sql = "SELECT IFNULL(t3.name, '未填写') AS item,COUNT(t1.id) AS a_count,SUM(t1.amount) as a_sum FROM wf_subscription_list t1" +
|
|
|
|
|
|
+ String sql = "SELECT IFNULL(t3.name, '未填写') AS item,COUNT(t1.id) AS a_count,SUM(t1.estimated_unit_price) as a_sum FROM wf_subscription_list t1" +
|
|
" INNER JOIN wf_subscription t2 ON t1.parent_id = t2.id" +
|
|
" INNER JOIN wf_subscription t2 ON t1.parent_id = t2.id" +
|
|
" LEFT JOIN xjr_dictionary_detail t3 ON t1.item_type = t3.code" +
|
|
" LEFT JOIN xjr_dictionary_detail t3 ON t1.item_type = t3.code" +
|
|
" AND t3.item_id = 1752140413593518081" +
|
|
" AND t3.item_id = 1752140413593518081" +
|
|
@@ -595,7 +595,7 @@ public class DatadetailController {
|
|
result.setCategoryCountList(categoryCountList);
|
|
result.setCategoryCountList(categoryCountList);
|
|
result.setCategoryAmountList(categoryAmountList);
|
|
result.setCategoryAmountList(categoryAmountList);
|
|
|
|
|
|
- sql = "SELECT IFNULL(t3.name, '未填写') AS item,COUNT(t1.id) AS a_count,SUM(t1.amount) as a_sum FROM wf_subscription_list t1" +
|
|
|
|
|
|
+ sql = "SELECT IFNULL(t3.name, '未填写') AS item,COUNT(t1.id) AS a_count,SUM(t1.estimated_unit_price) as a_sum FROM wf_subscription_list t1" +
|
|
" INNER JOIN wf_subscription t2 ON t1.parent_id = t2.id" +
|
|
" INNER JOIN wf_subscription t2 ON t1.parent_id = t2.id" +
|
|
" LEFT JOIN xjr_department t3 ON t2.application_department = t3.id" +
|
|
" LEFT JOIN xjr_department t3 ON t2.application_department = t3.id" +
|
|
" WHERE t2.status = 1";
|
|
" WHERE t2.status = 1";
|