月报表修改

hx-sale/src/main/java/com/fjhx/sale/service/dept/impl/DeptPerfServiceImpl.java

@@ -91,7 +91,7 @@ public class DeptPerfServiceImpl extends ServiceImpl<DeptPerfMapper, DeptPerf> i
             DeptPerf deptPerf = deptPerfMap.get(deptPerfReporting.getGroupId());
             if (ObjectUtil.isNotEmpty(deptPerf)) {
                 BigDecimal targetAmount = getTargetAmount(deptPerf, month);
-                deptPerfReporting.setTargetAmount(targetAmount);
+                deptPerfReporting.setTargetAmount(targetAmount.multiply(BigDecimal.valueOf(10000)));
             }
 
             //赋值完成率
@@ -104,11 +104,11 @@ public class DeptPerfServiceImpl extends ServiceImpl<DeptPerfMapper, DeptPerf> i
 
         }
 
-        //排序
+        //按金额排序
         Collections.sort(deptPerfReports, new Comparator<DeptPerfReporting>() {
             @Override
             public int compare(DeptPerfReporting p1, DeptPerfReporting p2) {
-                return p2.getSumAmount().compareTo(p1.getSumAmount()); // 按年龄字段进行排序
+                return p2.getSumAmount().compareTo(p1.getSumAmount());
             }
         });
         //赋值排名
@@ -117,6 +117,14 @@ public class DeptPerfServiceImpl extends ServiceImpl<DeptPerfMapper, DeptPerf> i
             deptPerfReporting.setRanking(i + 1);
         }
 
+        //按部门排序
+        Collections.sort(deptPerfReports, new Comparator<DeptPerfReporting>() {
+            @Override
+            public int compare(DeptPerfReporting p1, DeptPerfReporting p2) {
+                return p1.getDeptId().compareTo(p2.getDeptId());
+            }
+        });
+
 
         //赋值每日信息
         List<JSONObject> reData = new ArrayList<>();

hx-sale/src/main/resources/mapper/dept/DeptPerfMapper.xml

@@ -42,7 +42,8 @@
         FROM (SELECT de.dept_id,
                      de.dept_name,
                      gr.dept_id   AS groupId,
-                     gr.dept_name AS groupName
+                     gr.dept_name AS groupName,
+                     gr.jst_distributor
               FROM sys_dept gr
                        LEFT JOIN sys_dept de ON gr.parent_id = de.dept_id
               WHERE gr.type != 0
@@ -53,8 +54,9 @@
                   gr.dept_id) t1
                  LEFT JOIN contract c ON c.dept_id = t1.groupId AND
                                          DATE_FORMAT(c.create_time, '%Y-%m') = DATE_FORMAT(#{dto.beginTime}, '%Y-%m')
-                 LEFT JOIN jst_order_info joi ON joi.dept_id = t1.groupId AND DATE_FORMAT(joi.created, '%Y-%m') =
-                                                                              DATE_FORMAT(#{dto.beginTime}, '%Y-%m')
+                 LEFT JOIN jst_order_info joi
+                           ON joi.drp_from = t1.jst_distributor AND DATE_FORMAT(joi.created, '%Y-%m') =
+                                                                    DATE_FORMAT(#{dto.beginTime}, '%Y-%m')
         GROUP BY t1.groupId
     </select>
     <select id="getDayRepo" resultType="com.fjhx.sale.entity.DeptPerfReporting">
@@ -73,14 +75,15 @@
               GROUP BY c.dept_id,
                        DATE_FORMAT(c.create_time, '%Y-%m-%d')
               UNION ALL
-              SELECT joi.dept_id,
+              SELECT de.dept_id,
                      DATE_FORMAT(joi.created, '%Y-%m-%d') AS dayStr,
                      NULL                                 AS sumAmount,
                      sum(joi.amount)                      AS sumJstAmount
               FROM jst_order_info joi
+                       LEFT JOIN sys_dept de ON joi.drp_from = de.jst_distributor
               WHERE DATE_FORMAT(joi.created, '%Y-%m') = DATE_FORMAT(#{dto.beginTime}, '%Y-%m')
-                AND NOT joi.dept_id IS NULL
-              GROUP BY joi.dept_id,
+                AND NOT de.dept_id IS NULL
+              GROUP BY de.dept_id,
                        DATE_FORMAT(joi.created, '%Y-%m-%d')) t1
         GROUP BY t1.dept_id,
                  t1.dayStr