ziin/vvDataAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.首页统计数量添加过去 7 天建联统计

Browse Source
This commit is contained in:
ziin
2025-10-17 15:13:08 +08:00
parent a7582cb558
commit 2145c51814
7 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java
View File

@@ -160,8 +160,8 @@ public class EmployeeHostsController {
@PostMapping("/employeeCompleteBarChart")
@Operation(summary = "获得员工的建联柱状图数据")
@PreAuthorize("@ss.hasPermission('server:employee-hosts:selfquery')")
public CommonResult<List<CompletedRateVO>> getEmployeeCompleteBarChart(@RequestBody List<Long> userId) {
return success(employeeHostsService.getEmployeeHostsCompleteBarChart(userId));
public CommonResult<List<CompletedRateVO>> getEmployeeCompleteBarChart(@RequestBody EmployeeCompleteBarChartReqVO reqVO) {
return success(employeeHostsService.getEmployeeHostsCompleteBarChart(reqVO.getUserId(),reqVO.getDays()));
}
}

15
tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/vo/EmployeeCompleteBarChartReqVO.java Normal file
View File

@@ -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<Long> userId;
private Integer days;
}

2
tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/mysql/employeehosts/EmployeeHostsMapper.java
View File

@@ -34,5 +34,5 @@ public interface EmployeeHostsMapper extends BaseMapperX<EmployeeHostsDO> {
CompletedRateVO selectEmployeeHostsWithOperationStatus(@Param("userId") Long userId);
List<CompletedRateVO> selectEmployeeHostsCompleteBarChart(List<Long> list);
List<CompletedRateVO> selectEmployeeHostsCompleteBarChart(@Param("list") List<Long> list, @Param("days") Integer days);
}

2
tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsService.java
View File

@@ -67,5 +67,5 @@ public interface EmployeeHostsService {
CompletedRateVO getEmployeeHostsCompleteWithSelf(@Valid Long userId);
List<CompletedRateVO> getEmployeeHostsCompleteBarChart(@Valid List<Long> userId);
List<CompletedRateVO> getEmployeeHostsCompleteBarChart(@Valid List<Long> userId,Integer days);
}

4
tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java
View File

@@ -181,9 +181,9 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService {
}
@Override
public List<CompletedRateVO> getEmployeeHostsCompleteBarChart(List<Long> userIdList) {
public List<CompletedRateVO> getEmployeeHostsCompleteBarChart(List<Long> userIdList, Integer days) {
List<CompletedRateVO> dbList = employeeHostsMapper.selectEmployeeHostsCompleteBarChart(userIdList);
List<CompletedRateVO> dbList = employeeHostsMapper.selectEmployeeHostsCompleteBarChart(userIdList,days);
try {

15
tkdata-model-server/src/main/resources/mapper/employeehosts/EmployeeHostsMapper.xml
View File

@@ -418,21 +418,20 @@
<select id="selectEmployeeHostsCompleteBarChart"
resultType="cn.iocoder.yudao.module.tkdata.controller.admin.employeehosts.vo.CompletedRateVO">
SELECT
user_id as userId,
user_id AS userId,
COUNT(DISTINCT
CASE WHEN operation_status = 1 THEN hosts_id END) AS finishedNum
FROM
server_employee_hosts
WHERE
deleted = 0
FROM server_employee_hosts
WHERE deleted = 0
AND operation_status = 1
AND DATE(update_time) = CURDATE()
<if test="list != null and list.size() != 0">
<!-- 日期范围：今天或过去 7 天（含今天） -->
AND update_time >= DATE_SUB(CURDATE(), INTERVAL #{days,jdbcType=INTEGER} - 1 DAY)
<if test="list != null and list.size() > 0">
AND user_id IN
<foreach collection="list" item="user_id" open="(" separator="," close=")">
#{user_id}
</foreach>
</if>
group by user_id
GROUP BY user_id
</select>
</mapper>

2
yudao-server/src/main/resources/application.yaml
View File

@@ -3,7 +3,7 @@ spring:
name: yudao-server
profiles:
active: local
active: dev
main:
allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。