zcloud_gbs
/
zcloud-gbs-eightwork
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcloud_gbs:bf10ad0b6fde63a972226cff275c60f2b50328a7
Branches Tags
zcloud_gbs:master
..
compare: zcloud_gbs:31d94d6234a59742bbee50dd0191177310e3462d
Branches Tags
zcloud_gbs:master

No commits in common. "bf10ad0b6fde63a972226cff275c60f2b50328a7" and "31d94d6234a59742bbee50dd0191177310e3462d" have entirely different histories.
bf10ad0b6f ... 31d94d6234

9 changed files with 2 additions and 114 deletions
Show Stats Expand all files Collapse all files

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

@ -2,14 +2,10 @@ 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;
@ -29,7 +25,6 @@ import java.util.Map;
public class MeasuresLogsQueryExe {
private final MeasuresLogsRepository measuresLogsRepository;
private final MeasuresLogsCoConvertor measuresLogsCoConvertor;
private final TaskLogRepository taskLogRepository;
/**
* 根据id查询
@ -53,14 +48,7 @@ public class MeasuresLogsQueryExe {
}
public List<MeasuresLogsCO> listAll(String 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;
return measuresLogsCoConvertor.converDOsToCOs(measuresLogsRepository.listAll(workId));
}
}

19
web-client/src/main/java/com/zcloud/eightwork/dto/EightworkTaskQry.java
View File

@ -1,19 +0,0 @@
package com.zcloud.eightwork.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 作业任务查询 Qry
*
* @author fangjiakai
* @date 2026-03-18
*/
@Data
public class EightworkTaskQry {
@ApiModelProperty(value = "作业类型", required = true)
@NotBlank(message = "作业类型不能为空")
private String workType;
}

21
web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkTaskLevelCO.java
View File

@ -1,21 +0,0 @@
package com.zcloud.eightwork.dto.clientobject;
import com.alibaba.cola.dto.ClientObject;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 作业任务级别 CO
* 只包含任务名称和作业级别
*
* @author fangjiakai
* @date 2026-03-18
*/
@Data
public class EightworkTaskLevelCO extends ClientObject {
@ApiModelProperty(value = "任务名称")
private String taskName;
@ApiModelProperty(value = "作业级别")
private String workLevel;
}

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

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

22
web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskFlowGroupCO.java
View File

@ -1,22 +0,0 @@
package com.zcloud.eightwork.dto.clientobject;
import com.alibaba.cola.dto.ClientObject;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* 任务流程分组结果
*
* @author fangjiakai
* @date 2026-03-13
*/
@Data
public class TaskFlowGroupCO extends ClientObject {
@ApiModelProperty(value = "组别名称")
private String groupName;
@ApiModelProperty(value = "该组别的步骤列表")
private List<TaskFlowCO> steps;
}

23
web-domain/src/main/java/com/zcloud/eightwork/domain/model/EightworkTaskLevelE.java
View File

@ -1,23 +0,0 @@
package com.zcloud.eightwork.domain.model;
import lombok.Data;
/**
* 作业任务级别 E
* 只包含任务名称和作业级别
*
* @author fangjiakai
* @date 2026-03-18
*/
@Data
public class EightworkTaskLevelE {
/**
* 任务名称
*/
private String taskName;
/**
* 作业级别
*/
private String workLevel;
}

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

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

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

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

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

@ -45,6 +45,7 @@ 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));
}