1.控制台bug优化

src/main/java/com/ydtech/modules/admin/service/impl/TaskStatisticsServiceImpl.java

@@ -525,12 +525,6 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         taskStatisticsVo.setCreatetimeStart(dateMapByType.get("startDate"));
         taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));
 
-        if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeUserId())){
-            List<String> userIds=this.getNextLevel(taskStatisticsVo.getTreeUserId());
-            if(!userIds.isEmpty()){
-                taskStatisticsVo.setUserIds(userIds);
-            }
-        }
 
         if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeType())){
             if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeUserId()) && "2".equals(taskStatisticsVo.getTreeType())){

src/main/java/com/ydtech/modules/admin/utils/KztGetDeptUtils.java

@@ -3,6 +3,8 @@ package com.ydtech.modules.admin.utils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydtech.modules.admin.dao.KztDataPermissionMapper;
 import com.ydtech.modules.admin.dao.SysUserDeptRelationshipMapper;
+import com.ydtech.modules.admin.dao.SysUserMapper;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.po.KztDataPermission;
 import com.ydtech.modules.admin.model.po.SysUserDeptRelationship;
 import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
@@ -21,6 +23,7 @@ import org.springframework.stereotype.Component;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -79,8 +82,11 @@ public class KztGetDeptUtils {
             ApplicationContext applicationContext = SpringContextUtil.getApplicationContext();
             EsmUserReferrerService dataPermissionMapper = applicationContext.getBean(EsmUserReferrerService.class);
 
+//            List<SysUser> ids = new ArrayList<>();
+//            List<String> userList = dataPermissionMapper.getUpUser(userId,ids); // 假设此方法直接返回用户列表
+
             List<String> ids = new ArrayList<>();
-            List<String> userList = dataPermissionMapper.getUpUser(userId,ids); // 假设此方法直接返回用户列表
+            List<String> userList = this.getUserTreeHx(userId, ids);
             userList.add(userId);  //添加本人
             if (!userList.isEmpty()) {
                 resultDto.setIds(userList);
@@ -89,4 +95,20 @@ public class KztGetDeptUtils {
         }
         return resultDto;
     }
+
+    private List<String> getUserTreeHx(String userId, List<String> ids) {
+        ApplicationContext applicationContext = SpringContextUtil.getApplicationContext();
+        SysUserMapper sysUserMapper = applicationContext.getBean(SysUserMapper.class);
+        sysUserMapper.selectUserById(userId);
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("leaderId", userId);
+        List<SysUser> sysUsers = sysUserMapper.selectByParams(params);
+        if (!sysUsers.isEmpty()) {
+            ids.addAll(sysUsers.stream().map(SysUser::getId).collect(Collectors.toList()));
+        }
+        for (SysUser sysUser : sysUsers) {
+            this.getUserTreeHx(sysUser.getId(), ids);
+        }
+        return ids;
+    }
 }

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -1240,7 +1240,7 @@
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) / COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) AS "closeRate",
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) / COUNT( iac.orderstatus ) AS "contributionRate",
         COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) / COUNT( iac.orderstatus ) AS "quotationRate",
-        COUNT( CASE WHEN ifa.auditstatus = 0 THEN 1 END ) AS "auditOrder"
+        COUNT( CASE WHEN ifa.auditstatus = 1 THEN 1 END ) AS "auditOrder"
         FROM
         ins_area_company iac
         LEFT JOIN ins_fee_audit ifa ON ifa.ins_order_no = iac.id
@@ -2275,14 +2275,14 @@
         pa.partner_companies_id,
         pa.insurance_company AS "insuranceCompanyName",
         COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) AS qutationCount,
-        COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) AS underwritingCount,
+        COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) AS underwritingCountRate,
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) AS qutationInsureCount,
         COUNT( CASE WHEN iac.orderstatus = 4 THEN 1 END ) AS underwritingReturn,
         COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) / COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) AS "passingRate",
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) / COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) AS "closeRate",
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) / COUNT( iac.orderstatus ) AS "contributionRate",
         COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) / COUNT( iac.orderstatus ) AS "quotationRate",
-        COUNT( CASE WHEN ifa.auditstatus = 0 THEN 1 END ) AS "auditOrder"
+        COUNT( CASE WHEN ifa.auditstatus = 1 THEN 1 END ) AS "auditOrder"
         FROM
         ins_area_company iac
         LEFT JOIN ins_fee_audit ifa ON ifa.ins_order_no = iac.id