feat(measures-logs): 添加步骤名称和状态字段支持

- 在 MeasuresLogsCO 中新增 stepName 和 status 字段用于存储步骤名称和合格状态
- 在 MeasuresLogsE 领域模型中添加对应的 stepName 和 status 属性
- 在 MeasuresLogsDO 数据对象中增加 stepName 和 status 字段定义
- 修改 MeasuresLogsQueryExe 查询执行器，通过 taskLogRepository 关联查询步骤名称
- 更新 TaskLogRepositoryImpl 的 listAllByWorkId 方法，移除状态过滤条件
- 实现 MeasuresLogsCO 与 TaskLogDO 的关联映射，填充步骤名称信息

web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresLogsQueryExe.java

@@ -2,10 +2,14 @@ package com.zcloud.eightwork.command.query;
 
 import com.alibaba.cola.dto.PageResponse;
 import com.zcloud.eightwork.command.convertor.MeasuresLogsCoConvertor;
+import com.zcloud.eightwork.domain.gateway.TaskLogGateway;
+import com.zcloud.eightwork.domain.model.TaskLogE;
 import com.zcloud.eightwork.dto.MeasuresLogsPageQry;
 import com.zcloud.eightwork.dto.clientobject.MeasuresLogsCO;
 import com.zcloud.eightwork.persistence.dataobject.MeasuresLogsDO;
+import com.zcloud.eightwork.persistence.dataobject.TaskLogDO;
 import com.zcloud.eightwork.persistence.repository.MeasuresLogsRepository;
+import com.zcloud.eightwork.persistence.repository.TaskLogRepository;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -25,6 +29,7 @@ import java.util.Map;
 public class MeasuresLogsQueryExe {
     private final MeasuresLogsRepository measuresLogsRepository;
     private final MeasuresLogsCoConvertor measuresLogsCoConvertor;
+    private final TaskLogRepository taskLogRepository;
 
     /**
      * 根据id查询
@@ -48,7 +53,14 @@ public class MeasuresLogsQueryExe {
     }
 
     public List<MeasuresLogsCO> listAll(String workId) {
-        return measuresLogsCoConvertor.converDOsToCOs(measuresLogsRepository.listAll(workId));
+        List<MeasuresLogsCO> measuresLogsCOS = measuresLogsCoConvertor.converDOsToCOs(measuresLogsRepository.listAll(workId));
+        List<TaskLogDO> logs = taskLogRepository.listAllByWorkId(workId);
+        measuresLogsCOS.stream().forEach(measuresLogsCO -> {
+            logs.stream().filter(taskLogDO -> taskLogDO.getTaskLogId().equals(measuresLogsCO.getTaskLogId())).findFirst().ifPresent(taskLogDO -> {
+                measuresLogsCO.setStepName(taskLogDO.getStepName());
+            });
+        });
+        return measuresLogsCOS;
     }
 }
 

web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/MeasuresLogsCO.java

@@ -19,6 +19,9 @@ public class MeasuresLogsCO extends ClientObject {
     //作业类型
     @ApiModelProperty(value = "作业类型")
     private String workType;
+    //填写步骤名
+    @ApiModelProperty(value = "填写步骤名")
+    private String stepName;
     //防护措施
     @ApiModelProperty(value = "防护措施")
     private String content;
@@ -34,6 +37,9 @@ public class MeasuresLogsCO extends ClientObject {
     //答案 &&分割
     @ApiModelProperty(value = "答案 &&分割")
     private String answer;
+    //是否合格1是2否
+    @ApiModelProperty(value = "是否合格1是2否")
+    private Integer status;
     //签字
     @ApiModelProperty(value = "签字")
     private String signPath;

web-domain/src/main/java/com/zcloud/eightwork/domain/model/MeasuresLogsE.java

@@ -13,6 +13,8 @@ import lombok.Data;
 public class MeasuresLogsE extends BaseE {
     //作业类型
     private String workType;
+    //填写步骤名
+    private String stepName;
     //防护措施
     private String content;
     //问题 &&分割
@@ -23,6 +25,8 @@ public class MeasuresLogsE extends BaseE {
     private String taskLogId;
     //答案 &&分割
     private String answer;
+    //是否合格1是2否
+    private Integer status;
     //签字
     private String signPath;
     //排序

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/MeasuresLogsDO.java

@@ -22,6 +22,9 @@ public class MeasuresLogsDO extends BaseDO {
     //作业类型
     @ApiModelProperty(value = "作业类型")
     private String workType;
+    //填写步骤名
+    @ApiModelProperty(value = "填写步骤名")
+    private String stepName;
     //防护措施
     @ApiModelProperty(value = "防护措施")
     private String content;
@@ -37,6 +40,9 @@ public class MeasuresLogsDO extends BaseDO {
     //答案 &&分割
     @ApiModelProperty(value = "答案 &&分割")
     private String answer;
+    //是否合格1是2否
+    @ApiModelProperty(value = "是否合格1是2否")
+    private Integer status;
     //签字
     @ApiModelProperty(value = "签字")
     private String signPath;

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/TaskLogRepositoryImpl.java

@@ -45,7 +45,6 @@ public class TaskLogRepositoryImpl extends BaseRepositoryImpl<TaskLogMapper, Tas
     public List<TaskLogDO> listAllByWorkId(String workId) {
         return list(new LambdaQueryWrapper<TaskLogDO>()
                 .eq(TaskLogDO::getWorkId, workId)
-                .ne(TaskLogDO::getStatus,-1)
                 .orderByAsc(TaskLogDO::getStepOrder)
                 .orderByAsc(TaskLogDO::getCreateTime));
     }