toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix[project]: 分发任务加待办标记（我分发的、我执行的）

Browse Source
This commit is contained in:
lidongyang
2026-04-07 11:18:17 +08:00
parent 116dabf66b
commit d4005941bb
16 changed files with 119 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
1-sql/2026-04-07/task.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE simulation_task ADD toDoMarker varchar(512) NULL COMMENT '待办标记，多个标记逗号分隔';

5
common/src/main/java/com/sdm/common/entity/req/export/TaskAnalysisExportExcelParam.java
View File

@@ -78,4 +78,9 @@ public class TaskAnalysisExportExcelParam {
private String name;
private TagReq tagReq;
/**
* 待办标记，多个标记逗号分隔
*/
private String toDoMarker;
}

5
common/src/main/java/com/sdm/common/entity/req/task/TaskExportExcelParam.java
View File

@@ -59,4 +59,9 @@ public class TaskExportExcelParam {
private List<String> filterDiscipline;
private TagReq tagReq;
/**
* 待办标记，多个标记逗号分隔
*/
private String toDoMarker;
}

2
project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
View File

@@ -61,7 +61,7 @@ public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {
List<SpdmTaskVo> getTaskListByDemandId(@Param("demandId") String demandId);
List<SpdmAnalysisTaskVo> getAnalysisTask(@Param("taskNodeIdList") List<String> taskNodeIdList,@Param("disciplineList") List<String> disciplineList);
List<SpdmAnalysisTaskVo> getAnalysisTask(@Param("taskNodeIdList") List<String> taskNodeIdList,@Param("disciplineList") List<String> disciplineList,@Param("disciplineList") List<String> disciplineList);
List<SpdmTaskVo> getTaskListByIdList(@Param("taskIdList") List<String> taskIdList);

5
project/src/main/java/com/sdm/project/model/entity/SimulationTask.java
View File

@@ -225,4 +225,9 @@ public class SimulationTask implements Serializable {
@Schema(description= "关联的待办的结果文件路径")
@TableField(exist = false)
private List<String> reportFileUrlList;
@ApiModelProperty(value = "待办标记，多个标记逗号分隔")
@TableField("toDoMarker")
private String toDoMarker;
}

9
project/src/main/java/com/sdm/project/model/req/SpdmAnalysisTaskListReq.java
View File

@@ -202,5 +202,14 @@ public class SpdmAnalysisTaskListReq extends BaseEntity {
@JsonProperty(value = "pMembers")
private Long pMembers;
/**
* 待办标记，多个标记逗号分隔
*/
private String toDoMarker;
/**
* 利元亨定制，待办标记，多个标记逗号分隔（查询参数）
*/
private List<String> toDoMarkerList;
}

5
project/src/main/java/com/sdm/project/model/req/SpdmBatchTaskOprReq.java
View File

@@ -196,4 +196,9 @@ public class SpdmBatchTaskOprReq {
private String tag9;
private String tag10;
/**
* 待办标记，多个标记逗号分隔
*/
private String toDoMarker;
}

10
project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
View File

@@ -207,4 +207,14 @@ public class SpdmTaskListReq {
*/
private String riskFactor;
/**
* 利元亨定制，待办标记，多个标记逗号分隔
*/
private String toDoMarker;
/**
* 利元亨定制，待办标记，多个标记逗号分隔（查询参数）
*/
private List<String> toDoMarkerList;
}

5
project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java
View File

@@ -92,4 +92,9 @@ public class SpdmTaskOprReq {
*/
private String description;
/**
* 待办标记，多个标记逗号分隔
*/
private String toDoMarker;
}

5
project/src/main/java/com/sdm/project/model/vo/SpdmAnalysisTaskVo.java
View File

@@ -103,4 +103,9 @@ public class SpdmAnalysisTaskVo extends BaseEntity {
@Schema(description = "标签请求参数")
private TagReq tagReq;
/**
* 待办标记，多个标记逗号分隔
*/
private String toDoMarker;
}

5
project/src/main/java/com/sdm/project/model/vo/SpdmExportNewTaskVo.java
View File

@@ -194,4 +194,9 @@ public class SpdmExportNewTaskVo extends BaseEntity {
private List<TaskNodeExtraPo> extras;
private Integer expStatus;
/**
* 待办标记，多个标记逗号分隔
*/
private String toDoMarker;
}

5
project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java
View File

@@ -293,4 +293,9 @@ public class SpdmNewTaskVo extends BaseEntity {
@Schema(description = "标签请求参数")
private TagReq tagReq;
/**
* 待办标记，多个标记逗号分隔
*/
private String toDoMarker;
}

2
project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
View File

@@ -4715,7 +4715,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
/**
* 项目的当前阶段包含：设计，就是：项目承接主体+结构，否则就是：项目承接主体+技术中心+结构，所对应的人
* 项目的当前阶段包含：设计，就是：项目承接主体+结构仿真，否则就是：项目承接主体+结构仿真+技术中心，所对应的人
*
* @param projectUndertaker
* @return

3
project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java
View File

@@ -127,6 +127,9 @@ public class SimulationTaskServiceImpl extends ServiceImpl<SimulationTaskMapper,
if (req.getExpStatus() != null) {
wrapper.set(SimulationTask::getExpStatus, req.getExpStatus());
}
if (req.getToDoMarker() != null) {
wrapper.set(SimulationTask::getToDoMarker, req.getToDoMarker());
}
wrapper.set(SimulationTask::getDescription, req.getDescription());
wrapper.set(SimulationTask::getCreator, ThreadLocalContext.getUserId());
wrapper.set(SimulationTask::getUpdateTime, DateUtil.now());

18
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -1208,17 +1208,26 @@ public class TaskServiceImpl implements ITaskService {
// 2. 基础任务列表查询
req.setUserId(userId);
// 根据【异常状态】筛选
if (StringUtils.isNotBlank(req.getExpStatus())) {
req.setExpStatusValue(Integer.parseInt(req.getExpStatus()));
}
StopWatch stopWatch = new StopWatch("所有任务方法计时");
stopWatch.start("查所有任务");
// 根据【待办标记】筛选
if (StringUtils.isNotBlank(req.getToDoMarker())) {
req.setToDoMarkerList(Arrays.stream(req.getToDoMarker().split(",")).toList());
}
// 二次查询过滤学科
if (StringUtils.isNotBlank(req.getDiscipline())) {
req.setFilterDiscipline(new ArrayList<>());
req.setDisciplineList(Arrays.stream(req.getDiscipline().split(",")).toList());
}
StopWatch stopWatch = new StopWatch("所有任务方法计时");
stopWatch.start("查所有任务");
List<SpdmTaskVo> allTaskList = mapper.optimisedGtTaskList(tenantId, req);
// 传了指定taskId直接查出指定任务
if (CollectionUtils.isNotEmpty(req.getTaskIds())) {
@@ -2182,6 +2191,9 @@ public class TaskServiceImpl implements ITaskService {
tag10KeyList = Arrays.stream(tag10Key.split(",")).toList();
}
if (StringUtils.isNotBlank(req.getToDoMarker())) {
req.setToDoMarkerList(Arrays.stream(req.getToDoMarker().split(",")).toList());
}
String taskNodeId = tagReq.getTaskId();
@@ -2191,7 +2203,7 @@ public class TaskServiceImpl implements ITaskService {
req.setDisciplineList(Arrays.stream(req.getDiscipline().split(",")).toList());
}
if (StringUtils.isNotBlank(taskNodeId)) {
allTaskVoList = mapper.getAnalysisTask(Arrays.stream(taskNodeId.split(",")).toList(),req.getDisciplineList());
allTaskVoList = mapper.getAnalysisTask(Arrays.stream(taskNodeId.split(",")).toList(),req.getDisciplineList(),req.getToDoMarkerList());
} else {
taskVoList = mapper.taskListByTag(req, tenantId, new ArrayList<>(), pos, limit,userId,
tag1KeyList,tag2KeyList,tag3KeyList,tag4KeyList,tag5KeyList,tag6KeyList,tag7KeyList

39
project/src/main/resources/mapper/SimulationTaskMapper.xml
View File

@@ -821,6 +821,13 @@
</foreach>
))
</if>
<if test="req.toDoMarkerList != null and req.toDoMarkerList.size > 0">
and (toDoMarker in (
<foreach collection='req.toDoMarkerList' item='toDoMarker' index='index' separator=','>
#{toDoMarker}
</foreach>
))
</if>
order by create_time desc
</select>
@@ -972,6 +979,14 @@
))
</if>
<if test="req.toDoMarkerList != null and req.toDoMarkerList.size > 0">
and (toDoMarker in (
<foreach collection='req.toDoMarkerList' item='toDoMarker' index='index' separator=','>
#{toDoMarker}
</foreach>
))
</if>
<!-- <if test='req.sortOrder != null and req.sortOrder == "0"'>-->
<!-- order by create_time-->
<!-- </if>-->
@@ -1119,6 +1134,14 @@
))
</if>
<if test="req.toDoMarkerList != null and req.toDoMarkerList.size > 0">
and (toDoMarker in (
<foreach collection='req.toDoMarkerList' item='toDoMarker' index='index' separator=','>
#{toDoMarker}
</foreach>
))
</if>
<!-- <if test='req.sortOrder != null and req.sortOrder == "0"'>-->
<!-- order by create_time-->
<!-- </if>-->
@@ -1282,6 +1305,14 @@
</foreach>
))
</if>
<if test="req.toDoMarkerList != null and req.toDoMarkerList.size > 0">
and (toDoMarker in (
<foreach collection='req.toDoMarkerList' item='toDoMarker' index='index' separator=','>
#{toDoMarker}
</foreach>
))
</if>
<if test="req.reportTemplate != null and req.reportTemplate != ''">
<bind name="searchKey18" value="'%' + req.reportTemplate + '%'"/>
and st.reportTemplate like #{searchKey18}
@@ -1489,6 +1520,14 @@
</foreach>
))
</if>
<if test="req.toDoMarkerList != null and req.toDoMarkerList.size > 0">
and (toDoMarker in (
<foreach collection='req.toDoMarkerList' item='toDoMarker' index='index' separator=','>
#{toDoMarker}
</foreach>
))
</if>
<if test="req.reportTemplate != null and req.reportTemplate != ''">
<bind name="searchKey18" value="'%' + req.reportTemplate + '%'"/>
and st.reportTemplate like #{searchKey18}