diff --git a/1-sql/2026-04-07/task.sql b/1-sql/2026-04-07/task.sql new file mode 100644 index 00000000..7f6dd1d4 --- /dev/null +++ b/1-sql/2026-04-07/task.sql @@ -0,0 +1 @@ +ALTER TABLE simulation_task ADD toDoMarker varchar(512) NULL COMMENT '待办标记,多个标记逗号分隔'; diff --git a/common/src/main/java/com/sdm/common/entity/req/export/TaskAnalysisExportExcelParam.java b/common/src/main/java/com/sdm/common/entity/req/export/TaskAnalysisExportExcelParam.java index 6aecbb49..efda61a2 100644 --- a/common/src/main/java/com/sdm/common/entity/req/export/TaskAnalysisExportExcelParam.java +++ b/common/src/main/java/com/sdm/common/entity/req/export/TaskAnalysisExportExcelParam.java @@ -78,4 +78,9 @@ public class TaskAnalysisExportExcelParam { private String name; private TagReq tagReq; + + /** + * 待办标记,多个标记逗号分隔 + */ + private String toDoMarker; } diff --git a/common/src/main/java/com/sdm/common/entity/req/task/TaskExportExcelParam.java b/common/src/main/java/com/sdm/common/entity/req/task/TaskExportExcelParam.java index 0ce79a2d..8cf93482 100644 --- a/common/src/main/java/com/sdm/common/entity/req/task/TaskExportExcelParam.java +++ b/common/src/main/java/com/sdm/common/entity/req/task/TaskExportExcelParam.java @@ -59,4 +59,9 @@ public class TaskExportExcelParam { private List filterDiscipline; private TagReq tagReq; + + /** + * 待办标记,多个标记逗号分隔 + */ + private String toDoMarker; } diff --git a/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java index 72c6846f..4b79f31d 100644 --- a/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java +++ b/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java @@ -61,7 +61,7 @@ public interface SimulationTaskMapper extends BaseMapper { List getTaskListByDemandId(@Param("demandId") String demandId); - List getAnalysisTask(@Param("taskNodeIdList") List taskNodeIdList,@Param("disciplineList") List disciplineList); + List getAnalysisTask(@Param("taskNodeIdList") List taskNodeIdList,@Param("disciplineList") List disciplineList,@Param("disciplineList") List disciplineList); List getTaskListByIdList(@Param("taskIdList") List taskIdList); diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java b/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java index 4a7ea2f0..d90c190b 100644 --- a/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationTask.java @@ -225,4 +225,9 @@ public class SimulationTask implements Serializable { @Schema(description= "关联的待办的结果文件路径") @TableField(exist = false) private List reportFileUrlList; + + @ApiModelProperty(value = "待办标记,多个标记逗号分隔") + @TableField("toDoMarker") + private String toDoMarker; + } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisTaskListReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisTaskListReq.java index 6304723f..774b671c 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisTaskListReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmAnalysisTaskListReq.java @@ -202,5 +202,14 @@ public class SpdmAnalysisTaskListReq extends BaseEntity { @JsonProperty(value = "pMembers") private Long pMembers; + /** + * 待办标记,多个标记逗号分隔 + */ + private String toDoMarker; + + /** + * 利元亨定制,待办标记,多个标记逗号分隔(查询参数) + */ + private List toDoMarkerList; } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmBatchTaskOprReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmBatchTaskOprReq.java index d8979d24..ff2080bc 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmBatchTaskOprReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmBatchTaskOprReq.java @@ -196,4 +196,9 @@ public class SpdmBatchTaskOprReq { private String tag9; private String tag10; + /** + * 待办标记,多个标记逗号分隔 + */ + private String toDoMarker; + } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java index fd6604fa..4d12ff8a 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java @@ -207,4 +207,14 @@ public class SpdmTaskListReq { */ private String riskFactor; + /** + * 利元亨定制,待办标记,多个标记逗号分隔 + */ + private String toDoMarker; + + /** + * 利元亨定制,待办标记,多个标记逗号分隔(查询参数) + */ + private List toDoMarkerList; + } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java index b1da4dfe..b1462abd 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java @@ -92,4 +92,9 @@ public class SpdmTaskOprReq { */ private String description; + /** + * 待办标记,多个标记逗号分隔 + */ + private String toDoMarker; + } diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmAnalysisTaskVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmAnalysisTaskVo.java index be43dce9..47f9fa97 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmAnalysisTaskVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmAnalysisTaskVo.java @@ -103,4 +103,9 @@ public class SpdmAnalysisTaskVo extends BaseEntity { @Schema(description = "标签请求参数") private TagReq tagReq; + /** + * 待办标记,多个标记逗号分隔 + */ + private String toDoMarker; + } diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmExportNewTaskVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmExportNewTaskVo.java index 7b049810..975cf25a 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmExportNewTaskVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmExportNewTaskVo.java @@ -194,4 +194,9 @@ public class SpdmExportNewTaskVo extends BaseEntity { private List extras; private Integer expStatus; + + /** + * 待办标记,多个标记逗号分隔 + */ + private String toDoMarker; } diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java index 00838ded..80451aa9 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmNewTaskVo.java @@ -293,4 +293,9 @@ public class SpdmNewTaskVo extends BaseEntity { @Schema(description = "标签请求参数") private TagReq tagReq; + /** + * 待办标记,多个标记逗号分隔 + */ + private String toDoMarker; + } diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index ee2c14ad..6829f1e4 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -4715,7 +4715,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { /** - * 项目的当前阶段包含:设计,就是:项目承接主体+结构,否则就是:项目承接主体+技术中心+结构,所对应的人 + * 项目的当前阶段包含:设计,就是:项目承接主体+结构仿真,否则就是:项目承接主体+结构仿真+技术中心,所对应的人 * * @param projectUndertaker * @return diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java index 73f965a8..150948a8 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationTaskServiceImpl.java @@ -127,6 +127,9 @@ public class SimulationTaskServiceImpl extends ServiceImpl()); req.setDisciplineList(Arrays.stream(req.getDiscipline().split(",")).toList()); } + StopWatch stopWatch = new StopWatch("所有任务方法计时"); + stopWatch.start("查所有任务"); + List 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 diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml index 7150c54c..ef998bb9 100644 --- a/project/src/main/resources/mapper/SimulationTaskMapper.xml +++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml @@ -821,6 +821,13 @@ )) + + and (toDoMarker in ( + + #{toDoMarker} + + )) + order by create_time desc @@ -972,6 +979,14 @@ )) + + and (toDoMarker in ( + + #{toDoMarker} + + )) + + @@ -1119,6 +1134,14 @@ )) + + and (toDoMarker in ( + + #{toDoMarker} + + )) + + @@ -1282,6 +1305,14 @@ )) + + + and (toDoMarker in ( + + #{toDoMarker} + + )) + and st.reportTemplate like #{searchKey18} @@ -1489,6 +1520,14 @@ )) + + + and (toDoMarker in ( + + #{toDoMarker} + + )) + and st.reportTemplate like #{searchKey18}