diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java index 1af6c0c3..28658aaf 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java @@ -132,8 +132,8 @@ public class InspectionInfoController extends BaseController { */ @GetMapping("geStelectInspectionByBusiness") public CommonResult geStelectInspectionByBusiness(InspectionInfo inspectionInfo, - @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum, - @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) { + @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum, + @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); return success(inspectionInfoService.geStelectInspectionByBusiness(page, inspectionInfo)); } @@ -396,8 +396,27 @@ public class InspectionInfoController extends BaseController { * @date 16:22 2024/12/18 **/ @GetMapping("/getBusinessCountByType") - public CommonResult getBusinessCountByType(@RequestParam(required = false, name ="partnerId") Integer partnerId) { - return success(inspectionInfoService.getBusinessCountByType(partnerId)); + public CommonResult getBusinessCountByType(@RequestParam(required = false, name = "partnerId") Integer partnerId, + @RequestParam(required = false, name = "unit") String unit) { + List datetimeRange = new ArrayList<>(); + if (unit != null) { + DateTime now = DateUtil.date(); + switch (unit) { + case "day": + datetimeRange.add(String.valueOf(DateUtil.beginOfDay(now))); + datetimeRange.add(String.valueOf(DateUtil.endOfDay(now))); + break; + case "week": + datetimeRange.add(String.valueOf(DateUtil.beginOfWeek(now))); + datetimeRange.add(String.valueOf(DateUtil.endOfWeek(now))); + break; + case "month": + datetimeRange.add(String.valueOf(DateUtil.beginOfMonth(now))); + datetimeRange.add(String.valueOf(DateUtil.endOfMonth(now))); + break; + } + } + return success(inspectionInfoService.getBusinessCountByType(partnerId,datetimeRange)); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java index 59f5500f..d68151d2 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java @@ -258,4 +258,6 @@ public class InspectionInfo extends TenantBaseDO /** 保险公司名称 */ @TableField(exist = false) private String insuranceCompanyName; + @TableField(exist = false) + private List datetimeRange; } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java index deda7d8c..29df7569 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java @@ -179,7 +179,7 @@ public interface IInspectionInfoService extends IService */ IPage geStelectInspectionByBusiness(Page page, InspectionInfo inspectionInfo); - Map getBusinessCountByType(Integer partnerId); + Map getBusinessCountByType(Integer partnerId, List datetimeRange); List selectMeetCarList(List datetimeRange); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java index 2680ad01..cc00a66b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java @@ -1027,7 +1027,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl getBusinessCountByType(Integer partnerId) { + public Map getBusinessCountByType(Integer partnerId, List datetimeRange) { // 创建线程池 ExecutorService executor = Executors.newFixedThreadPool(10); @@ -1058,6 +1058,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl page = new Page<>(1, 1); diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml index ca05e2f6..0fc15afe 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml @@ -689,6 +689,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ii.status = '1' + + + AND imco.create_time BETWEEN #{info.datetimeRange[0]} AND #{info.datetimeRange[1]} + +