更新

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/constant/InspectionFileEnum.java

@@ -18,6 +18,7 @@ public enum InspectionFileEnum {
     JY_EQUIPMENT("jy_equipment","救援设备文件夹"),
     WX_STAFF("wxstaff", "维修员工文件夹"),
     INSPECTION_CUSTOMER("small_inspection_member_folder", "检测客户资料夹"),
+    REPAIR_CUSTOMER("small_repair_customer_member_folder", "维修客户文件夹"),
     ;
 
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/admin/StatisticsController.java

@@ -47,4 +47,16 @@ public class StatisticsController {
     public CommonResult<?> queryStaffStatisticsGroupByGoods(@RequestBody DlInspectionProject dlInspectionProject) {
         return CommonResult.success(statisticsService.queryStaffCountGroupByGoods(dlInspectionProject));
     }
+
+    /**
+     * @description : 获取员工产值排行榜
+     * @author xyc
+     * @date 16:52 2025/10/11
+     * @param dlInspectionProject {@link DlInspectionProject}
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+     **/
+    @PostMapping("/queryOutputMoneyStatisticsRanking")
+    public CommonResult<?> queryOutputMoneyStatisticsRanking(@RequestBody DlInspectionProject dlInspectionProject) {
+        return CommonResult.success(statisticsService.queryOutputMoneyStatisticsRanking(dlInspectionProject));
+    }
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionWorkNodeMapper.java

@@ -81,4 +81,13 @@ public interface InspectionWorkNodeMapper extends BaseMapper<InspectionWorkNode>
      * @return: java.util.Map<java.lang.String,java.lang.Object>
      **/
     Map<String, Object> queryOutputMoneyStatistics(DlInspectionProject dlInspectionProject);
+
+    /**
+     * @description : 获取员工项目统计排名
+     * @author xyc
+     * @date 16:48 2025/10/11
+     * @param dlInspectionProject {@link DlInspectionProject}
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     **/
+    List<Map<String, Object>> queryOutputMoneyStatisticsRanking(DlInspectionProject dlInspectionProject);
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/StatisticsService.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.inspection.service;
 
 import cn.iocoder.yudao.module.inspection.entity.DlInspectionProject;
 
+import java.util.List;
 import java.util.Map;
 
 public interface StatisticsService {
@@ -23,4 +24,13 @@ public interface StatisticsService {
      * @return: java.util.Map<java.lang.String,java.lang.Object>
      **/
     Map<String, Object> queryStaffCountGroupByGoods(DlInspectionProject dlInspectionProject);
+
+    /**
+     * @description: 获取员工产值排行榜
+     * @author: 许
+     * @date: 2025/8/5 14:07
+     * @param: [dlInspectionProject]
+     * @return: java.util.Map<java.lang.String,java.lang.Object>
+     **/
+    List<Map<String, Object>> queryOutputMoneyStatisticsRanking(DlInspectionProject dlInspectionProject);
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java

@@ -77,6 +77,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -2567,24 +2568,32 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
                 .filter(info -> info.getReturnCarUserId() != null) // 过滤 null 值
                 .collect(Collectors.groupingBy(InspectionInfo::getReturnCarUserId));
 
-        // 先计算所有项目的总完成数
+        // 先计算所有项目的总完成数和总产值
         Map<String, Long> projectTotalMap = new HashMap<>();
+        Map<String, BigDecimal> projectTotalOutputValueMap = new HashMap<>(); // 总产值统计
 
         for (Map<String, Object> stringObjectMap : staffCount) {
             Set<Long> inspectionInfoIds = new HashSet<>();
+            BigDecimal userTotalOutputValue = BigDecimal.ZERO; // 员工总产值
 
             Long userId = (Long) stringObjectMap.get("userId");
             List<Map<String, Object>> children = (List<Map<String, Object>>) stringObjectMap.get("children");
 
-            inspectionInfoIds.addAll(
-                    children.stream()
-                            .map(map -> (String) map.get("inspectionInfoId")) // 获取逗号分隔的字符串
-                            .flatMap(idsStr -> Arrays.stream(idsStr.split(","))) // 拆分成单个ID字符串
-                            .map(String::trim) // 去除前后空格
-                            .filter(idStr -> !idStr.isEmpty()) // 过滤空字符串
-                            .map(Long::valueOf) // 转换为Long类型
-                            .collect(Collectors.toList())
-            );
+            // 处理项目节点
+            for (Map<String, Object> child : children) {
+                BigDecimal outputValue = (BigDecimal) child.get("outputValue");
+                if (outputValue != null) {
+                    userTotalOutputValue = userTotalOutputValue.add(outputValue);
+                }
+
+                inspectionInfoIds.addAll(
+                        Arrays.stream(((String) child.get("inspectionInfoId")).split(","))
+                                .map(String::trim)
+                                .filter(idStr -> !idStr.isEmpty())
+                                .map(Long::valueOf)
+                                .collect(Collectors.toList())
+                );
+            }
 
             // 获取所有接车信息
             List<InspectionInfo> inspectionInfos = meetManIdCountMap.get(userId);
@@ -2597,18 +2606,20 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
                 inspectionInfoIds.addAll(inspectionInfos.stream().map(InspectionInfo::getId).collect(Collectors.toList()));
             }
 
-            HashMap<String, Object> objectObjectHashMap = new HashMap<>();
-            objectObjectHashMap.put("count", meetCount);
-            objectObjectHashMap.put("projectName", "接车拍照");
-            children.add(objectObjectHashMap);
+            // 添加工单相关项目（这些项目产值暂时为0）
+            HashMap<String, Object> meetCarMap = new HashMap<>();
+            meetCarMap.put("count", meetCount);
+            meetCarMap.put("projectName", "接车拍照");
+            meetCarMap.put("outputValue", BigDecimal.ZERO);
+            children.add(meetCarMap);
 
-            HashMap<String, Object> meetCarHashMap = new HashMap<>();
-            meetCarHashMap.put("count", meetGoCount);
-            meetCarHashMap.put("projectName", "上门接车");
-            children.add(meetCarHashMap);
+            HashMap<String, Object> meetGoMap = new HashMap<>();
+            meetGoMap.put("count", meetGoCount);
+            meetGoMap.put("projectName", "上门接车");
+            meetGoMap.put("outputValue", BigDecimal.ZERO);
+            children.add(meetGoMap);
 
-            //还车
-            //设置totalCount
+            // 还车信息
             List<InspectionInfo> returnCarInfoList = returnCarUserIdCountMap.get(userId);
             long returnCount = 0;
             long returnGoCount = 0;
@@ -2616,42 +2627,43 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
             if (CollUtil.isNotEmpty(returnCarInfoList)) {
                 inspectionInfoIds.addAll(returnCarInfoList.stream().map(InspectionInfo::getId).collect(Collectors.toList()));
 
-                returnCount = Optional.ofNullable(returnCarInfoList)
-                        .orElse(Collections.emptyList())
-                        .stream()
-                        .filter(Objects::nonNull)
+                returnCount = returnCarInfoList.stream()
                         .filter(i -> i.getReturnType() != null && i.getReturnType() == 0)
                         .count();
 
-                returnGoCount = Optional.ofNullable(returnCarInfoList)
-                        .orElse(Collections.emptyList())
-                        .stream()
-                        .filter(Objects::nonNull)
+                returnGoCount = returnCarInfoList.stream()
                         .filter(i -> i.getReturnType() != null && i.getReturnType() == 1)
                         .count();
             }
 
-            stringObjectMap.put("totalCount", Long.parseLong(String.valueOf(inspectionInfoIds.size())));
+            stringObjectMap.put("totalCount", inspectionInfoIds.size());
+            stringObjectMap.put("totalOutputValue", userTotalOutputValue); // 设置员工总产值
 
-            Map<String, Object> objectObjectHashMap1 = new HashMap<>();
-            objectObjectHashMap1.put("count", returnCount);
-            objectObjectHashMap1.put("projectName", "还车拍照");
-            children.add(objectObjectHashMap1);
+            Map<String, Object> returnCarMap = new HashMap<>();
+            returnCarMap.put("count", returnCount);
+            returnCarMap.put("projectName", "还车拍照");
+            returnCarMap.put("outputValue", BigDecimal.ZERO);
+            children.add(returnCarMap);
 
-            Map<String, Object> returnCarHashMap = new HashMap<>();
-            returnCarHashMap.put("count", returnGoCount);
-            returnCarHashMap.put("projectName", "上门还车");
-            children.add(returnCarHashMap);
+            Map<String, Object> returnGoMap = new HashMap<>();
+            returnGoMap.put("count", returnGoCount);
+            returnGoMap.put("projectName", "上门还车");
+            returnGoMap.put("outputValue", BigDecimal.ZERO);
+            children.add(returnGoMap);
         }
 
-        // 计算每个项目的总完成数
+        // 计算每个项目的总完成数和总产值
         for (Map<String, Object> staff : staffCount) {
             List<Map<String, Object>> children = (List<Map<String, Object>>) staff.get("children");
             if (children != null) {
                 for (Map<String, Object> child : children) {
                     String projectName = (String) child.get("projectName");
                     Long count = (Long) child.get("count");
+                    BigDecimal outputValue = (BigDecimal) child.get("outputValue");
+
                     projectTotalMap.put(projectName, projectTotalMap.getOrDefault(projectName, 0L) + count);
+                    projectTotalOutputValueMap.put(projectName,
+                            projectTotalOutputValueMap.getOrDefault(projectName, BigDecimal.ZERO).add(outputValue != null ? outputValue : BigDecimal.ZERO));
                 }
             }
         }
@@ -2675,19 +2687,22 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
             }
         }
 
-        // 按 meetCarCount 降序排序员工
-        staffCount.sort(Comparator.comparingLong(
-                (Map<String, Object> staff) -> (Long) staff.getOrDefault("totalCount", 0L)
+        // 按总产值降序排序员工
+        staffCount.sort(Comparator.comparing(
+                (Map<String, Object> staff) -> (BigDecimal) staff.getOrDefault("totalOutputValue", BigDecimal.ZERO)
         ).reversed());
 
-        // 对每个员工的 children 按 count 降序排序
-        // 对每个员工的 children：先移除 count == 0 的项，再按 count 降序排序
+        // 对每个员工的 children 按产值降序排序
         staffCount.forEach(staff -> {
             List<Map<String, Object>> children = (List<Map<String, Object>>) staff.get("children");
             if (children != null) {
-                children.removeIf(child -> ((Long) child.getOrDefault("count", 0L)) == 0L);
-                children.sort(Comparator.comparingLong(
-                        (Map<String, Object> child) -> (Long) child.getOrDefault("count", 0L)
+                children.removeIf(child -> {
+                    Long count = (Long) child.getOrDefault("count", 0L);
+                    BigDecimal outputValue = (BigDecimal) child.getOrDefault("outputValue", BigDecimal.ZERO);
+                    return count == 0L && outputValue.compareTo(BigDecimal.ZERO) == 0;
+                });
+                children.sort(Comparator.comparing(
+                        (Map<String, Object> child) -> (BigDecimal) child.getOrDefault("outputValue", BigDecimal.ZERO)
                 ).reversed());
             }
         });

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java

@@ -676,7 +676,8 @@ public class InspectionFileServiceImpl extends ServiceImpl<InspectionFileMapper,
     @Override
     public void warnReminder() {
         // 查询出检测小程序的资料文件夹
-        InspectionFile inspectionFile = baseMapper.selectOne(new LambdaQueryWrapper<InspectionFile>().eq(InspectionFile::getDefaultKey, InspectionFileEnum.INSPECTION_CUSTOMER.getType()));
+        // TODO 优化 暂未适配其他系统
+        InspectionFile inspectionFile = baseMapper.selectOne(new LambdaQueryWrapper<InspectionFile>().in(InspectionFile::getDefaultKey, InspectionFileEnum.INSPECTION_CUSTOMER.getType()));
         if (inspectionFile != null) {
             // 查询出code中所有带这个文件夹id的文件
             List<InspectionFile> inspectionFiles = baseMapper.selectList(Wrappers.<InspectionFile>lambdaQuery().like(InspectionFile::getFileCode, inspectionFile.getId()).eq(InspectionFile::getType, InspectionConstants.INSPECTION_FILE));

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -462,6 +463,7 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl<InspectionWorkNod
                 m.put("userId", vo.getUserId());
                 m.put("nickname", vo.getNickname());
                 m.put("totalCount", 0L); // 初始总数
+                m.put("totalOutputValue", BigDecimal.ZERO); // 初始总产值
                 m.put("children", new ArrayList<Map<String, Object>>());
                 return m;
             });
@@ -469,29 +471,50 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl<InspectionWorkNod
             // 添加项目
             List<Map<String, Object>> children = (List<Map<String, Object>>) userEntry.get("children");
             vo.setCount(vo.getCount() == null ? 0 : vo.getCount());
-            if (vo.getCount() == 0) {
+
+            // 即使count为0，但如果产值不为0，也要显示
+            if (vo.getCount() == 0 && (vo.getOutputValue() == null || vo.getOutputValue().compareTo(BigDecimal.ZERO) == 0)) {
                 continue;
             }
+
             Map<String, Object> project = new HashMap<>();
             project.put("projectName", vo.getProjectName());
             project.put("count", vo.getCount());
             project.put("id", vo.getId());
             project.put("inspectionInfoId", vo.getInspectionInfoIds());
+            project.put("outputValue", vo.getOutputValue() != null ? vo.getOutputValue() : BigDecimal.ZERO);
             children.add(project);
 
-            // 累加总数
+            // 累加总数和总产值
             Long currentTotal = (Long) userEntry.get("totalCount");
+            BigDecimal currentOutputValue = (BigDecimal) userEntry.get("totalOutputValue");
             userEntry.put("totalCount", currentTotal + vo.getCount());
+            userEntry.put("totalOutputValue", currentOutputValue.add(
+                    vo.getOutputValue() != null ? vo.getOutputValue() : BigDecimal.ZERO));
         }
 
-        // 转成 List 并按 totalCount 降序排序
+        // 转成 List 并按总产值降序排序
         return tempMap.values().stream()
                 .peek(userEntry -> {
-                    // 排序每个用户下的项目 children
+                    // 排序每个用户下的项目：按产值降序，产值相同按数量降序
                     List<Map<String, Object>> children = (List<Map<String, Object>>) userEntry.get("children");
-                    children.sort((a, b) -> Long.compare((Long) b.get("count"), (Long) a.get("count")));
+                    children.sort((a, b) -> {
+                        BigDecimal outputValueA = (BigDecimal) a.get("outputValue");
+                        BigDecimal outputValueB = (BigDecimal) b.get("outputValue");
+                        int result = outputValueB.compareTo(outputValueA);
+                        if (result == 0) {
+                            Long countA = (Long) a.get("count");
+                            Long countB = (Long) b.get("count");
+                            return Long.compare(countB, countA);
+                        }
+                        return result;
+                    });
+                })
+                .sorted((a, b) -> {
+                    BigDecimal outputValueA = (BigDecimal) a.get("totalOutputValue");
+                    BigDecimal outputValueB = (BigDecimal) b.get("totalOutputValue");
+                    return outputValueB.compareTo(outputValueA);
                 })
-                .sorted((a, b) -> Long.compare((Long) b.get("totalCount"), (Long) a.get("totalCount")))
                 .collect(Collectors.toList());
     }
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/StatisticsServiceImpl.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.inspection.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.module.inspection.entity.DlInspectionProject;
 import cn.iocoder.yudao.module.inspection.entity.InspectionInfo;
+import cn.iocoder.yudao.module.inspection.mapper.InspectionWorkNodeMapper;
 import cn.iocoder.yudao.module.inspection.service.IInspectionInfoService;
 import cn.iocoder.yudao.module.inspection.service.IInspectionWorkNodeService;
 import cn.iocoder.yudao.module.inspection.service.StatisticsService;
@@ -33,6 +34,8 @@ public class StatisticsServiceImpl implements StatisticsService {
     private final IInspectionInfoService inspectionInfoService;
 
     private final AdminUserApi adminUserApi;
+
+    private final InspectionWorkNodeMapper inspectionWorkNodeMapper;
     /**
      * @description: 获取员工统计信息
      * @author: 许
@@ -161,4 +164,9 @@ public class StatisticsServiceImpl implements StatisticsService {
 
         return staffCount;
     }
+
+    @Override
+    public List<Map<String, Object>> queryOutputMoneyStatisticsRanking(DlInspectionProject dlInspectionProject) {
+        return inspectionWorkNodeMapper.queryOutputMoneyStatisticsRanking(dlInspectionProject);
+    }
 }

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/StaffProjectCountVO.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.inspection.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class StaffProjectCountVO {
     private String id;
@@ -12,4 +14,6 @@ public class StaffProjectCountVO {
     private Long nodeCount;
 //    private Long inspectionInfoId;
     private String inspectionInfoIds;
+    private BigDecimal outputValue; // 项目产值
+    private BigDecimal goodsPrice; // 商品价格
 }

dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml

@@ -248,7 +248,10 @@
         ip.id AS project_id,
         GROUP_CONCAT(iwn.inspection_info_id) AS inspectionInfoIds,
         su.nickname,
-        SUM(IF(iwn.node_count = 0,1,iwn.node_count)) count
+        SUM(IF(iwn.node_count = 0,1,iwn.node_count)) count,
+        -- 添加产值计算：合格节点的商品价格总和（单位：元）
+        COALESCE(SUM(CASE WHEN iwn.status = '2' AND iwn.type = '1' THEN oi.goods_price ELSE 0 END) / 100, 0) AS outputValue,
+        oi.goods_price
         FROM
         inspection_staff staff
         LEFT JOIN inspection_work_node iwn ON iwn.deal_user_id = staff.user_id
@@ -256,6 +259,8 @@
             AND iwn.create_time BETWEEN concat(#{datetimeRange[0]}, ' 00:00:00')  AND concat(#{datetimeRange[1]}, ' 23:59:59')
         </if>
         LEFT JOIN inspection_project ip ON ip.id = iwn.project_id
+        LEFT JOIN inspection_info ii ON iwn.inspection_info_id = ii.id
+        LEFT JOIN order_info oi ON ii.inspection_order_id = oi.id
         LEFT JOIN (
         SELECT DISTINCT sur.user_id
         FROM system_user_role sur
@@ -270,33 +275,8 @@
             <if test="userId != null and userId != ''">
                 AND staff.user_id = #{userId}
             </if>
-
         </where>
-        GROUP BY staff.user_id ,ip.id
-
-        <!--SELECT
-        ip.id AS project_id,
-        ip.project_name,
-        is2.user_id,
-        su.nickname,
-        iwn.inspection_info_id,
-        COUNT(iwn.id) AS count,
-        SUM(iwn.node_count) AS nodeCount
-        FROM inspection_staff is2
-        CROSS JOIN inspection_project ip
-        LEFT JOIN system_users su ON su.id = is2.user_id
-        left join system_user_role sr on su.id = sr.user_id
-        left join system_role sr2 on sr.role_id = sr2.id
-        INNER JOIN inspection_work_node iwn ON
-        iwn.deal_user_id = is2.user_id
-        AND iwn.project_id = ip.id
-        <if test="datetimeRange != null">
-            AND iwn.create_time BETWEEN #{datetimeRange[0]} AND #{datetimeRange[1]}
-        </if>
-        WHERE
-        is2.deleted = 0
-        AND su.deleted = 0 and sr2.service_package_id = 'jiance' and sr2.code != 'jcyh' and sr2.code != 'jcywjl'
-        GROUP BY is2.user_id, ip.id-->
+        GROUP BY staff.user_id, ip.id
     </select>
 
     <select id="selectExceptionNodesByInspectionIds" resultType="java.util.Map">
@@ -521,4 +501,47 @@
         GROUP BY
         iw.deal_user_id;
     </select>
+    <select id="queryOutputMoneyStatisticsRanking" resultType="java.util.Map"
+            parameterType="cn.iocoder.yudao.module.inspection.entity.DlInspectionProject">
+        SELECT
+        users.nickname,
+        s.user_id AS userId,
+
+        -- 初检公示产值：流程次数为1的订单公示价格
+        COALESCE(SUM(CASE WHEN iw.node_count = 1 THEN oi.goods_price ELSE 0 END) / 100, 0) AS initialInspectionOutputValue,
+
+        -- 复检公示产值：流程次数大于1的订单公示价格总和
+        COALESCE(SUM(CASE WHEN iw.node_count > 1 THEN oi.goods_price ELSE 0 END) / 100, 0) AS recheckInspectionOutputValue,
+
+        -- 初检合格产值
+        COALESCE(SUM(CASE WHEN iw.node_count = 1 AND iw.status = '2' AND iw.type = '1' THEN oi.goods_price ELSE 0 END) / 100, 0) AS initialInspectionPassOutputValue,
+
+        -- 复检合格产值
+        COALESCE(SUM(CASE WHEN iw.node_count > 1 AND iw.status = '2' AND iw.type = '1' THEN oi.goods_price ELSE 0 END) / 100, 0) AS recheckInspectionPassOutputValue,
+
+        -- 总合格产值（初检 + 复检）
+        COALESCE(SUM(CASE WHEN iw.status = '2' AND iw.type = '1' THEN oi.goods_price ELSE 0 END) / 100, 0) AS totalPassOutputValue
+
+        FROM
+        inspection_staff s
+        LEFT JOIN inspection_work_node iw ON s.user_id = iw.deal_user_id
+        LEFT JOIN inspection_info ii ON iw.inspection_info_id = ii.id
+        LEFT JOIN order_info oi ON ii.inspection_order_id = oi.id
+        LEFT JOIN system_users users on users.id = s.user_id
+
+        WHERE
+        s.deleted = 0
+        AND iw.deleted = 0
+        AND ii.deleted = 0
+        <if test="datetimeRange != null and datetimeRange.size() == 2">
+            AND iw.create_time BETWEEN CONCAT(#{datetimeRange[0]}, ' 00:00:00')
+            AND CONCAT(#{datetimeRange[1]}, ' 23:59:59')
+        </if>
+
+        GROUP BY
+        s.user_id, s.unique_code, s.school, s.educational, s.join_date, s.address, s.short_number
+
+        ORDER BY
+        totalPassOutputValue DESC;   -- 按总合格产值倒序排行
+    </select>
 </mapper>

dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml

@@ -762,6 +762,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
 
         </if>
+        <if test="query.chooseStatus == '5'.toString()">
+            AND ins.reinspect_count != 0 AND ins.reinspect_count IS NOT NULL
+        </if>
+        <if test="query.chooseStatus == '6'.toString()">
+            AND ins.recheck_count != 0 AND ins.recheck_count IS NOT NULL
+        </if>
         <if test="query.payStatus == 0">
             and (oi.pay_money is null OR oi.pay_type = 'sz')
         </if>

dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java

@@ -164,21 +164,26 @@ public class DlDriveSchoolStudentController {
         //默认查全部数据
         String startTimeStr = "";
         String endTimeStr = "";
-        if("more".equals(timeType)){
-            if(StringUtils.isNotEmpty(startTime)){
-                startTimeStr = startTime+" 00:00:01";
+        if (startTime != null && endTime != null) {
+            startTimeStr = startTime+" 00:00:00";
+            endTimeStr = endTime+" 23:59:59";
+        }else {
+            if ("more".equals(timeType)) {
+                if (StringUtils.isNotEmpty(startTime)) {
+                    startTimeStr = startTime + " 00:00:01";
+                }
+                if (StringUtils.isNotEmpty(endTime)) {
+                    endTimeStr = endTime + " 23:59:59";
+                }
+            } else if ("month".equals(timeType)) {
+                //当月
+                startTimeStr = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 00:00:01";
+                endTimeStr = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59";
+            } else if ("day".equals(timeType)) {
+                //当天
+                startTimeStr = DateUtil.formatDate(DateUtil.date()) + " 00:00:01";
+                endTimeStr = DateUtil.formatDate(DateUtil.date()) + " 23:59:59";
             }
-            if(StringUtils.isNotEmpty(endTime)) {
-                endTimeStr = endTime + " 23:59:59";
-            }
-        }else if("month".equals(timeType)){
-            //当月
-            startTimeStr = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()),"yyyy-MM-dd")+" 00:00:01";
-            endTimeStr = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()),"yyyy-MM-dd")+" 23:59:59";
-        }else if("day".equals(timeType)){
-            //当天
-            startTimeStr = DateUtil.formatDate(DateUtil.date())+" 00:00:01";
-            endTimeStr = DateUtil.formatDate(DateUtil.date())+" 23:59:59";
         }
         return success(schoolStudentService.indexGetTrainList(type,coachId,startTimeStr,endTimeStr));
     }

dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml

@@ -583,7 +583,7 @@
         <if test="type != null and type != ''">
             AND s.source = #{type}
         </if>
-        LEFT JOIN drive_school_course_order o ON s.user_id = o.user_id AND o.payment_status > 1 AND o.deleted=0 AND o.is_sign = 1 AND o.if_end = 0
+        Inner JOIN drive_school_course_order o ON s.user_id = o.user_id AND o.payment_status > 1 AND o.deleted=0 AND o.is_sign = 1 AND o.if_end = 0
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml

@@ -23,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			parameterType="cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO">
 		select distinct su.*,GROUP_CONCAT(DISTINCT sr2.name SEPARATOR ',') AS roleNames
 		from inspection_staff staff
-		    LEFT JOIN system_users  su on staff.user_id = su.id
-		left join system_user_role sr on su.id = sr.user_id
-		left join system_role sr2 on sr.role_id = sr2.id
+		inner JOIN system_users  su on staff.user_id = su.id
+		inner join system_user_role sr on su.id = sr.user_id
+		inner join system_role sr2 on sr.role_id = sr2.id
 		<where>
-			su.deleted = 0
+			su.deleted = 0 and staff.deleted =0
 			<if test="role.nickname != null">
 				and (su.nickname like CONCAT('%',#{role.nickname},'%') OR su.username like CONCAT('%',#{role.nickname},'%'))
 			</if>