顽症报表--调整排序

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxPersistentManageDao.java

@@ -64,14 +64,13 @@ public interface ZhcxPersistentManageDao extends BaseMapper<ZhcxPersistentManage
             "    o.ID,o.PID ,o.ORGTYPE , o.FULLNAME,o.SORT  ORDER BY o.SORT desc ")
     List<OrganizationVo> getOrgUserCount(String id);
 
-    @Select("SELECT SECONDORGID AS orgId,COUNT(SECONDORGID) AS checkNumber,\n" +
+    @Select("SELECT BELONGORGID AS orgId,COUNT(BELONGORGID) AS checkNumber,\n" +
             "SUM(CASE WHEN TYPE =='处罚' AND PUNISHCONFIRMAMOUNT IS NOT NULL AND PUNISHCONFIRMAMOUNT != 0 THEN 1 ELSE 0 END) AS punishNumber,\n" +
             "SUM(CASE WHEN TYPE =='处罚' THEN PUNISHCONFIRMAMOUNT ELSE 0 END) AS punishTotalAmount\n" +
             "FROM ZHCX_PERSISTENT_MANAGE \n" +
             "WHERE DELETED = '0' AND BELONGORGID IS NOT NULL AND YEAR(CHECKDATE) = #{year} AND MONTH(CHECKDATE) =#{month} \n" +
-            " AND FIRSTORGID = #{firstOrgId} \n"+
-            " GROUP BY SECONDORGID,YEAR(CHECKDATE), MONTH(CHECKDATE)")
-    List<PersistentVo> getReportData(String year, String month,String firstOrgId);
+            " GROUP BY BELONGORGID,YEAR(CHECKDATE), MONTH(CHECKDATE)")
+    List<PersistentVo> getReportData(String year, String month);
 
     @Select("SELECT ORGID AS orgId,ORGNAME AS orgName,SORT AS sort,NUM AS userCount \n" +
             " FROM ZHCX_DEPT_PEOPLE_COUNT WHERE YEAR = #{year} AND MONTH = #{month} AND ORGCODE =#{orgCode}")

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPersistentManageServiceImpl.java

@@ -462,7 +462,7 @@ public class ZhcxPersistentManageServiceImpl extends ServiceImpl<ZhcxPersistentM
         LocalDate currentDate = LocalDate.now().withDayOfMonth(1);
         List<ZhcxPersistentReportDto> reportList = new ArrayList<>();
         //ZhcxPersistentReportDto dto;
-        List<PersistentVo> reportData = zhcxPersistentManageDao.getReportData(year, month,organization.getId());
+        List<PersistentVo> reportData = zhcxPersistentManageDao.getReportData(year, month);
         Map<String, PersistentVo> reportDataMap = reportData.stream()
                 .collect(Collectors.toMap(PersistentVo::getOrgId, data -> data));
         // 比较当前日期和传入日期