From 716536e260309621f22572b5b5af42ea7f3f4b4d Mon Sep 17 00:00:00 2001 From: Lihx Date: Sat, 2 Aug 2025 17:38:44 +0800 Subject: [PATCH 1/4] 0802 --- .../train/DriveSchoolCoachClockMapper.xml | 2 +- .../controller/admin/RescueInfoSystem.java | 12 +++++++ .../rescue/mapper/RescueInfoMapper.java | 2 ++ .../rescue/service/IRescueInfoService.java | 2 ++ .../service/impl/RescueInfoServiceImpl.java | 4 +++ .../mapper/rescue/RescueInfoMapper.xml | 32 +++++++++++++++++++ 6 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dl-module-jx/src/main/resources/mapper/train/DriveSchoolCoachClockMapper.xml b/dl-module-jx/src/main/resources/mapper/train/DriveSchoolCoachClockMapper.xml index 7b6a6690..cc3ec237 100644 --- a/dl-module-jx/src/main/resources/mapper/train/DriveSchoolCoachClockMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/train/DriveSchoolCoachClockMapper.xml @@ -331,7 +331,7 @@ AND dscc.end_time IS NULL AND dscc.deleted = 0 - AND subject = #{entity.subject} + AND dscc.subject = #{entity.subject} GROUP BY dscc.id diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java index a6d617b0..8864f19c 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java @@ -570,4 +570,16 @@ public class RescueInfoSystem extends BaseController { // 导出空白模板到Excel exportBlankTemplate(response, "staff_template.xlsx", "员工信息", head, dropdownColumns, true, exampleDataList, textColumns); } + + /** + * 导出 + */ + @GetMapping("/drviceExport") + public void exportUserList(DriverInfoDto query, + HttpServletResponse response) throws IOException { + List list = rescueInfoService.getAll(query); + // 输出 Excel + ExcelUtils.write(response, "员工数据.xls", "数据", DriverInfoDto.class, + list); + } } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java index b8686b54..f65bf360 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java @@ -90,4 +90,6 @@ public interface RescueInfoMapper extends BaseMapper List> selectRescueOrderByRoad(String dictType); DriverStaffSaveVO getOnInternal(Long id); + + List getAll(@Param("entity") DriverInfoDto query); } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java index 29b9d03e..c492603b 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java @@ -175,4 +175,6 @@ public interface IRescueInfoService extends IService DriverStaffSaveVO getOnInternal(Long id); + + List getAll(DriverInfoDto query); } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java index d0d56b59..ac06e294 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java @@ -1547,6 +1547,10 @@ public class RescueInfoServiceImpl extends ServiceImpl getAll(DriverInfoDto query) { + return baseMapper.getAll(query); + } public List filterRescueInfoByDate(List rescueInfos, Date startTime, Date endTime) { return rescueInfos.stream() .filter(info -> info.getRescueTime() != null && diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml index cf54d239..15504ba3 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml @@ -520,5 +520,37 @@ + + From 4a62d0fc526ee89f835eaf20783cce556a653a2c Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Mon, 4 Aug 2025 10:22:56 +0800 Subject: [PATCH 2/4] 0804 --- .../service/impl/WorkReportServiceImpl.java | 6 +- .../controller/admin/RescueInfoSystem.java | 9 +- .../rescue/mapper/RescueInfoMapper.java | 3 +- .../rescue/service/IRescueInfoService.java | 7 +- .../service/impl/RescueInfoServiceImpl.java | 7 +- .../module/rescue/vo/DriverInfoExportVO.java | 41 +++ .../mapper/rescue/RescueInfoMapper.xml | 248 +++++++++--------- .../main/resources/mapper/UserRoleMapper.xml | 3 + 8 files changed, 180 insertions(+), 144 deletions(-) create mode 100644 dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/DriverInfoExportVO.java diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/workReport/service/impl/WorkReportServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/workReport/service/impl/WorkReportServiceImpl.java index d7fc0141..6dee6151 100644 --- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/workReport/service/impl/WorkReportServiceImpl.java +++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/workReport/service/impl/WorkReportServiceImpl.java @@ -93,12 +93,14 @@ public class WorkReportServiceImpl extends ServiceImpl 下拉框选项 Map dropdownColumns = new HashMap<>(); @@ -562,7 +563,7 @@ public class RescueInfoSystem extends BaseController { dropdownColumns.put(5, genders); List> exampleDataList = Arrays.asList( - Arrays.asList("测试员工", "岗位是下拉框选择", "年龄", "电话号码", "性别") + Arrays.asList("测试员工", "年龄", "电话号码", "性别") ); List textColumns = Collections.singletonList(3); @@ -577,9 +578,9 @@ public class RescueInfoSystem extends BaseController { @GetMapping("/drviceExport") public void exportUserList(DriverInfoDto query, HttpServletResponse response) throws IOException { - List list = rescueInfoService.getAll(query); + List list = rescueInfoService.getAll(query); // 输出 Excel - ExcelUtils.write(response, "员工数据.xls", "数据", DriverInfoDto.class, + ExcelUtils.write(response, "员工数据.xls", "数据", DriverInfoExportVO.class, list); } } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java index f65bf360..c0a80842 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java @@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.rescue.domain.RescueInfo; import cn.iocoder.yudao.module.rescue.dto.DriverInfo2Dto; import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto; import cn.iocoder.yudao.module.rescue.vo.BuckleVO; +import cn.iocoder.yudao.module.rescue.vo.DriverInfoExportVO; import cn.iocoder.yudao.module.rescue.vo.DriverStaffSaveVO; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -91,5 +92,5 @@ public interface RescueInfoMapper extends BaseMapper DriverStaffSaveVO getOnInternal(Long id); - List getAll(@Param("entity") DriverInfoDto query); + List getAll(@Param("entity") DriverInfoDto query); } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java index c492603b..67aa6b6b 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java @@ -6,10 +6,7 @@ import cn.iocoder.yudao.module.rescue.domain.DriverInfo; import cn.iocoder.yudao.module.rescue.domain.RescueInfo; import cn.iocoder.yudao.module.rescue.dto.DriverInfo2Dto; import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto; -import cn.iocoder.yudao.module.rescue.vo.BuckleVO; -import cn.iocoder.yudao.module.rescue.vo.DriverStaffSaveVO; -import cn.iocoder.yudao.module.rescue.vo.MoneyManagement; -import cn.iocoder.yudao.module.rescue.vo.ReturnCarVO; +import cn.iocoder.yudao.module.rescue.vo.*; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -176,5 +173,5 @@ public interface IRescueInfoService extends IService DriverStaffSaveVO getOnInternal(Long id); - List getAll(DriverInfoDto query); + List getAll(DriverInfoDto query); } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java index ac06e294..c840f6af 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java @@ -25,10 +25,7 @@ import cn.iocoder.yudao.module.rescue.utils.DateUtils; import cn.iocoder.yudao.module.rescue.utils.RedisUtil; import cn.iocoder.yudao.module.rescue.utils.RedissonDelayQueue; import cn.iocoder.yudao.module.rescue.utils.StringUtils; -import cn.iocoder.yudao.module.rescue.vo.BuckleVO; -import cn.iocoder.yudao.module.rescue.vo.DriverStaffSaveVO; -import cn.iocoder.yudao.module.rescue.vo.MoneyManagement; -import cn.iocoder.yudao.module.rescue.vo.ReturnCarVO; +import cn.iocoder.yudao.module.rescue.vo.*; import cn.iocoder.yudao.module.staff.service.CompanyStaffService; import cn.iocoder.yudao.module.staff.vo.CompanyStaffRespVO; import cn.iocoder.yudao.module.system.api.dept.DeptApi; @@ -1548,7 +1545,7 @@ public class RescueInfoServiceImpl extends ServiceImpl getAll(DriverInfoDto query) { + public List getAll(DriverInfoDto query) { return baseMapper.getAll(query); } public List filterRescueInfoByDate(List rescueInfos, Date startTime, Date endTime) { diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/DriverInfoExportVO.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/DriverInfoExportVO.java new file mode 100644 index 00000000..7a0ec2f1 --- /dev/null +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/DriverInfoExportVO.java @@ -0,0 +1,41 @@ +package cn.iocoder.yudao.module.rescue.vo; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +@Data +public class DriverInfoExportVO { + + @ExcelProperty("员工账号") + private String username; + + @ExcelProperty("员工姓名") + private String nickname; + + @ExcelProperty("手机号") + private String mobile; + + @ExcelIgnore + private String sex; + + @ExcelProperty("性别") + private String sexStr; + + @ExcelProperty("岗位") + private String roleNames; + + + + public void setSex(String sex) { + this.sex = sex; + // 设置转换后的性别字符串 + if ("0".equals(sex)) { + this.sexStr = "男"; + } else if ("1".equals(sex)) { + this.sexStr = "女"; + } else { + this.sexStr = "未知"; + } + } +} diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml index 15504ba3..445f37cc 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml @@ -6,13 +6,13 @@ SELECT ri.*, - roi.order_status, - roi.set_money, - roi.id as rescueOrderId, - roi.pay_money, - roi.pay_time + roi.order_status, + roi.set_money, + roi.id as rescueOrderId, + roi.pay_money, + roi.pay_time FROM rescue_info ri - left join rescue_order_info roi on roi.rescue_info_id = ri.id + left join rescue_order_info roi on roi.rescue_info_id = ri.id where ri.deleted = '0' and roi.order_status = #{map.orderStatus} @@ -96,7 +97,7 @@ and rescue_time between - concat(#{map.rescueStart}, ' 00:00:00') and concat(#{map.rescueEnd}, ' 23:59:59') + concat(#{map.rescueStart}, ' 00:00:00') and concat(#{map.rescueEnd}, ' 23:59:59') and if(#{map.deptId} = 0, ri.dept_id is null, ri.dept_id = #{map.deptId}) @@ -107,15 +108,15 @@ SELECT ri.*, - roi.order_status, - roi.set_money + roi.order_status, + roi.set_money FROM rescue_info ri - left join rescue_order_info roi on roi.rescue_info_id = ri.id + left join rescue_order_info roi on roi.rescue_info_id = ri.id (ri.user_id = #{map.userId} or connection_phone = #{map.connectionPhone}) @@ -223,12 +224,12 @@ from rescue_info ri dept_id = #{map.deptId} - and rescue_type = '5' + and rescue_type = '5' and (connection_name like concat('%', #{map.connectionName}, '%') or connection_phone like concat('%', - #{map.connectionPhone}, - '%') or - license_num like concat('%', #{map.licenseNum}, '%')) + #{map.connectionPhone}, + '%') or + license_num like concat('%', #{map.licenseNum}, '%')) @@ -247,15 +248,15 @@ SELECT di.*, - su.nickname as real_name, - rci.rescue_car_num + su.nickname as real_name, + rci.rescue_car_num FROM driver_info di - INNER JOIN system_users su ON di.user_id = su.id AND su.deleted = '0' - left join system_dept sd on sd.id = di.dept_id - inner join rescue_car_info rci on rci.possessor_id = di.id + INNER JOIN system_users su ON di.user_id = su.id AND su.deleted = '0' + left join system_dept sd on sd.id = di.dept_id + inner join rescue_car_info rci on rci.possessor_id = di.id WHERE di.auth_status = '2' and (su.nickname like concat('%', #{searchValue}, '%') or - di.phonenumber like concat('%', #{searchValue}, '%') - or rci.rescue_car_num like concat('%', #{searchValue}, '%')) + di.phonenumber like concat('%', #{searchValue}, '%') + or rci.rescue_car_num like concat('%', #{searchValue}, '%')) order by di.create_time desc @@ -312,8 +313,8 @@ WHERE need_system = '0' AND driver_id IS NULL AND TIMESTAMPDIFF( - MINUTE, rescue_time, - NOW()) > 5 + MINUTE, rescue_time, + NOW()) > 5 AND rescue_status = '2' @@ -378,17 +380,17 @@ @@ -520,36 +524,26 @@ - + SELECT su.username, + su.nickname, + su.mobile, + su.sex, + GROUP_CONCAT(DISTINCT sr2.name SEPARATOR ',') AS roleNames FROM driver_info di - INNER JOIN system_users su ON di.user_id = su.id - AND su.deleted = '0' - WHERE 1 = 1 - - and su.nickname like concat('%', #{entity.nickName}, '%') + INNER JOIN system_users su ON di.user_id = su.id AND su.deleted = 0 + LEFT JOIN system_user_role sr ON su.id = sr.user_id AND sr.deleted = 0 + INNER JOIN system_role role ON role.id = sr.role_id AND role.deleted = 0 AND role.code = 'jysj' + LEFT JOIN system_role sr2 ON sr.role_id = sr2.id AND sr2.service_package_id = 'jiuyuan' + + AND su.status = #{entity.status} - - and su.mobile like concat('%', #{entity.phonenumber}, '%') + + AND (su.nickname like CONCAT('%',#{entity.nickname},'%') OR su.username like + CONCAT('%',#{entity.nickname},'%')) - - and di.driver_status = #{entity.driveStatus} - - - and di.auth_status = #{entity.authStatus} - - - and di.car_type = #{entity.carType} - - - and di.car_license_num like concat('%', #{entity.carLicenseNum}, '%') - - order by di.create_time desc + GROUP BY su.username, su.nickname, su.mobile, su.sex + ORDER BY su.nickname diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml index 049c8f11..e5866862 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml @@ -104,6 +104,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND (su.nickname like CONCAT('%',#{role.nickname},'%') OR su.username like CONCAT('%',#{role.nickname},'%')) + + AND su.status = #{role.status} + GROUP BY su.id, su.username, su.nickname, su.user_type, su.remark, From a643e50a5adf295cd895f0ec890dd93477e5b486 Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Mon, 4 Aug 2025 10:23:58 +0800 Subject: [PATCH 3/4] 0804 --- .../module/workReport/service/impl/WorkReportServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/workReport/service/impl/WorkReportServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/workReport/service/impl/WorkReportServiceImpl.java index 6dee6151..2dd3973e 100644 --- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/workReport/service/impl/WorkReportServiceImpl.java +++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/workReport/service/impl/WorkReportServiceImpl.java @@ -189,7 +189,6 @@ public class WorkReportServiceImpl extends ServiceImpl Date: Tue, 5 Aug 2025 14:51:33 +0800 Subject: [PATCH 4/4] 0805 --- .../module/constant/InspectionFileEnum.java | 2 + .../InspectionEquInfoController.java | 10 ++++ .../inspection/entity/InspectionEquInfo.java | 3 ++ .../mapper/InspectionEquInfoMapper.java | 1 + .../service/IInspectionEquInfoService.java | 2 + .../service/IInspectionFileService.java | 1 + .../impl/InspectionEquInfoServiceImpl.java | 17 +++++++ .../impl/InspectionFileServiceImpl.java | 30 ++++++++++++ .../inspection/InspectionEquInfoMapper.xml | 16 +++++++ .../controller/admin/TrainController.java | 12 ++--- .../module/train/mapper/TrainMapper.java | 4 +- .../module/train/service/TrainService.java | 9 ++-- .../train/service/impl/TrainServiceImpl.java | 9 ++-- .../yudao/module/train/vo/TodayTrainVO.java | 11 +++++ .../resources/mapper/train/TrainMapper.xml | 48 +++++++++++-------- 15 files changed, 135 insertions(+), 40 deletions(-) create mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/vo/TodayTrainVO.java diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/constant/InspectionFileEnum.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/constant/InspectionFileEnum.java index 7aa8f1cc..39b56fed 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/constant/InspectionFileEnum.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/constant/InspectionFileEnum.java @@ -14,6 +14,8 @@ public enum InspectionFileEnum { FILE("equipment", "设备文件夹"), COACH("coach", "驾校员工文件夹"), student("student","驾校学员文件夹"), + WX_EQUIPMENT("wx_equipment","维修设备文件夹"), + JY_EQUIPMENT("jy_equipment","救援设备文件夹"), INSPECTION_CUSTOMER("small_inspection_member_folder", "检测客户资料夹"), ; diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java index 14d625b8..6f562785 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java @@ -174,6 +174,11 @@ public class InspectionEquInfoController extends BaseController { return success(inspectionEquInfoService.addFolder(id)); } + @PostMapping("/addDeviceFolder") + public CommonResult addDeviceFolder(@RequestParam Long id, @RequestParam String servicePackageId, @RequestParam String defaultKey) { + return success(inspectionEquInfoService.addDeviceFolder(id, servicePackageId, defaultKey)); + } + /** * 查询设备数量根据分类 * @@ -184,4 +189,9 @@ public class InspectionEquInfoController extends BaseController { return success(inspectionEquInfoService.queryEquipmentCountByCategory()); } + @GetMapping("/queryEquipmentCountByPackageId") + public CommonResult queryEquipmentCountByPackageId(@RequestParam String servicePackageId, @RequestParam String dictType) { + return success(inspectionEquInfoService.queryEquipmentCountByPackageId(servicePackageId, dictType)); + } + } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionEquInfo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionEquInfo.java index 2d9238b1..b33abce5 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionEquInfo.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionEquInfo.java @@ -96,4 +96,7 @@ public class InspectionEquInfo extends TenantBaseDO @TableField(exist = false) private List fileList; + /** 服务套餐id */ + private String servicePackageId; + } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionEquInfoMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionEquInfoMapper.java index f4b50b61..c1cd5570 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionEquInfoMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionEquInfoMapper.java @@ -36,4 +36,5 @@ public interface InspectionEquInfoMapper extends BaseMapper public IPage selectInspectionEquInfoList(Page page, @Param("inspectionEquInfo") InspectionEquInfo inspectionEquInfo); List queryEquipmentCountByCategory(); + List queryEquipmentCountByPackageId(@Param("servicePackageId") String servicePackageId, @Param("dictType") String dictType); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionEquInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionEquInfoService.java index 1a4e2b43..617afd58 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionEquInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionEquInfoService.java @@ -80,6 +80,7 @@ public interface IInspectionEquInfoService extends IService { * @return 文件夹id */ Long addFolder(Long id); + Long addDeviceFolder(Long id, String servicePackageId, String defaultKey); /** * 查询设备统计信息 @@ -87,4 +88,5 @@ public interface IInspectionEquInfoService extends IService { * @return */ List queryEquipmentCountByCategory(); + List queryEquipmentCountByPackageId(String servicePackageId, String dictType); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionFileService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionFileService.java index d7fcfdf0..56286e73 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionFileService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionFileService.java @@ -115,6 +115,7 @@ public interface IInspectionFileService extends IService { * @return 文件夹id */ Long addFolder(String folderName, String key); + Long addFolderForDevice(String folderName, String key, String servicePackageId); Long addFolderForJx(String folderName, String key); Long addFolderForJy(String folderName, String key); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java index d3fc0e89..be392c40 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java @@ -210,6 +210,18 @@ public class InspectionEquInfoServiceImpl extends ServiceImpllambdaUpdate().eq(InspectionEquInfo::getId, id).set(InspectionEquInfo::getFolderId, folderId)); + return folderId; + } + return null; + } + /** * 添加设备文件夹 * @@ -238,6 +250,11 @@ public class InspectionEquInfoServiceImpl extends ServiceImpl queryEquipmentCountByPackageId(String servicePackageId, String dictType) { + return baseMapper.queryEquipmentCountByPackageId(servicePackageId, dictType); + } + /** * 保存导入的设备信息 * diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java index 51725f37..4ce79b26 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionFileServiceImpl.java @@ -498,6 +498,36 @@ public class InspectionFileServiceImpl extends ServiceImpl().eq(InspectionFile::getDefaultKey, key)); + + //如果默认文件夹为空就新建 + if (fatherFolder == null) { + fatherFolder = new InspectionFile(); + fatherFolder.setFileName(InspectionFileEnum.getDescByType(key)); + fatherFolder.setType(InspectionConstants.INSPECTION_FOLDER); + fatherFolder.setDefaultKey(key); + fatherFolder.setServicePackageId(servicePackageId); + baseMapper.insert(fatherFolder); + fatherFolder.setFileCode(fatherFolder.getId() + ","); + baseMapper.updateById(fatherFolder); + } + + InspectionFile inspectionFile = new InspectionFile(); + inspectionFile.setFatherId(fatherFolder.getId()); + inspectionFile.setFileName(folderName + InspectionConstants.INSPECTION_FOLDER_SUFFIX); + inspectionFile.setType(InspectionConstants.INSPECTION_FOLDER); + inspectionFile.setIsStaffFile(InspectionConstants.INSPECTION_IS_STAFF_FILE); + inspectionFile.setServicePackageId(servicePackageId); + baseMapper.insert(inspectionFile); + inspectionFile.setFileCode(inspectionFile.getId() + ","); + baseMapper.updateById(inspectionFile); + + return inspectionFile.getId(); + } + /** * 新增文件夹 * diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml index 801ec66b..6cbcca35 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml @@ -27,6 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and `type` = #{inspectionEquInfo.type} + + and service_package_id = #{inspectionEquInfo.servicePackageId} + @@ -48,4 +51,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY sd.value, sd.label; + + diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/controller/admin/TrainController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/controller/admin/TrainController.java index 04203c5d..a0387fe7 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/controller/admin/TrainController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/controller/admin/TrainController.java @@ -112,8 +112,8 @@ public class TrainController { @RequestParam(value = "sort",required = false) String sort, @RequestParam(value = "startTime",required = false) String startTime, @RequestParam(value = "endTime",required = false) String endTime, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { //默认查全部数据 String startTimeStr = ""; String endTimeStr = ""; @@ -304,7 +304,7 @@ public class TrainController { * 当日正在训练学员统计 */ @GetMapping("getTodayTrainSituation") - public CommonResult getTodayTrainSituation(Train train){ + public CommonResult getTodayTrainSituation(TodayTrainVO train){ return success(trainService.getTodayTrainSituation(train)); } @@ -312,10 +312,10 @@ public class TrainController { * 获取当前正在训练的学员列表 */ @GetMapping("getTodayStudentTrainSituation") - public CommonResult> getTodayStudentTrainSituation(Train train, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + public CommonResult> getTodayStudentTrainSituation(TodayTrainVO train, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize){ - Page page = new Page<>(pageNo, pageSize); + Page page = new Page<>(pageNum, pageSize); return success(trainService.getTodayStudentTrainSituation(train,page)); } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/mapper/TrainMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/mapper/TrainMapper.java index 836d32f8..60a2579c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/mapper/TrainMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/mapper/TrainMapper.java @@ -44,10 +44,10 @@ public interface TrainMapper extends BaseMapper { /** * 获取当日实时训练情况 */ - CloakAndTrainCountVO getTodayTrainSituation(@Param("entity") Train train); + CloakAndTrainCountVO getTodayTrainSituation(@Param("entity") TodayTrainVO train); /** * 获取正在训练的学员信息 */ - IPage getTodayStudentTrainSituation(@Param("entity") Train train, Page page); + IPage getTodayStudentTrainSituation(@Param("entity") TodayTrainVO train, Page page); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/TrainService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/TrainService.java index 389ec6fe..ba876a0d 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/TrainService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/TrainService.java @@ -2,10 +2,7 @@ package cn.iocoder.yudao.module.train.service; import cn.iocoder.yudao.module.course.vo.CommissionExportVO; import cn.iocoder.yudao.module.train.entity.Train; -import cn.iocoder.yudao.module.train.vo.CloakAndTrainCountVO; -import cn.iocoder.yudao.module.train.vo.NoClockInRemindVO; -import cn.iocoder.yudao.module.train.vo.TrainExportVO; -import cn.iocoder.yudao.module.train.vo.TrainVO; +import cn.iocoder.yudao.module.train.vo.*; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -118,10 +115,10 @@ public interface TrainService extends IService { /** * 当日正在训练学员统计 */ - CloakAndTrainCountVO getTodayTrainSituation(Train train); + CloakAndTrainCountVO getTodayTrainSituation(TodayTrainVO train); /** * 获取当前正在训练的学员信息列表 */ - IPage getTodayStudentTrainSituation(Train train, Page page); + IPage getTodayStudentTrainSituation(TodayTrainVO train, Page page); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/impl/TrainServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/impl/TrainServiceImpl.java index 0c521f6d..0cb8c67c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/impl/TrainServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/service/impl/TrainServiceImpl.java @@ -11,10 +11,7 @@ import cn.iocoder.yudao.module.course.vo.CommissionExportVO; import cn.iocoder.yudao.module.train.entity.Train; import cn.iocoder.yudao.module.train.mapper.TrainMapper; import cn.iocoder.yudao.module.train.service.TrainService; -import cn.iocoder.yudao.module.train.vo.CloakAndTrainCountVO; -import cn.iocoder.yudao.module.train.vo.NoClockInRemindVO; -import cn.iocoder.yudao.module.train.vo.TrainExportVO; -import cn.iocoder.yudao.module.train.vo.TrainVO; +import cn.iocoder.yudao.module.train.vo.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -258,7 +255,7 @@ public class TrainServiceImpl extends ServiceImpl implements * 当日正在训练学员统计 */ @Override - public CloakAndTrainCountVO getTodayTrainSituation(Train train) { + public CloakAndTrainCountVO getTodayTrainSituation(TodayTrainVO train) { return trainMapper.getTodayTrainSituation(train); } @@ -266,7 +263,7 @@ public class TrainServiceImpl extends ServiceImpl implements * 获取当前正在训练的学员信息列表 */ @Override - public IPage getTodayStudentTrainSituation(Train train, Page page) { + public IPage getTodayStudentTrainSituation(TodayTrainVO train, Page page) { return trainMapper.getTodayStudentTrainSituation(train, page); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/vo/TodayTrainVO.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/vo/TodayTrainVO.java new file mode 100644 index 00000000..c01cb947 --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/train/vo/TodayTrainVO.java @@ -0,0 +1,11 @@ +package cn.iocoder.yudao.module.train.vo; + +import cn.iocoder.yudao.module.train.entity.Train; +import lombok.Data; + +@Data +public class TodayTrainVO extends Train { + + // 课程类型 + private String courseType; +} diff --git a/dl-module-jx/src/main/resources/mapper/train/TrainMapper.xml b/dl-module-jx/src/main/resources/mapper/train/TrainMapper.xml index a375367c..cd091533 100644 --- a/dl-module-jx/src/main/resources/mapper/train/TrainMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/train/TrainMapper.xml @@ -213,38 +213,46 @@ - + SELECT dst.* + FROM drive_school_train dst + LEFT JOIN drive_school_course dsc ON dst.course_id = dsc.id AND dsc.deleted = 0 WHERE - DATE (create_time) = CURDATE() - AND DATE (start_time) = CURDATE() - AND end_time IS NULL - AND user_id IS NOT NULL - AND deleted = 0 + DATE (dst.create_time) = CURDATE() + AND DATE (dst.start_time) = CURDATE() + AND dst.end_time IS NULL + AND dst.user_id IS NOT NULL + AND dst.deleted = 0 - AND user_name like concat('%',#{entity.userName},'%') + AND dst.user_name like concat('%',#{entity.userName},'%') - AND subject = #{entity.subject} + AND dst.subject = #{entity.subject} + + + AND dsc.type = #{entity.courseType}