Merge branch 'main' of http://carsafe.uicp.cn/toolchaintechnologycenter/spdm-backend

data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java

@@ -1132,7 +1132,11 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
                 .eq(ObjectUtils.isNotEmpty(req.getQueryTarget()), FileMetadataInfo::getDataType, req.getQueryTarget())
                 .like(ObjectUtils.isNotEmpty(req.getFileName()), FileMetadataInfo::getOriginalName, req.getFileName())
                 .eq(FileMetadataInfo::getIsLatest, FileIsLastEnum.YES.getValue())
-                .ne(req.getIsFilterApproving(),FileMetadataInfo::getApprovalStatus,ApprovalFileDataStatusEnum.PENDING.getKey() )
+                .and(req.getIsFilterApproving(), wrapper -> wrapper
+                        .ne(FileMetadataInfo::getApprovalStatus, ApprovalFileDataStatusEnum.PENDING.getKey())
+                        .or()
+                        .isNull(FileMetadataInfo::getApprovalStatus)
+                )
                 .isNull(FileMetadataInfo::getDeletedAt)
 
                 // ===================== 兼容 userId 为空 =====================

project/src/main/java/com/sdm/project/controller/SimulationNodeController.java

@@ -261,6 +261,8 @@ public class SimulationNodeController implements ISimulationNodeFeignClient {
      * queryType 查询统计类型 任务/指标:task/performance
      * tag1-tag10 标签
      * resultTagType X轴(工位对应的tag)数据返回对应的Tag类型: tag1、tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10
+     *
+     * 只查询任务的指标完成情况，不统计算列的指标完成情况
      */
     @PostMapping("/getCommonCompleteStatistics")
     @Operation(summary = "任务/指标 完成情况统计请求参数(工位)", description = "任务/指标 完成情况统计请求参数(工位)")
@@ -284,6 +286,8 @@ public class SimulationNodeController implements ISimulationNodeFeignClient {
     /** 基于 学科（学科不是节点，是task的一个属性）查询（指标）完成统计
      * 需要传：
      * tag1-tag10 标签
+     *
+     *只查询任务的指标完成情况，不统计算列的指标完成情况
      */
     @PostMapping("/getPerformanceCompleteStatisticsByDiscipline")
     @Operation(summary = "基于 学科（学科不是节点，是task的一个属性）查询 指标 完成统计", description = "基于 学科（学科不是节点，是task的一个属性）查询（任务/指标）完成统计")

project/src/main/resources/mapper/SimulationNodeMapper.xml

@@ -529,7 +529,10 @@
     <select id="getAllUserTaskCompleteStatistics"
             parameterType="com.sdm.project.model.req.GetAllUserTaskCompleteStatisticsReq"
             resultType="com.sdm.project.model.vo.UserGroupTaskCompleteVo">
-        select task.exe_status as exeStatus,
+        select
+        distinct
+        task.uuid,
+        task.exe_status as exeStatus,
         task_member.user_id as userId
         from simulation_task task
         left join simulation_task_member task_member on task.uuid = task_member.task_id
@@ -685,6 +688,8 @@
             and
             performance.completeStatus is not null
             and
+            (performance.runId  is null or performance.runId = '')
+            and
             task.tenant_Id = #{req.tenantId}
             <if test="req.tag1 != null and req.tag1 !='' ">
                 and task.tag1 = #{req.tag1}
@@ -729,6 +734,8 @@
         left join simulation_performance performance on performance.taskId = task.uuid
         <where>
             performance.completeStatus is not null
+            and
+            (performance.runId  is null or performance.runId = '')
             and task.discipline is not null
             and task.discipline != ''
             and task.tenant_Id = #{req.tenantId}