diff --git a/project/src/main/java/com/sdm/project/model/req/CommonGetCompleteStatisticsReq.java b/project/src/main/java/com/sdm/project/model/req/CommonGetCompleteStatisticsReq.java index f8ca70a6..a005e533 100644 --- a/project/src/main/java/com/sdm/project/model/req/CommonGetCompleteStatisticsReq.java +++ b/project/src/main/java/com/sdm/project/model/req/CommonGetCompleteStatisticsReq.java @@ -50,4 +50,10 @@ public class CommonGetCompleteStatisticsReq { @Schema(description = "标签10") private String tag10; + + @Schema(description = "开始时间范围") + private String[] createTimeArr; + + @Schema(description = "结束时间范围") + private String[] finishTimeArr; } diff --git a/project/src/main/java/com/sdm/project/model/req/UserWorkloadReq.java b/project/src/main/java/com/sdm/project/model/req/UserWorkloadReq.java index dda3a64b..8672b643 100644 --- a/project/src/main/java/com/sdm/project/model/req/UserWorkloadReq.java +++ b/project/src/main/java/com/sdm/project/model/req/UserWorkloadReq.java @@ -38,4 +38,10 @@ public class UserWorkloadReq { private List idMap; + /** + * 前端传值,支持多选,用逗号分开 + */ + private String tag1; + private List tag1List; + } diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index 26b92d41..31fc8671 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -2,6 +2,7 @@ package com.sdm.project.service.impl; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.ArrayUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -3185,6 +3186,14 @@ public class NodeServiceImpl extends ServiceImpl simulationTasks = query.list(); diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index 16a94d24..44a1afaf 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -50,6 +50,7 @@ import com.sdm.common.feign.impl.system.SysUserFeignClientImpl; import com.sdm.common.service.DataFileService; import com.sdm.common.service.FileBizTypeService; import com.sdm.common.utils.CommonUtils; +import com.sdm.common.utils.DateUtils; import com.sdm.common.utils.PageUtils; import com.sdm.common.utils.RandomUtil; import com.sdm.project.common.*; @@ -1445,6 +1446,7 @@ public class SimulationRunServiceImpl extends ServiceImpl()); req.setDisciplineList(Arrays.stream(req.getDiscipline().split(",")).toList()); } + List allTaskList = mapper.optimisedGtTaskList(tenantId, req); + // 传了指定taskId直接查出指定任务 + if (CollectionUtils.isNotEmpty(req.getTaskIds())) { + allTaskList = mapper.getTaskListByIdList(req.getTaskIds()); + } + stopWatch.stop(); JSONObject jsonObject = buildEmptyJsonResp(req); if (CollectionUtils.isEmpty(allTaskList)) { @@ -2819,14 +2825,6 @@ public class TaskServiceImpl implements ITaskService { List userList = new ArrayList<>(); if (CollectionUtils.isEmpty(req.getUserIds()) && StringUtils.isEmpty(req.getUserGroupId())) { -// UserListReq userListReq = new UserListReq(); -// userListReq.setTenantId(ThreadLocalContext.getTenantId()); -// userListReq.setCurrent(1); -// userListReq.setSize(9999); -// SdmResponse>> pageDataRespSdmResponse = sysUserFeignClient.listUser(userListReq); -// if (!pageDataRespSdmResponse.isSuccess()) { -// return SdmResponse.success(); -// } List cidUserRespList = userNameCacheService.getAllUsers(); userList.addAll(cidUserRespList); } else if (CollectionUtils.isEmpty(req.getUserIds()) && StringUtils.isNotEmpty(req.getUserGroupId())) { @@ -2853,6 +2851,9 @@ public class TaskServiceImpl implements ITaskService { CIDUserResp::getNickname )); req.setUserIdList(userIds); + if (StringUtils.isNotBlank(req.getTag1())) { + req.setTag1List(Arrays.asList(req.getTag1().split(","))); + } List taskList = mapper.getUserExecTaskWithinTimeFrame(req, tenantId); SpdmTaskListReq taskListReq = new SpdmTaskListReq(); diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml index 62f15b20..7150c54c 100644 --- a/project/src/main/resources/mapper/SimulationTaskMapper.xml +++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml @@ -513,6 +513,13 @@ ) + + and st.tag1 in + + #{tag1Item} + + + = #{req.beginTime} @@ -986,6 +993,13 @@ and st.uuid = #{req.taskId} + + and st.uuid in ( + + #{taskId} + + ) + and task_name like #{searchKey2} diff --git a/system/src/main/java/com/sdm/system/service/impl/ISysLogServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/ISysLogServiceImpl.java index a3264230..d0f5a1d1 100644 --- a/system/src/main/java/com/sdm/system/service/impl/ISysLogServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/ISysLogServiceImpl.java @@ -70,6 +70,9 @@ public class ISysLogServiceImpl extends ServiceImpl implem if (StrUtil.isNotBlank(sysLog.getBusinessId())) { wrapper.eq(SysLog::getBusinessId, sysLog.getBusinessId()); } + if (StrUtil.isNotBlank(sysLog.getTitle())) { + wrapper.like(SysLog::getTitle, sysLog.getTitle()); + } if (ArrayUtil.isNotEmpty(sysLog.getCreateTimeArr())) { wrapper.ge(SysLog::getCreateTime, sysLog.getCreateTimeArr()[0])