From 06e62a4ea310427e845b492a2cc4c3717e192896 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Tue, 17 Mar 2026 17:01:40 +0800 Subject: [PATCH 1/9] =?UTF-8?q?1=E3=80=81modifyWithApprove=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=E5=AE=9A=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sdm/project/service/impl/ProjectServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index c4ef931e..5108afa3 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -2763,6 +2763,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { @Override public SdmResponse modifyWithApprove(ModifyProjectNode req) { + log.info("modifyWithApprove executing"); Long tenantId = ThreadLocalContext.getTenantId(); Long userId = ThreadLocalContext.getUserId(); // 如果需要评审 发起评审 @@ -2780,7 +2781,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { // 不需要评审 直接升版 or 不升 // 构造查询任务树的入参 ProjectTreeTagReq getTaskTreeReq = req.getTaskTreeReq; + log.info("获取修改前的任务树开始"); SdmResponse beforeTreeResp = getTaskTree(getTaskTreeReq); + log.info("获取修改前的任务树结束"); // 获取修改前的任务树 String beforeContents = null; if (beforeTreeResp.getData() != null) { @@ -2788,12 +2791,16 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { } // 修改当前策划版本 + log.info("修改当前策划版本开始"); SdmResponse response = modify(req); + log.info("修改当前策划版本结束"); if (!response.isSuccess()) { return response; } else { // 获取修改过后的任务树 + log.info("获取修改过后的任务树开始"); SdmResponse treeRespond = getTaskTree(getTaskTreeReq); + log.info("获取修改过后的任务树结束"); if (treeRespond.getData() != null) { String viewContents = JSONObject.toJSONString(treeRespond.getData()); List designVersions = simulationDesignVersionsService.lambdaQuery() From 7933776f82cd875979faf634b0d0c5de88759906 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Tue, 17 Mar 2026 17:14:23 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=8A=A5=E5=91=8A=E5=88=97=E8=A1=A8/?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=80=BB=E8=A7=88=E7=BC=96=E8=BE=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BB=BB=E5=8A=A1bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/enums/FileBizTypeEnum.java | 10 +- .../entity/resp/project/SpdmTaskVo.java | 4 + .../SimulationProjectController.java | 10 ++ .../model/req/WorkspaceReportListReq.java | 28 ++++++ .../model/resp/WorkspaceReportListResp.java | 34 +++++++ .../sdm/project/service/IProjectService.java | 4 + .../service/impl/ProjectServiceImpl.java | 97 +++++++++++++++++++ .../impl/SimulationRunServiceImpl.java | 9 +- .../impl/SimulationWorkServiceImpl.java | 93 +++++++++++------- .../project/service/impl/TaskServiceImpl.java | 5 + .../mapper/SimulationProjectMapper.xml | 4 + 11 files changed, 252 insertions(+), 46 deletions(-) create mode 100644 project/src/main/java/com/sdm/project/model/req/WorkspaceReportListReq.java create mode 100644 project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java diff --git a/common/src/main/java/com/sdm/common/entity/enums/FileBizTypeEnum.java b/common/src/main/java/com/sdm/common/entity/enums/FileBizTypeEnum.java index 1e71314d..fbd37284 100644 --- a/common/src/main/java/com/sdm/common/entity/enums/FileBizTypeEnum.java +++ b/common/src/main/java/com/sdm/common/entity/enums/FileBizTypeEnum.java @@ -31,7 +31,7 @@ public enum FileBizTypeEnum { * 云图文件 */ @Schema(description = "云图文件", example = "5") - CLOUD_FILE(5, "图片文件"), + CLOUD_FILE(5, "云图文件"), /** * 流程脚本 @@ -128,12 +128,4 @@ public enum FileBizTypeEnum { return value; } - public static String getDirNameByValue(int value) { - for (FileBizTypeEnum fileBizTypeEnum : values()) { - if (fileBizTypeEnum.value == value) { - return fileBizTypeEnum.getDirName(); - } - } - return null; - } } diff --git a/common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java b/common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java index 30c93c52..edf064ae 100644 --- a/common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java +++ b/common/src/main/java/com/sdm/common/entity/resp/project/SpdmTaskVo.java @@ -39,6 +39,10 @@ public class SpdmTaskVo extends BaseEntity { * 当前节点类型 */ private String nodeType; + /** + * 节点编码 + */ + private String nodeCode; /** diff --git a/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java b/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java index 34b9df75..fef5307b 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationProjectController.java @@ -4,12 +4,15 @@ import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.system.LaunchApproveReq; import com.sdm.common.entity.req.task.TaskExportExcelFormat; import com.sdm.common.entity.req.task.TaskTreeExportExcelFormat; +import com.sdm.common.entity.resp.PageDataResp; import com.sdm.common.feign.inter.project.ISimulationProjectFeignClient; import com.sdm.common.log.annotation.SysLog; import com.sdm.project.model.bo.ModifyProjectNode; import com.sdm.project.model.req.ProjectTreeListReq; import com.sdm.project.model.req.ProjectTreeTagReq; import com.sdm.project.model.req.SpdmNodeReq; +import com.sdm.project.model.req.WorkspaceReportListReq; +import com.sdm.project.model.resp.WorkspaceReportListResp; import com.sdm.project.service.IProjectService; import com.sdm.project.service.ITaskService; import io.swagger.v3.oas.annotations.Operation; @@ -21,6 +24,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; @RestController @RequestMapping(value = "/project") @@ -107,4 +111,10 @@ public class SimulationProjectController implements ISimulationProjectFeignClien return projectService.queryDesignVersions(projectId, phaseId); } + @PostMapping("/getWorkspaceReportList") + @Operation(summary = "查询工位下的报告列表", description = "根据工位id和tagMap配置查询工位下的报告文件列表") + public SdmResponse>> getWorkspaceReportList(@RequestBody @Validated WorkspaceReportListReq req) { + return projectService.getWorkspaceReportList(req); + } + } diff --git a/project/src/main/java/com/sdm/project/model/req/WorkspaceReportListReq.java b/project/src/main/java/com/sdm/project/model/req/WorkspaceReportListReq.java new file mode 100644 index 00000000..72002231 --- /dev/null +++ b/project/src/main/java/com/sdm/project/model/req/WorkspaceReportListReq.java @@ -0,0 +1,28 @@ +package com.sdm.project.model.req; + +import com.sdm.project.model.bo.TaskNodeTag; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.util.List; + +@Data +@Schema(description = "工位报告列表查询请求") +public class WorkspaceReportListReq { + + @NotNull(message = "workspaceId不能为空") + @Schema(description = "工位id") + private String workspaceId; + + @Schema(description = "标签映射配置，用于指定哪个tag对应工位") + private List tagMap; + + @NotNull(message = "当前页码不能为空") + @Schema(description = "当前页码") + private Integer current; + + @NotNull(message = "每页数量不能为空") + @Schema(description = "每页数量") + private Integer size; +} diff --git a/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java b/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java new file mode 100644 index 00000000..d63e7675 --- /dev/null +++ b/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java @@ -0,0 +1,34 @@ +package com.sdm.project.model.resp; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@Schema(description = "工位报告列表响应") +public class WorkspaceReportListResp { + + @Schema(description = "文件id") + private Long fileId; + + @Schema(description = "文件名称") + private String originalName; + + @Schema(description = "文件大小（格式化后）") + private String formatFileSize; + + @Schema(description = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + @Schema(description = "所属任务名称") + private String taskName; + + @Schema(description = "任务uuid") + private String taskUuid; + + @Schema(description = "审批状态") + private String exeStatus; +} diff --git a/project/src/main/java/com/sdm/project/service/IProjectService.java b/project/src/main/java/com/sdm/project/service/IProjectService.java index fa73151e..230e671e 100644 --- a/project/src/main/java/com/sdm/project/service/IProjectService.java +++ b/project/src/main/java/com/sdm/project/service/IProjectService.java @@ -4,8 +4,10 @@ import com.alibaba.fastjson2.JSONObject; import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.system.LaunchApproveReq; import com.sdm.common.entity.req.task.TaskTreeExportExcelFormat; +import com.sdm.common.entity.resp.PageDataResp; import com.sdm.project.model.bo.ModifyProjectNode; import com.sdm.project.model.req.*; +import com.sdm.project.model.resp.WorkspaceReportListResp; import jakarta.servlet.http.HttpServletResponse; import org.springframework.stereotype.Service; @@ -41,4 +43,6 @@ public interface IProjectService { void editTaskList(List taskEditNodeReqList); + SdmResponse>> getWorkspaceReportList(WorkspaceReportListReq req); + } diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index 5108afa3..841d1a71 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -3,7 +3,9 @@ package com.sdm.project.service.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.pagehelper.PageInfo; import com.sdm.common.common.ResultCode; import com.sdm.common.common.SdmResponse; import com.sdm.common.common.ThreadLocalContext; @@ -18,10 +20,13 @@ import com.sdm.common.entity.req.task.TaskTreeExportExcelFormat; import com.sdm.common.entity.req.task.TaskTreeExportExcelParam; import com.sdm.common.entity.resp.capability.FlowTemplateResp; import com.sdm.common.entity.resp.data.FileMetadataInfoResp; +import com.sdm.common.entity.resp.PageDataResp; +import com.sdm.common.entity.resp.data.SimulationTaskResultCurveResp; import com.sdm.common.entity.resp.project.SpdmTaskVo; import com.sdm.common.entity.resp.project.TaskNodeExtraPo; import com.sdm.common.entity.resp.system.CIDUserResp; import com.sdm.common.feign.impl.capability.SimulationFlowFeignClientImpl; +import com.sdm.common.feign.impl.data.DataAnalysisFeignClientImpl; import com.sdm.common.feign.impl.data.DataClientFeignClientImpl; import com.sdm.common.feign.impl.system.ApproveFeignClientImpl; import com.sdm.common.feign.impl.system.MessageFeignClientImpl; @@ -32,6 +37,7 @@ import com.sdm.common.log.constants.OperateTypeConstants; import com.sdm.common.log.dto.SysLogDTO; import com.sdm.common.service.BaseService; import com.sdm.common.service.TagMapService; +import com.sdm.common.utils.PageUtils; import com.sdm.common.utils.RandomUtil; import com.sdm.common.utils.SystemOperate; import com.sdm.common.utils.excel.ExcelUtil; @@ -47,6 +53,7 @@ import com.sdm.project.model.bo.*; import com.sdm.project.model.entity.*; import com.sdm.project.model.po.*; import com.sdm.project.model.req.*; +import com.sdm.project.model.resp.WorkspaceReportListResp; import com.sdm.project.model.vo.SpdmNodeExtraVo; import com.sdm.project.model.vo.SpdmNodeMemberVo; import com.sdm.project.model.vo.SpdmNodeVo; @@ -89,6 +96,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { @Autowired private DataClientFeignClientImpl dataClientFeignClient; + @Autowired + private DataAnalysisFeignClientImpl dataAnalysisFeignClient; + @Autowired private ISimulationTaskMemberService simulationTaskMemberService; @@ -3691,4 +3701,91 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { return SdmResponse.success(versions); } + @Override + public SdmResponse>> getWorkspaceReportList(WorkspaceReportListReq req) { + log.info("查询工位报告列表，参数：{}", req); + + // 1. 从tagMap中找到key为workspace的配置，获取对应的tag字段名 + String workspaceTagField = req.getTagMap().stream() + .filter(tag -> "workspace".equals(tag.getKey())) + .map(TaskNodeTag::getValue) + .findFirst() + .orElse(null); + + // 2. 查询simulation_task，根据workspaceTagField字段等于workspaceId查询任务列表 + List taskList = taskMapper.selectList( + new QueryWrapper().eq(workspaceTagField, req.getWorkspaceId()) + ); + + if (CollectionUtils.isEmpty(taskList)) { + log.info("未查询到工位{}下的任务", req.getWorkspaceId()); + return SdmResponse.success(new PageDataResp<>()); + } + + // 3. 构建任务uuid到任务信息的映射 + Map taskMap = taskList.stream() + .collect(Collectors.toMap(SimulationTask::getUuid, t -> t)); + + // 4. 拼接所有任务uuid，批量调用data服务查询报告文件 + String taskIds = String.join(",", taskMap.keySet()); + List allReports = new ArrayList<>(); + + try { + GetSimulationTaskFileReq fileReq = new GetSimulationTaskFileReq(); + fileReq.setUuid(taskIds); // 逗号分隔的多个任务id + fileReq.setCurrent(1); + fileReq.setSize(taskList.size() * 1000); // 设置足够大的分页 + fileReq.setFileTypeDictClass(FileDictTagEnum.FILE_TYPE.getDictClass()); + fileReq.setFileTypeDictValue(String.valueOf(FileBizTypeEnum.REPORT_FILE.getValue())); + fileReq.setDictTags(Arrays.asList(FileDictTagEnum.FILE_TYPE.getDictClassFieldName(), FileDictTagEnum.FILE_TYPE.getDictValueFieldName())); + + TagReq tagReq = new TagReq(); + tagReq.setTaskId(taskIds); // 逗号分隔的多个任务id + fileReq.setTagReq(tagReq); + + SdmResponse>> response = dataAnalysisFeignClient.getSimulationTaskFile(fileReq); + if (response != null && response.isSuccess() && response.getData() != null) { + List files = response.getData().getData(); + if (CollectionUtils.isNotEmpty(files)) { + for (SimulationTaskResultCurveResp file : files) { + // 从tagReq中获取文件所属的任务id + String taskUuid = file.getTagReq() != null ? file.getTagReq().getTaskId() : null; + SimulationTask task = taskMap.get(taskUuid); + if (task != null) { + WorkspaceReportListResp reportResp = new WorkspaceReportListResp(); + reportResp.setFileId(file.getId()); + reportResp.setOriginalName(file.getOriginalName()); + reportResp.setFormatFileSize(file.getFormatFileSize()); + reportResp.setCreateTime(file.getCreateTime()); + reportResp.setTaskName(task.getTaskName()); + reportResp.setTaskUuid(task.getUuid()); + reportResp.setExeStatus(task.getExeStatus()); + allReports.add(reportResp); + } + } + } + } + } catch (Exception e) { + log.error("批量查询工位{}的报告文件失败", req.getWorkspaceId(), e); + } + + // 5. 分页处理 + int total = allReports.size(); + int fromIndex = (req.getCurrent() - 1) * req.getSize(); + int toIndex = Math.min(fromIndex + req.getSize(), total); + + List pagedList; + if (fromIndex >= total) { + pagedList = new ArrayList<>(); + } else { + pagedList = allReports.subList(fromIndex, toIndex); + } + + PageInfo pageInfo = new PageInfo<>(pagedList); + pageInfo.setTotal(allReports.size()); + pageInfo.setPageNum(req.getCurrent()); + pageInfo.setPageSize(req.getSize()); + + return PageUtils.getJsonObjectSdmResponse(pagedList, pageInfo); + } } 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 e0ef342a..ccea652c 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 @@ -45,6 +45,7 @@ import com.sdm.common.feign.impl.flowable.FlowableClientFeignClientImpl; import com.sdm.common.feign.impl.system.ApproveFeignClientImpl; 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.PageUtils; import com.sdm.common.utils.RandomUtil; @@ -123,6 +124,9 @@ public class SimulationRunServiceImpl extends ServiceImpl> batchAddFileInfoForTask(UploadFilesReq req) { // 3D模型、计算模型、图片文件、曲线文件、仿真报告 获取文件夹名 - String dirName = FileBizTypeEnum.getDirNameByValue(req.getFileType()); + String dirName = fileBizTypeService.getFileName(String.valueOf(req.getFileType())); // 获取文件夹id Long parentId = getParentDirId(req.getUuid(), dirName); req.setDirId(parentId); diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java index a075f29f..6bceddeb 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java @@ -138,6 +138,9 @@ public class SimulationWorkServiceImpl extends ServiceImpl updateWrapper = this.lambdaUpdate(); Integer actualWorkHour = req.getActualWorkHour(); @@ -317,7 +338,11 @@ public class SimulationWorkServiceImpl extends ServiceImpl page = new PageInfo<>(workList); - return PageUtils.getJsonObjectSdmResponse(workList, page); - } - // 当前用户需要是报工条目的创建人或负责人 - workList = workList.stream().filter(work -> userId.equals(work.getOwner()) || userId.equals(work.getCreator())).collect(Collectors.toList()); + workList = this.lambdaQuery() + .eq(SimulationWork::getTaskId, req.getTaskId()) + .and(wrapper -> wrapper + .eq(SimulationWork::getOwner, userId) + .or() + .eq(SimulationWork::getCreator, userId)) + .list(); } else { - // 不传taskId，根据type查询 + // 不传taskId，根据type查询，将filteredTaskIds条件加入SQL PageHelper.startPage(req.getCurrent(), req.getSize()); if (req.getType() != null && req.getType() == 0) { // type=0：查询当前登录人为creator（我确认的） - workList = this.lambdaQuery().eq(SimulationWork::getCreator, userId).list(); + workList = this.lambdaQuery() + .eq(SimulationWork::getCreator, userId) + .in(filteredTaskIds != null, SimulationWork::getTaskId, filteredTaskIds) + .list(); } else if (req.getType() != null && req.getType() == 1) { // type=1：查询当前登录人为owner（我执行的） - workList = this.lambdaQuery().eq(SimulationWork::getOwner, userId).list(); + workList = this.lambdaQuery() + .eq(SimulationWork::getOwner, userId) + .in(filteredTaskIds != null, SimulationWork::getTaskId, filteredTaskIds) + .list(); } else { - // type为空或其他值，查询全部 - workList = this.lambdaQuery().list(); - } - - // 如果有筛选条件，过滤workList - if (filteredTaskIds != null && CollectionUtils.isNotEmpty(workList)) { - List finalFilteredTaskIds = filteredTaskIds; - workList = workList.stream() - .filter(work -> finalFilteredTaskIds.contains(work.getTaskId())) - .collect(Collectors.toList()); + // type为空或其他值，查询全部（需要带taskId筛选） + workList = this.lambdaQuery() + .in(filteredTaskIds != null, SimulationWork::getTaskId, filteredTaskIds) + .list(); } } diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index e7200918..f68a70f7 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -3164,6 +3164,11 @@ public class TaskServiceImpl implements ITaskService { } } } + // 设置扩展信息 + List taskExtraList = mapper.getTaskExtraList(Collections.singletonList(taskVo.getUuid())); + if (CollectionUtils.isNotEmpty(taskExtraList)) { + taskVo.setExtras(taskExtraList); + } return SdmResponse.success(taskVo); } diff --git a/project/src/main/resources/mapper/SimulationProjectMapper.xml b/project/src/main/resources/mapper/SimulationProjectMapper.xml index aec17110..891166ab 100644 --- a/project/src/main/resources/mapper/SimulationProjectMapper.xml +++ b/project/src/main/resources/mapper/SimulationProjectMapper.xml @@ -187,6 +187,10 @@ sectionName = #{taskNode.section}, + + groupName = #{taskNode.group}, + + bCapacity = #{taskNode.bCapacity}, From 9bb11ba4b3a25ab36f379c42156d91980e48c4d7 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Tue, 17 Mar 2026 17:36:31 +0800 Subject: [PATCH 3/9] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=8A=A5=E5=91=8A=E7=9A=84=E7=9B=B8=E5=85=B3=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdm/common/constants/LyricParamConstants.java | 12 ++++++++---- .../service/impl/LyricInternalServiceImpl.java | 4 +++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/sdm/common/constants/LyricParamConstants.java b/common/src/main/java/com/sdm/common/constants/LyricParamConstants.java index 714cb100..aec50890 100644 --- a/common/src/main/java/com/sdm/common/constants/LyricParamConstants.java +++ b/common/src/main/java/com/sdm/common/constants/LyricParamConstants.java @@ -13,8 +13,6 @@ public class LyricParamConstants { public static final String SYSTEM_CODE = "spdm"; // 表名称 public static final String TABLE_NAME = "oa_three_d_review"; - // 字段名称 - public static final String COLUMN_NAME = "simulation_table"; // 权限编码 public static final String FILE_POWER = "2456236750149124114"; // 系统id @@ -23,10 +21,16 @@ public class LyricParamConstants { public static final Long FORM_ID = 1847115435993071616L; // 有限元控件id public static final Long FINITE_ELEMENT_COMPONENT_INST_ID = 8000004142460000204L; + // 有限元字段名称 + public static final String FINITE_ELEMENT_COLUMN_NAME = "simulation_table"; // 机器人控件id - public static final Long ROBOT_COMPONENT_INST_ID = 8000004142460000204L; + public static final Long ROBOT_COMPONENT_INST_ID = 8000004142460000228L; + // 机器人字段名称 + public static final String ROBOT_COLUMN_NAME = "robot_table"; // 公差控件id - public static final Long TOLERANCE_COMPONENT_INST_ID = 8000004142460000204L; + public static final Long TOLERANCE_COMPONENT_INST_ID = 8000004144780000369L; + // 公差字段名称 + public static final String TOLERANCE_COLUMN_NAME = "checkproducts_enclosure"; } 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 57b13526..4c965e94 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 @@ -1620,10 +1620,13 @@ public class LyricInternalServiceImpl implements ILyricInternalService { Integer pushType = req.getPushType(); if (pushType == 1) { uploadFileReq.setComponentInstId(LyricParamConstants.FINITE_ELEMENT_COMPONENT_INST_ID); + uploadFileReq.setColumnName(LyricParamConstants.FINITE_ELEMENT_COLUMN_NAME); }else if (pushType == 2) { uploadFileReq.setComponentInstId(LyricParamConstants.ROBOT_COMPONENT_INST_ID); + uploadFileReq.setColumnName(LyricParamConstants.ROBOT_COLUMN_NAME); }else { uploadFileReq.setComponentInstId(LyricParamConstants.TOLERANCE_COMPONENT_INST_ID); + uploadFileReq.setColumnName(LyricParamConstants.TOLERANCE_COLUMN_NAME); } uploadFileReq.setWaterMarkFlag(false); uploadFileReq.setWaterMarkContent(LyricParamConstants.SYSTEM_CODE); @@ -1631,7 +1634,6 @@ public class LyricInternalServiceImpl implements ILyricInternalService { uploadFileReq.setSysId(LyricParamConstants.SYSTEM_ID); uploadFileReq.setFormId(LyricParamConstants.FORM_ID); uploadFileReq.setTableName(LyricParamConstants.TABLE_NAME); - uploadFileReq.setColumnName(LyricParamConstants.COLUMN_NAME); uploadFileReq.setXmh(req.getProjectCode()); uploadFileReq.setGwh(req.getWorkspaceCode()); uploadFileReq.setFiles(Collections.singletonList(zipFilePath)); From 9c9ceb0a1e90c28c87f778265d1ecd323d8d4a38 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Tue, 17 Mar 2026 19:17:55 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=8A=A5=E5=91=8A=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/resp/data/SimulationTaskResultCurveResp.java | 3 +++ .../com/sdm/project/model/resp/WorkspaceReportListResp.java | 6 +++++- .../com/sdm/project/service/impl/ProjectServiceImpl.java | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java b/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java index f91e41c5..0e82c173 100644 --- a/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java +++ b/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java @@ -38,4 +38,7 @@ public class SimulationTaskResultCurveResp extends BaseResp { @Schema(description = "排序号") private Integer sortOrder; + + @Schema(description = "创建人") + private Long creatorId; } diff --git a/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java b/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java index d63e7675..9dbdec07 100644 --- a/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java +++ b/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java @@ -30,5 +30,9 @@ public class WorkspaceReportListResp { private String taskUuid; @Schema(description = "审批状态") - private String exeStatus; + private String approvalStatus; + + @Schema(description = "创建人") + private Long creator; + private String creatorName; } diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index 841d1a71..29d2d357 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -3759,7 +3759,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { reportResp.setCreateTime(file.getCreateTime()); reportResp.setTaskName(task.getTaskName()); reportResp.setTaskUuid(task.getUuid()); - reportResp.setExeStatus(task.getExeStatus()); + reportResp.setApprovalStatus(String.valueOf(task.getApprovalStatus())); + reportResp.setCreator(file.getCreatorId()); allReports.add(reportResp); } } From 342d4f35b5455033bba6a7c183c466bc419896e9 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Tue, 17 Mar 2026 20:46:02 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=E7=AE=97=E4=BE=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=A4=9A=E4=B8=AA=E5=90=8C?= =?UTF-8?q?=E5=90=8D=E7=AE=97=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sdm/project/service/impl/TaskServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index f68a70f7..0d68f9d0 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -2589,7 +2589,9 @@ public class TaskServiceImpl implements ITaskService { if (ObjectUtils.isEmpty(eachTaskVo)) { continue; } - TagReq taskTagReq = eachTaskVo.getTagReq(); + // 创建新的TagReq对象，避免多个taskRunPo共享同一个引用导致数据被覆盖 + TagReq taskTagReq = new TagReq(); + BeanUtils.copyProperties(eachTaskVo.getTagReq(), taskTagReq); taskTagReq.setRunId(taskRunPo.getUuid()); taskTagReq.setRunName(taskRunPo.getRunName()); taskRunPo.setTagReq(taskTagReq); From c622a6af45b15d86cd127a84ac7809535a2266f7 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 18 Mar 2026 09:05:01 +0800 Subject: [PATCH 6/9] =?UTF-8?q?1=E3=80=81=E5=90=88=E5=B9=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdm/common/entity/req/data/TagReq.java | 36 +++++++++++++++++ .../model/req/SpdmMergeQueryNodeReq.java | 4 ++ .../project/service/impl/TaskServiceImpl.java | 39 ++++++++++++------- 3 files changed, 66 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/com/sdm/common/entity/req/data/TagReq.java b/common/src/main/java/com/sdm/common/entity/req/data/TagReq.java index c389d5cf..ccc27c46 100644 --- a/common/src/main/java/com/sdm/common/entity/req/data/TagReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/data/TagReq.java @@ -15,72 +15,108 @@ public class TagReq { @Schema(description = "标签1") private String tag1; + @Schema(description = "标签1编号") + private String tag1Code; + @Schema(description = "标签1名称") private String tag1Name; @Schema(description = "标签2") private String tag2; + @Schema(description = "标签2编号") + private String tag2Code; + @Schema(description = "标签2名称") private String tag2Name; @Schema(description = "标签3") private String tag3; + @Schema(description = "标签3编号") + private String tag3Code; + @Schema(description = "标签3名称") private String tag3Name; @Schema(description = "标签4") private String tag4; + @Schema(description = "标签4编号") + private String tag4Code; + @Schema(description = "标签4名称") private String tag4Name; @Schema(description = "标签5") private String tag5; + @Schema(description = "标签5编号") + private String tag5Code; + @Schema(description = "标签5名称") private String tag5Name; @Schema(description = "标签6") private String tag6; + @Schema(description = "标签6编号") + private String tag6Code; + @Schema(description = "标签6名称") private String tag6Name; @Schema(description = "标签7") private String tag7; + @Schema(description = "标签7编号") + private String tag7Code; + @Schema(description = "标签7名称") private String tag7Name; @Schema(description = "标签8") private String tag8; + @Schema(description = "标签8编号") + private String tag8Code; + @Schema(description = "标签8名称") private String tag8Name; @Schema(description = "标签9") private String tag9; + @Schema(description = "标签9编号") + private String tag9Code; + @Schema(description = "标签9名称") private String tag9Name; @Schema(description = "标签10") private String tag10; + @Schema(description = "标签10编号") + private String tag10Code; + @Schema(description = "标签10名称") private String tag10Name; @Schema(description= "任务ID") private String taskId; + @Schema(description= "任务编号") + private String taskCode; + @Schema(description= "任务名称") private String taskName; @Schema(description= "算例ID") private String runId; + @Schema(description= "算例编号") + private String runCode; + @Schema(description= "算例名称") private String runName; } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmMergeQueryNodeReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmMergeQueryNodeReq.java index f7f38aa6..79635a2e 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmMergeQueryNodeReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmMergeQueryNodeReq.java @@ -10,4 +10,8 @@ public class SpdmMergeQueryNodeReq { @Schema(description = "查询类型") private String type; + // 返回值类型：1-name，2-code + @Schema(description = "返回值类型") + private Integer resultType = 1; + } diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index f68a70f7..dcab0fff 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -1288,7 +1288,8 @@ public class TaskServiceImpl implements ITaskService { // 通用的标签设置方法 private void setTagField(TagReq tagReq, String tagValue, String tagName, BiConsumer tagSetter, - BiConsumer tagNameSetter) { + BiConsumer tagNameSetter, + BiConsumer tagCodeSetter) { if (tagValue != null) { tagSetter.accept(tagReq, tagValue); } @@ -1300,18 +1301,19 @@ public class TaskServiceImpl implements ITaskService { private void fillTaskTagReq(List newTaskList) { for (SpdmNewTaskVo spdmNewTaskVo : newTaskList) { TagReq tagReq = new TagReq(); - setTagField(tagReq, spdmNewTaskVo.getNewTag1(), spdmNewTaskVo.getTag1(), TagReq::setTag1, TagReq::setTag1Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag2(), spdmNewTaskVo.getTag2(), TagReq::setTag2, TagReq::setTag2Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag3(), spdmNewTaskVo.getTag3(), TagReq::setTag3, TagReq::setTag3Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag4(), spdmNewTaskVo.getTag4(), TagReq::setTag4, TagReq::setTag4Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag5(), spdmNewTaskVo.getTag5(), TagReq::setTag5, TagReq::setTag5Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag6(), spdmNewTaskVo.getTag6(), TagReq::setTag6, TagReq::setTag6Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag7(), spdmNewTaskVo.getTag7(), TagReq::setTag7, TagReq::setTag7Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag8(), spdmNewTaskVo.getTag8(), TagReq::setTag8, TagReq::setTag8Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag9(), spdmNewTaskVo.getTag9(), TagReq::setTag9, TagReq::setTag9Name); - setTagField(tagReq, spdmNewTaskVo.getNewTag10(), spdmNewTaskVo.getTag10(), TagReq::setTag10, TagReq::setTag10Name); + setTagField(tagReq, spdmNewTaskVo.getNewTag1(), spdmNewTaskVo.getTag1(), TagReq::setTag1, TagReq::setTag1Name, TagReq::setTag1Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag2(), spdmNewTaskVo.getTag2(), TagReq::setTag2, TagReq::setTag2Name, TagReq::setTag2Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag3(), spdmNewTaskVo.getTag3(), TagReq::setTag3, TagReq::setTag3Name, TagReq::setTag3Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag4(), spdmNewTaskVo.getTag4(), TagReq::setTag4, TagReq::setTag4Name, TagReq::setTag4Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag5(), spdmNewTaskVo.getTag5(), TagReq::setTag5, TagReq::setTag5Name, TagReq::setTag5Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag6(), spdmNewTaskVo.getTag6(), TagReq::setTag6, TagReq::setTag6Name, TagReq::setTag6Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag7(), spdmNewTaskVo.getTag7(), TagReq::setTag7, TagReq::setTag7Name, TagReq::setTag7Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag8(), spdmNewTaskVo.getTag8(), TagReq::setTag8, TagReq::setTag8Name,TagReq::setTag8Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag9(), spdmNewTaskVo.getTag9(), TagReq::setTag9, TagReq::setTag9Name, TagReq::setTag9Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag10(), spdmNewTaskVo.getTag10(), TagReq::setTag10, TagReq::setTag10Name, TagReq::setTag10Code); tagReq.setTaskId(spdmNewTaskVo.getUuid()); tagReq.setTaskName(spdmNewTaskVo.getTaskName()); + tagReq.setTaskCode(spdmNewTaskVo.getTaskCode()); spdmNewTaskVo.setTagReq(tagReq); } } @@ -5000,6 +5002,7 @@ public class TaskServiceImpl implements ITaskService { if (MapUtils.isEmpty(tagMap)) { return SdmResponse.failed("未查询到节点标签的配置"); } + Integer resultType = req.getResultType(); List mergeQueryRespList = new ArrayList<>(); // 如果是任务或算例就传：task或run，其他的传tag1到tag10 String type = req.getType(); @@ -5023,7 +5026,12 @@ public class TaskServiceImpl implements ITaskService { } if (MERGE_QUERY_TASK.equals(type)) { // 查询任务 - Map> taskMap = taskVoList.stream().collect(Collectors.groupingBy(SpdmNewTaskVo::getTaskName)); + Map> taskMap; + if (resultType == 1) { + taskMap = taskVoList.stream().collect(Collectors.groupingBy(SpdmNewTaskVo::getTaskName)); + }else { + taskMap = taskVoList.stream().collect(Collectors.groupingBy(SpdmNewTaskVo::getTaskCode)); + } for (Map.Entry> taskEntry : taskMap.entrySet()) { NodeMergeQueryResp taskMergeQueryResp = new NodeMergeQueryResp(); taskMergeQueryResp.setName(taskEntry.getKey()); @@ -5057,7 +5065,12 @@ public class TaskServiceImpl implements ITaskService { if (CollectionUtils.isEmpty(nodeList)) { return SdmResponse.success(Collections.emptyList()); } - Map> nodeMap = nodeList.stream().collect(Collectors.groupingBy(SimulationNode::getNodeName)); + Map> nodeMap; + if (resultType == 1) { + nodeMap = nodeList.stream().filter(node -> StringUtils.isNotBlank(node.getNodeName())).collect(Collectors.groupingBy(SimulationNode::getNodeName)); + }else { + nodeMap = nodeList.stream().filter(node -> StringUtils.isNotBlank(node.getNodeCode())).collect(Collectors.groupingBy(SimulationNode::getNodeCode)); + } for (Map.Entry> nodeEntry : nodeMap.entrySet()) { NodeMergeQueryResp nodeMergeQueryResp = new NodeMergeQueryResp(); nodeMergeQueryResp.setName(nodeEntry.getKey()); From 32bf63419be5b62f10c5b7e8ca7f0df6cf722409 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 18 Mar 2026 09:33:31 +0800 Subject: [PATCH 7/9] =?UTF-8?q?1=E3=80=81=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8A=A0=E5=AD=A6=E7=A7=91=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/sdm/project/model/req/SpdmTaskListReq.java | 3 +++ .../java/com/sdm/project/service/impl/TaskServiceImpl.java | 4 ++++ 2 files changed, 7 insertions(+) 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 026020fa..b56b93a6 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 @@ -152,6 +152,9 @@ public class SpdmTaskListReq { private List filterDiscipline; + // 二次查询过滤学科 + private String discipline; + private String taskId; /** diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index 168df881..f5850525 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -1177,6 +1177,10 @@ public class TaskServiceImpl implements ITaskService { } StopWatch stopWatch = new StopWatch("所有任务方法计时"); stopWatch.start("查所有任务"); + // 二次查询过滤学科 + if (StringUtils.isNotBlank(req.getDiscipline())) { + req.setFilterDiscipline(Collections.singletonList(req.getDiscipline())); + } List allTaskList = mapper.optimisedGtTaskList(tenantId, req); stopWatch.stop(); JSONObject jsonObject = buildEmptyJsonResp(req); From 652d1bea7e5ac95e75c93f801df780dae121ea38 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 18 Mar 2026 09:57:47 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix[project]:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E7=9A=84tagReq=E4=B8=ADcode?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98=20-=20=E8=A1=A5?= =?UTF-8?q?=E5=85=85TaskServiceImpl=E4=B8=AD=E5=AF=B9tagCode=E7=9A=84?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/TaskServiceImpl.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index f5850525..8792a309 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -1290,7 +1290,7 @@ public class TaskServiceImpl implements ITaskService { } // 通用的标签设置方法 - private void setTagField(TagReq tagReq, String tagValue, String tagName, + private void setTagField(TagReq tagReq, String tagValue, String tagName,String tagCode, BiConsumer tagSetter, BiConsumer tagNameSetter, BiConsumer tagCodeSetter) { @@ -1300,21 +1300,24 @@ public class TaskServiceImpl implements ITaskService { if (tagName != null) { tagNameSetter.accept(tagReq, tagName); } + if (tagCode != null) { + tagCodeSetter.accept(tagReq, tagCode); + } } private void fillTaskTagReq(List newTaskList) { for (SpdmNewTaskVo spdmNewTaskVo : newTaskList) { TagReq tagReq = new TagReq(); - setTagField(tagReq, spdmNewTaskVo.getNewTag1(), spdmNewTaskVo.getTag1(), TagReq::setTag1, TagReq::setTag1Name, TagReq::setTag1Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag2(), spdmNewTaskVo.getTag2(), TagReq::setTag2, TagReq::setTag2Name, TagReq::setTag2Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag3(), spdmNewTaskVo.getTag3(), TagReq::setTag3, TagReq::setTag3Name, TagReq::setTag3Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag4(), spdmNewTaskVo.getTag4(), TagReq::setTag4, TagReq::setTag4Name, TagReq::setTag4Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag5(), spdmNewTaskVo.getTag5(), TagReq::setTag5, TagReq::setTag5Name, TagReq::setTag5Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag6(), spdmNewTaskVo.getTag6(), TagReq::setTag6, TagReq::setTag6Name, TagReq::setTag6Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag7(), spdmNewTaskVo.getTag7(), TagReq::setTag7, TagReq::setTag7Name, TagReq::setTag7Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag8(), spdmNewTaskVo.getTag8(), TagReq::setTag8, TagReq::setTag8Name,TagReq::setTag8Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag9(), spdmNewTaskVo.getTag9(), TagReq::setTag9, TagReq::setTag9Name, TagReq::setTag9Code); - setTagField(tagReq, spdmNewTaskVo.getNewTag10(), spdmNewTaskVo.getTag10(), TagReq::setTag10, TagReq::setTag10Name, TagReq::setTag10Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag1(), spdmNewTaskVo.getTag1(),spdmNewTaskVo.getTag1Code(), TagReq::setTag1, TagReq::setTag1Name, TagReq::setTag1Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag2(), spdmNewTaskVo.getTag2(), spdmNewTaskVo.getTag2Code(),TagReq::setTag2, TagReq::setTag2Name, TagReq::setTag2Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag3(), spdmNewTaskVo.getTag3(), spdmNewTaskVo.getTag3Code(),TagReq::setTag3, TagReq::setTag3Name, TagReq::setTag3Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag4(), spdmNewTaskVo.getTag4(), spdmNewTaskVo.getTag4Code(),TagReq::setTag4, TagReq::setTag4Name, TagReq::setTag4Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag5(), spdmNewTaskVo.getTag5(), spdmNewTaskVo.getTag5Code(),TagReq::setTag5, TagReq::setTag5Name, TagReq::setTag5Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag6(), spdmNewTaskVo.getTag6(), spdmNewTaskVo.getTag6Code(),TagReq::setTag6, TagReq::setTag6Name, TagReq::setTag6Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag7(), spdmNewTaskVo.getTag7(), spdmNewTaskVo.getTag7Code(),TagReq::setTag7, TagReq::setTag7Name, TagReq::setTag7Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag8(), spdmNewTaskVo.getTag8(), spdmNewTaskVo.getTag8Code(),TagReq::setTag8, TagReq::setTag8Name,TagReq::setTag8Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag9(), spdmNewTaskVo.getTag9(), spdmNewTaskVo.getTag9Code(),TagReq::setTag9, TagReq::setTag9Name, TagReq::setTag9Code); + setTagField(tagReq, spdmNewTaskVo.getNewTag10(), spdmNewTaskVo.getTag10(), spdmNewTaskVo.getTag10Code(),TagReq::setTag10, TagReq::setTag10Name, TagReq::setTag10Code); tagReq.setTaskId(spdmNewTaskVo.getUuid()); tagReq.setTaskName(spdmNewTaskVo.getTaskName()); tagReq.setTaskCode(spdmNewTaskVo.getTaskCode()); From 9a4ed22dbd9d6162270a2e475f619b63e889eba9 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 18 Mar 2026 10:07:11 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix[project]:=20=E5=90=8C=E6=AD=A5=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E6=97=B6=EF=BC=8C=E6=8B=89=E5=8F=96=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E7=9A=84=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sdm/project/service/impl/LyricInternalServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 4c965e94..65fc1ecb 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 @@ -532,6 +532,8 @@ public class LyricInternalServiceImpl implements ILyricInternalService { // } req.setCreator(usernameToUserIdMap.get(todo.getIntroduceBy())); req.setTenantId(tenantId); + // 20260318 需求的描述也要拉取 + req.setDescription(todo.getDescribes()); // 补充项目/阶段/工位ID