ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderDetailVO.java
@@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.platform.base.AbsVo; import com.ycl.platform.domain.entity.WorkOrder; import com.ycl.platform.domain.entity.WorkOrderCheckImg; import lombok.Data; import org.springframework.beans.BeanUtils; import org.springframework.lang.NonNull; @@ -68,6 +69,9 @@ */ private Boolean hasReport; /** 检测图片 */ private List<WorkOrderCheckImg> imgList; public static WorkOrderDetailVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderDetailVO vo) { if(vo == null) { vo = new WorkOrderDetailVO(); ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
@@ -25,8 +25,8 @@ private Integer workOrderId; /** 提交人 */ private Integer commitUser; private String commitUserName; private Integer unitId; private String unitName; /** 运维情况 */ private String ywCondition; ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -73,7 +73,6 @@ @RequiredArgsConstructor public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService { private final WorkOrderMapper workOrderMapper; private final YwPointService ywPointService; private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper; private final WorkOrderAuditingRecordService workOrderAuditingRecordService; @@ -82,9 +81,8 @@ private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper; private final WorkOrderErrorTypeServiceImpl workOrderErrorTypeService; private final SysConfigMapper configMapper; private final ServerConfig serverConfig; private final ReportMapper reportMapper; private final SysDictDataMapper dictDataMapper; private final WorkOrderCheckImgMapper workOrderCheckImgMapper; @Value("${rtsp.server:http://127.0.0.1:7788}") private String rtspServer; @@ -402,7 +400,7 @@ List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo); ywConditionList.stream().forEach(item -> { if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) { item.setCommitUserName("系统消息"); item.setUnitName("系统消息"); } }); return ywConditionList; @@ -793,6 +791,13 @@ List<SysDictData> errorList = workOrderErrorTypeService.getBaseMapper().getErrorList(workOrder.getWorkOrderNo()); List<String> errList = errorList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()); workOrder.setErrorTypeList(errList); // 检测图片 List<WorkOrderCheckImg> imgList = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper) .eq(WorkOrderCheckImg::getWorkOrderNo, workOrderNo) .orderByDesc(WorkOrderCheckImg::getCreateTime) .last("limit 20") .list(); workOrder.setImgList(imgList); return Result.ok().data(workOrder); } } ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
@@ -7,16 +7,17 @@ <result column="id" property="id"/> <result column="create_time" property="createTime"/> <result column="yw_condition" property="ywCondition"/> <result column="commit_user" property="commitUser"/> <result column="nick_name" property="commitUserName"/> <result column="unitId" property="unitId"/> <result column="unit_name" property="unitName"/> <result column="sys_msg" property="sysMsg"/> <result column="yw_proofMaterials" property="ywProofMaterials"/> </resultMap> <select id="selectYwConditionByYwId" resultMap="BaseResultMap"> SELECT yw.id, yw.commit_user, yw.yw_condition, yw.yw_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name SELECT yw.id, yu.id as unit_id, yu.unit_name, yw.yw_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name FROM t_work_order_yw_condition_record yw INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderNo} LEFT JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderNo} LEFT JOIN t_yw_unit yu ON su.unit_id = yu.id ORDER BY yw.create_time DESC </select>
