修改-查询商机数量

yd-api/src/main/resources/mapper/agms/AgmsDashboardMapper.xml

@@ -37,31 +37,31 @@ select if(b.branch_name is null,'暂无公司',b.branch_name) branchName,
        if(s.name is null ,'暂无团队',s.name) subordinateName,
        if(s.name is null ,'暂无团队',s.name) subordinateName,
     <choose>
     <choose>
         <when test="time.equalsIgnoreCase('D')">
         <when test="time.equalsIgnoreCase('D')">
-           count(case when to_days(a.created_at)=to_days(now()) then a.id else 0 end) opportunityNum,
+           sum(case when to_days(a.created_at)=to_days(now()) then 1 else 0 end) opportunityNum,
            sum(case when to_days(a.time_to_close)=to_days(now()) then a.FYP else 0 end) predictFYP,
            sum(case when to_days(a.time_to_close)=to_days(now()) then a.FYP else 0 end) predictFYP,
            sum(case when to_days(a.time_to_close)=to_days(now()) then a.FYC else 0 end) predictFYC,
            sum(case when to_days(a.time_to_close)=to_days(now()) then a.FYC else 0 end) predictFYC,
            sum(case when to_days(a.time_to_close)=to_days(now()) then a.pieces else 0 end) pieces
            sum(case when to_days(a.time_to_close)=to_days(now()) then a.pieces else 0 end) pieces
         </when>
         </when>
         <when test="time.equalsIgnoreCase('W')">
         <when test="time.equalsIgnoreCase('W')">
-            count(case when YEARWEEK(date_format(a.created_at, '%Y-%m-%d'))=YEARWEEK(now()) then a.id else 0 end) opportunityNum,
+            sum(case when YEARWEEK(date_format(a.created_at, '%Y-%m-%d'))=YEARWEEK(now()) then 1 else 0 end) opportunityNum,
             sum(case when YEARWEEK(date_format(a.time_to_close, '%Y-%m-%d')) = YEARWEEK(now()) then a.FYP else 0 end) predictFYP,
             sum(case when YEARWEEK(date_format(a.time_to_close, '%Y-%m-%d')) = YEARWEEK(now()) then a.FYP else 0 end) predictFYP,
             sum(case when YEARWEEK(date_format(a.time_to_close, '%Y-%m-%d')) = YEARWEEK(now()) then a.FYC else 0 end) predictFYC,
             sum(case when YEARWEEK(date_format(a.time_to_close, '%Y-%m-%d')) = YEARWEEK(now()) then a.FYC else 0 end) predictFYC,
             sum(case when YEARWEEK(date_format(a.time_to_close, '%Y-%m-%d')) = YEARWEEK(now()) then a.pieces else 0 end) pieces
             sum(case when YEARWEEK(date_format(a.time_to_close, '%Y-%m-%d')) = YEARWEEK(now()) then a.pieces else 0 end) pieces
         </when>
         </when>
         <when test="time.equalsIgnoreCase('M')">
         <when test="time.equalsIgnoreCase('M')">
-            count(case when date_format(a.created_at, '%Y-%m') = date_format(now(), '%Y-%m') then a.id else 0 end) opportunityNum,
+            sum(case when date_format(a.created_at, '%Y-%m') = date_format(now(), '%Y-%m') then 1 else 0 end) opportunityNum,
             sum(case when date_format(a.time_to_close, '%Y-%m') = date_format(now(), '%Y-%m') then a.FYP else 0 end) predictFYP,
             sum(case when date_format(a.time_to_close, '%Y-%m') = date_format(now(), '%Y-%m') then a.FYP else 0 end) predictFYP,
             sum(case when date_format(a.time_to_close, '%Y-%m') = date_format(now(), '%Y-%m') then a.FYC else 0 end) predictFYC,
             sum(case when date_format(a.time_to_close, '%Y-%m') = date_format(now(), '%Y-%m') then a.FYC else 0 end) predictFYC,
             sum(case when date_format(a.time_to_close, '%Y-%m') = date_format(now(), '%Y-%m') then a.pieces else 0 end) pieces
             sum(case when date_format(a.time_to_close, '%Y-%m') = date_format(now(), '%Y-%m') then a.pieces else 0 end) pieces
         </when>
         </when>
         <when test="time.equalsIgnoreCase('Q')">
         <when test="time.equalsIgnoreCase('Q')">
-            count(case when QUARTER(a.created_at)=QUARTER(now()) then a.id else 0 end) opportunityNum,
+            sum(case when QUARTER(a.created_at)=QUARTER(now()) then 1 else 0 end) opportunityNum,
             sum(case when QUARTER(a.time_to_close) = QUARTER(now()) then a.FYP else 0 end) predictFYP,
             sum(case when QUARTER(a.time_to_close) = QUARTER(now()) then a.FYP else 0 end) predictFYP,
             sum(case when QUARTER(a.time_to_close) = QUARTER(now()) then a.FYC else 0 end) predictFYC,
             sum(case when QUARTER(a.time_to_close) = QUARTER(now()) then a.FYC else 0 end) predictFYC,
             sum(case when QUARTER(a.time_to_close) = QUARTER(now()) then a.pieces else 0 end) pieces
             sum(case when QUARTER(a.time_to_close) = QUARTER(now()) then a.pieces else 0 end) pieces
         </when>
         </when>
         <when test="time.equalsIgnoreCase('Y')">
         <when test="time.equalsIgnoreCase('Y')">
-            count(case when YEAR(a.created_at)=YEAR(now()) then a.id else 0 end) opportunityNum,
+            sum(case when YEAR(a.created_at)=YEAR(now()) then 1 else 0 end) opportunityNum,
             sum(case when YEAR(a.time_to_close) = YEAR(now()) then a.FYP else 0 end) predictFYP,
             sum(case when YEAR(a.time_to_close) = YEAR(now()) then a.FYP else 0 end) predictFYP,
             sum(case when YEAR(a.time_to_close) = YEAR(now()) then a.FYC else 0 end) predictFYC,
             sum(case when YEAR(a.time_to_close) = YEAR(now()) then a.FYC else 0 end) predictFYC,
             sum(case when YEAR(a.time_to_close) = YEAR(now()) then a.pieces else 0 end) pieces
             sum(case when YEAR(a.time_to_close) = YEAR(now()) then a.pieces else 0 end) pieces
@@ -84,7 +84,7 @@ where not EXISTS(
             group by p.subordinate_system_id
             group by p.subordinate_system_id
         </when>
         </when>
     </choose>
     </choose>
-order by predictFYC desc ,predictFYP desc ,pieces desc;
+order by predictFYC desc ,predictFYP desc ,pieces desc ,opportunityNum desc;
 </select>
 </select>