diff --git a/data/src/main/resources/application-dev-190.yml b/data/src/main/resources/application-dev-190.yml index b3bf4829..1b8b058b 100644 --- a/data/src/main/resources/application-dev-190.yml +++ b/data/src/main/resources/application-dev-190.yml @@ -130,6 +130,7 @@ security: - /data/uploadFiles - /data/initNewTenant - /data/getMinioPresignedUrl + - /data/getPublicDownloadUrl data: storage-monitor: diff --git a/data/src/main/resources/application-dev-65.yml b/data/src/main/resources/application-dev-65.yml index d301d2c0..5fa8ba55 100644 --- a/data/src/main/resources/application-dev-65.yml +++ b/data/src/main/resources/application-dev-65.yml @@ -130,6 +130,7 @@ security: - /data/uploadFiles - /data/initNewTenant - /data/getMinioPresignedUrl + - /data/getPublicDownloadUrl data: storage-monitor: diff --git a/data/src/main/resources/application-local.yml b/data/src/main/resources/application-local.yml index 03680187..873dc98a 100644 --- a/data/src/main/resources/application-local.yml +++ b/data/src/main/resources/application-local.yml @@ -135,6 +135,7 @@ security: - /data/uploadFiles - /data/initNewTenant - /data/getMinioPresignedUrl + - /data/getPublicDownloadUrl data: storage-monitor: diff --git a/data/src/main/resources/application-lyric.yml b/data/src/main/resources/application-lyric.yml index fdf502ce..4ad83a03 100644 --- a/data/src/main/resources/application-lyric.yml +++ b/data/src/main/resources/application-lyric.yml @@ -130,6 +130,7 @@ security: - /data/uploadFiles - /data/initNewTenant - /data/getMinioPresignedUrl + - /data/getPublicDownloadUrl data: storage-monitor: diff --git a/project/src/main/java/com/sdm/project/controller/SimulationRunController.java b/project/src/main/java/com/sdm/project/controller/SimulationRunController.java index f5b30eaf..f7ec1e4c 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationRunController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationRunController.java @@ -368,9 +368,9 @@ public class SimulationRunController implements ISimulationRunFeignClient { /** * 归档算例下指标图片报告等结果数据到任务下 */ - @PostMapping("/synKeyResultToTask") - public SdmResponse synKeyResultToTask(@RequestBody KeyResultReq req) { - return runService.synKeyResultToTask(req); + @PostMapping("/syncKeyResultToTask") + public SdmResponse syncKeyResultToTask(@RequestBody KeyResultReq req) { + return runService.syncKeyResultToTask(req); } } \ No newline at end of file diff --git a/project/src/main/java/com/sdm/project/service/ISimulationRunService.java b/project/src/main/java/com/sdm/project/service/ISimulationRunService.java index 25d48540..c96e5ee6 100644 --- a/project/src/main/java/com/sdm/project/service/ISimulationRunService.java +++ b/project/src/main/java/com/sdm/project/service/ISimulationRunService.java @@ -104,6 +104,6 @@ public interface ISimulationRunService extends IService { SdmResponse detail(SpdmTaskRunReq req); - SdmResponse synKeyResultToTask(KeyResultReq req); + SdmResponse syncKeyResultToTask(KeyResultReq req); } \ No newline at end of file diff --git a/project/src/main/java/com/sdm/project/service/handle/LyricQueryDemandFileHandler.java b/project/src/main/java/com/sdm/project/service/handle/LyricQueryDemandFileHandler.java index 7dc3de10..6148d272 100644 --- a/project/src/main/java/com/sdm/project/service/handle/LyricQueryDemandFileHandler.java +++ b/project/src/main/java/com/sdm/project/service/handle/LyricQueryDemandFileHandler.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -67,8 +68,9 @@ public class LyricQueryDemandFileHandler implements IQueryDemandFileHandler { fileMetadataInfoResp.setFileType(FileBizTypeEnum.DEMAND_FILE.getValue()); fileMetadataInfoResp.setFileSize(attachmentInfo.getFileSize()); fileMetadataInfoResp.setCreatorName(StringUtils.isNotBlank(attachmentInfo.getCreateBy()) ? attachmentInfo.getCreateBy() : "EPUser"); - fileMetadataInfoResp.setCreateTime(LocalDateTime.parse(attachmentInfo.getCreateTime())); - fileMetadataInfoResp.setUpdateTime(LocalDateTime.parse(attachmentInfo.getModifyTime())); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + fileMetadataInfoResp.setCreateTime(LocalDateTime.parse(attachmentInfo.getCreateTime(), formatter)); + fileMetadataInfoResp.setUpdateTime(LocalDateTime.parse(attachmentInfo.getModifyTime(), formatter)); resultList.add(fileMetadataInfoResp); } } 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 05b6734c..ce441f24 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 @@ -1539,7 +1539,7 @@ public class SimulationRunServiceImpl extends ServiceImpl - and is_mold.property_value = 'Y' - - - and is_mold.property_value = 'N' + + AND is_mold.property_value = #{req.isMoldMaking} LEFT JOIN simulation_demand_extra mold_material ON sd.uuid = mold_material.demand_id diff --git a/system/src/main/java/com/sdm/system/controller/SystemApproveController.java b/system/src/main/java/com/sdm/system/controller/SystemApproveController.java index d2603f8a..007ef087 100644 --- a/system/src/main/java/com/sdm/system/controller/SystemApproveController.java +++ b/system/src/main/java/com/sdm/system/controller/SystemApproveController.java @@ -50,6 +50,11 @@ public class SystemApproveController implements IApproveFeignClient { return approveServer.queryApproveFlowStatus(flowId); } + @GetMapping("queryNewApproveFlowStatus") + public SdmResponse queryNewApproveFlowStatus(@RequestParam("flowId") String flowId) { + return approveServer.queryNewApproveFlowStatus(flowId); + } + /** * 根据flowId批量查询审批详情 * @param flowIds diff --git a/system/src/main/java/com/sdm/system/service/ISimulatinoApprovalService.java b/system/src/main/java/com/sdm/system/service/ISimulatinoApprovalService.java index 9d4a0e0f..ea6a735d 100644 --- a/system/src/main/java/com/sdm/system/service/ISimulatinoApprovalService.java +++ b/system/src/main/java/com/sdm/system/service/ISimulatinoApprovalService.java @@ -58,6 +58,8 @@ public interface ISimulatinoApprovalService { */ SdmResponse queryApproveFlowStatus(String flowId); + SdmResponse queryNewApproveFlowStatus(String flowId); + SdmResponse queryBatchApproveFlowStatus(List flowIds); /** diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationApproveServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationApproveServiceImpl.java index b68031f1..0bfb5b08 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SimulationApproveServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationApproveServiceImpl.java @@ -53,6 +53,9 @@ public class SimulationApproveServiceImpl implements ISimulatinoApprovalService @Value("${cid.flow.queryApproveDetail}") private String queryFlowDetailPath; + @Value("${cid.flow.queryNewApproveDetail}") + private String queryNewApproveDetail; + @Value("${cid.flow.stopApproveFlow}") private String stopFlowPath; @@ -306,6 +309,28 @@ public class SimulationApproveServiceImpl implements ISimulatinoApprovalService return sdmResponse; } + @Override + public SdmResponse queryNewApproveFlowStatus( String flowId) + { + SdmResponse sdmResponse = SdmResponse.success(); + LaunchApproveReq flowBean = approveMapper.querySimulationApproveFlowByCidFlowId(flowId); + if(flowBean == null){ + sdmResponse = SdmResponse.failed("评审流程不存在"); + } + else + { + String url = cidUrl+queryNewApproveDetail; + JSONArray array = queryCidApproveFlowStatus(flowBean.cidFlowId, flowBean.templateId,flowBean.tenantId,url); + if(array != null){ + sdmResponse.setData(array); + } + else{ + sdmResponse = SdmResponse.failed("获取评审流程状态信息失败"); + } + } + return sdmResponse; + } + @Override public SdmResponse queryBatchApproveFlowStatus(List flowIds) { SdmResponse sdmResponse ; diff --git a/system/src/main/resources/application-dev-190.yml b/system/src/main/resources/application-dev-190.yml index 9ad1c4cd..cf4bfac6 100644 --- a/system/src/main/resources/application-dev-190.yml +++ b/system/src/main/resources/application-dev-190.yml @@ -164,6 +164,7 @@ cid: launchApprove: /spdm-flow/startFlow queryFlowTemplate: /spdm-flow/listProcessByGroup queryApproveDetail: /spdm-flow/queryFlowNodeDetail + queryNewApproveDetail: /spdm-flow/queryNewFlowNodeDetail stopApproveFlow: /spdm-flow/stopFlow group: SPDM # 单次批量查询cid审批流详情的条数 diff --git a/system/src/main/resources/application-dev-65.yml b/system/src/main/resources/application-dev-65.yml index 77fdcfe7..551b7e02 100644 --- a/system/src/main/resources/application-dev-65.yml +++ b/system/src/main/resources/application-dev-65.yml @@ -164,6 +164,7 @@ cid: launchApprove: /spdm-flow/startFlow queryFlowTemplate: /spdm-flow/listProcessByGroup queryApproveDetail: /spdm-flow/queryFlowNodeDetail + queryNewApproveDetail: /spdm-flow/queryNewFlowNodeDetail stopApproveFlow: /spdm-flow/stopFlow group: SPDM # 单次批量查询cid审批流详情的条数 diff --git a/system/src/main/resources/application-local.yml b/system/src/main/resources/application-local.yml index bbd97f59..97c10ea0 100644 --- a/system/src/main/resources/application-local.yml +++ b/system/src/main/resources/application-local.yml @@ -164,6 +164,7 @@ cid: launchApprove: /spdm-flow/startFlow queryFlowTemplate: /spdm-flow/listProcessByGroup queryApproveDetail: /spdm-flow/queryFlowNodeDetail + queryNewApproveDetail: /spdm-flow/queryNewFlowNodeDetail stopApproveFlow: /spdm-flow/stopFlow group: SPDM # 单次批量查询cid审批流详情的条数 diff --git a/system/src/main/resources/application-lyric.yml b/system/src/main/resources/application-lyric.yml index abca1ded..b4200382 100644 --- a/system/src/main/resources/application-lyric.yml +++ b/system/src/main/resources/application-lyric.yml @@ -164,6 +164,7 @@ cid: launchApprove: /spdm-flow/startFlow queryFlowTemplate: /spdm-flow/listProcessByGroup queryApproveDetail: /spdm-flow/queryFlowNodeDetail + queryNewApproveDetail: /spdm-flow/queryNewFlowNodeDetail stopApproveFlow: /spdm-flow/stopFlow group: SPDM # 单次批量查询cid审批流详情的条数