fix:查询流程详情接口（新）

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);
                    }
                }

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

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<String> flowIds);
 
     /**

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<String> flowIds) {
         SdmResponse  sdmResponse ;

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审批流详情的条数

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审批流详情的条数

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审批流详情的条数

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审批流详情的条数