diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java index 6a65bb0..2e1cf8a 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java +++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java @@ -127,6 +127,7 @@ public class TaskLogAddExe { existingInfo.setStatus(TaskLogStatus.APPROVED.getCode()); // 主表进行中=1 existingInfo.setInfo(processedInfo); // 设置处理后的 info（包含 rejectHistory） + existingInfo.setCorpinfoId(cmd.getCorpinfoId()); // 处理签字人信息 handleInfoStep(existingInfo,cmd.getSignLogs()); diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkInfoCoConvertor.java b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkInfoCoConvertor.java index e6f5773..287bb83 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkInfoCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/eightwork/command/convertor/EightworkInfoCoConvertor.java @@ -8,6 +8,8 @@ import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; @@ -24,11 +26,26 @@ public interface EightworkInfoCoConvertor { * @return */ @Mapping(source = "info", target = "info", qualifiedByName = "stringToJsonObject") + @Mapping(target = "createTime", expression = "java(formatDateTime(eightworkInfoDO.getCreateTime()))") + @Mapping(target = "updateTime", expression = "java(formatDateTime(eightworkInfoDO.getUpdateTime()))") List converDOsToCOs(List eightworkInfoDOs); @Mapping(source = "info", target = "info", qualifiedByName = "stringToJsonObject") + @Mapping(target = "createTime", expression = "java(formatDateTime(eightworkInfoDO.getCreateTime()))") + @Mapping(target = "updateTime", expression = "java(formatDateTime(eightworkInfoDO.getUpdateTime()))") EightworkInfoCO converDOToCO(EightworkInfoDO eightworkInfoDO); + /** + * 格式化日期时间为字符串 + * @param dateTime 日期时间 + * @return 格式化后的字符串 + */ + default String formatDateTime(LocalDateTime dateTime) { + if (dateTime == null) { + return null; + } + return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + } @Named("stringToJsonObject") default JSONObject stringToJsonObject(String value) { if (value == null || value.isEmpty()) { diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresLogsQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresLogsQueryExe.java index d47265d..8ecc7ac 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresLogsQueryExe.java +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/MeasuresLogsQueryExe.java @@ -68,7 +68,17 @@ public class MeasuresLogsQueryExe { Map params = PageQueryHelper.toHashMap(qry); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - return measuresLogsCoConvertor.converDOsToCOs(measuresLogsRepository.list(queryWrapper)); + List measuresLogsCOS = measuresLogsCoConvertor.converDOsToCOs(measuresLogsRepository.list(queryWrapper)); + if(qry.getEqWorkId() == null){ + return measuresLogsCOS; + } + List logs = taskLogRepository.listAllByWorkId(qry.getEqWorkId()); + measuresLogsCOS.stream().forEach(measuresLogsCO -> { + logs.stream().filter(taskLogDO -> taskLogDO.getTaskLogId().equals(measuresLogsCO.getTaskLogId())).findFirst().ifPresent(taskLogDO -> { + measuresLogsCO.setStepName(taskLogDO.getStepName()); + }); + }); + return measuresLogsCOS; } } diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoSaveDraftCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoSaveDraftCmd.java index 96502e6..08c29ee 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoSaveDraftCmd.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoSaveDraftCmd.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -51,6 +52,7 @@ public class EightworkInfoSaveDraftCmd extends Command { private String workType; @ApiModelProperty(value = "级别", name = "workLevel", required = true) + @NotBlank(message = "请选择作业等级") private String workLevel; @ApiModelProperty(value = "详细信息", name = "info", required = true) diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsPageQry.java index 60ad48c..57c90bd 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsPageQry.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/MeasuresLogsPageQry.java @@ -26,5 +26,6 @@ public class MeasuresLogsPageQry extends PageQuery { private String eqWorkType; private String eqWorkId; private Long eqUpdateId; + private Integer eqType; } diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java index 75b33d1..e67522b 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogAddCmd.java @@ -29,7 +29,7 @@ public class TaskLogAddCmd extends Command { @NotBlank private String workType; @ApiModelProperty(value = "任务级别", name = "workLevel",required = true) - @NotBlank + @NotBlank(message = "请选择作业等级") private String workLevel; @ApiModelProperty(value = "企业", name = "corpinfoId", required = true) private Long corpinfoId; diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java index 3088465..39eebe7 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/EightworkInfoCO.java @@ -2,6 +2,7 @@ package com.zcloud.eightwork.dto.clientobject; import com.alibaba.cola.dto.ClientObject; import com.alibaba.fastjson.JSONObject; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,6 +24,8 @@ public class EightworkInfoCO extends ClientObject { //企业 @ApiModelProperty(value = "企业") private Long corpinfoId; + @ApiModelProperty(value = "服务单位") + private String corpinfoName; //是否相关方1是 @ApiModelProperty(value = "是否相关方1是") private Integer xgfFlag; @@ -82,6 +85,7 @@ public class EightworkInfoCO extends ClientObject { private String version; //创建时间 @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String createTime; //修改时间 @ApiModelProperty(value = "修改时间") diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java index afb6c3b..5d018de 100644 --- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/EightworkInfoDO.java @@ -1,6 +1,7 @@ package com.zcloud.eightwork.persistence.dataobject; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.basedo.BaseDO; @@ -69,6 +70,10 @@ public class EightworkInfoDO extends BaseDO { private Long departmentId; private String departmentName; + @ApiModelProperty(value = "服务单位") + @TableField(exist = false) + private String corpinfoName; + public EightworkInfoDO(String workId) { this.workId = workId; } diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java index 0e25567..548e0b2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java @@ -32,7 +32,12 @@ public class ConfinedSpaceRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()),Integer.parseInt(params.get("pageSize").toString())); - IPage iPage = confinedSpaceMapper.listPage(page, params,"confinedspacework-ledger-qy-list"); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } +// IPage iPage = confinedSpaceMapper.listPage(page, params,"confinedspacework-ledger-qy-list"); + IPage iPage = confinedSpaceMapper.listPage(page, params,menuPerms); return PageHelper.pageToResponse(iPage, iPage.getRecords()); } } diff --git a/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml index 076a845..4bc6249 100644 --- a/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml @@ -4,8 +4,9 @@