diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java index 249be78..971b69b 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java @@ -160,8 +160,8 @@ public class EmployeeHostsController { @PostMapping("/employeeCompleteBarChart") @Operation(summary = "获得员工的建联柱状图数据") @PreAuthorize("@ss.hasPermission('server:employee-hosts:selfquery')") - public CommonResult> getEmployeeCompleteBarChart(@RequestBody List userId) { - return success(employeeHostsService.getEmployeeHostsCompleteBarChart(userId)); + public CommonResult> getEmployeeCompleteBarChart(@RequestBody EmployeeCompleteBarChartReqVO reqVO) { + return success(employeeHostsService.getEmployeeHostsCompleteBarChart(reqVO.getUserId(),reqVO.getDays())); } } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeCompleteBarChartReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeCompleteBarChartReqVO.java new file mode 100644 index 0000000..57626c6 --- /dev/null +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeCompleteBarChartReqVO.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.tkdata.controller.admin.employeehosts.vo; + +import lombok.Data; + +import java.util.List; + +/* + * @author: ziin + * @date: 2025/10/17 14:55 + */ +@Data +public class EmployeeCompleteBarChartReqVO { + private List userId; + private Integer days; +} diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java index b0a2d8a..067ed75 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java @@ -34,5 +34,5 @@ public interface EmployeeHostsMapper extends BaseMapperX { CompletedRateVO selectEmployeeHostsWithOperationStatus(@Param("userId") Long userId); - List selectEmployeeHostsCompleteBarChart(List list); + List selectEmployeeHostsCompleteBarChart(@Param("list") List list, @Param("days") Integer days); } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java index 9f475b6..e39646f 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java @@ -67,5 +67,5 @@ public interface EmployeeHostsService { CompletedRateVO getEmployeeHostsCompleteWithSelf(@Valid Long userId); - List getEmployeeHostsCompleteBarChart(@Valid List userId); + List getEmployeeHostsCompleteBarChart(@Valid List userId,Integer days); } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java index 35579d1..911adc4 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java @@ -181,9 +181,9 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { } @Override - public List getEmployeeHostsCompleteBarChart(List userIdList) { + public List getEmployeeHostsCompleteBarChart(List userIdList, Integer days) { - List dbList = employeeHostsMapper.selectEmployeeHostsCompleteBarChart(userIdList); + List dbList = employeeHostsMapper.selectEmployeeHostsCompleteBarChart(userIdList,days); try { diff --git a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml index 7e7a132..53f1f0e 100644 --- a/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml @@ -418,21 +418,20 @@ \ No newline at end of file diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 2a97a81..861ac11 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -3,7 +3,7 @@ spring: name: yudao-server profiles: - active: local + active: dev main: allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。