ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -1,9 +1,11 @@ package com.ycl.platform.controller; import com.ycl.platform.domain.entity.WorkOrderAuditingRecord; import com.ycl.platform.domain.form.*; import com.ycl.platform.domain.query.DistributeWorkOrderQuery; import com.ycl.platform.domain.query.WorkOrderQuery; import com.ycl.platform.domain.vo.DistributeWorkOrderVO; import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO; import com.ycl.platform.service.WorkOrderService; import com.ycl.system.Result; import com.ycl.system.domain.group.Add; @@ -152,4 +154,18 @@ public Result detailByNo(@PathVariable("workOrderNo") String workOrderNo) { return workOrderService.detailByNo(workOrderNo); } @GetMapping("/yw-condition-list/{workOrderNo}") @ApiOperation(value = "运维情况记录列表", notes = "运维情况记录列表") public Result ywCondition(@PathVariable String workOrderNo) { List<WorkOrderYwConditionRecordVO> data = workOrderService.selectYwConditionByYwId(workOrderNo); return Result.ok().data(data); } @GetMapping("/yw-auditing-list/{workOrderNo}") @ApiOperation(value = "运维审核记录", notes = "运维审核记录") public Result ywAuditingByYwId(@PathVariable String workOrderNo) { List<WorkOrderAuditingRecord> data = workOrderService.selectYwAuditingListByYwId(workOrderNo); return Result.ok().data(data); } } ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderErrorTypeMapper.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.platform.domain.entity.WorkOrderErrorType; import com.ycl.system.entity.SysDictData; import org.apache.ibatis.annotations.Param; import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Repository; @@ -87,4 +88,11 @@ */ int addMany(@Param("errorTypeList") List<WorkOrderErrorType> errorTypeList); /** * 获取故障类型,连表字典 * * @param workOrderNo * @return */ List<SysDictData> getErrorList(@Param("workOrderNo") String workOrderNo); } ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -26,6 +26,7 @@ import com.ycl.platform.wvp.WVPResult; import com.ycl.system.Result; import com.ycl.system.domain.SysConfig; import com.ycl.system.entity.SysDictData; import com.ycl.system.mapper.SysConfigMapper; import com.ycl.system.mapper.SysDictDataMapper; import com.ycl.system.model.LoginUser; @@ -55,11 +56,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import javax.imageio.ImageIO; import javax.swing.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; @@ -791,6 +787,10 @@ .eq(Report::getSerialNumber, workOrder.getSerialNumber()) .exists(); workOrder.setHasReport(hasReport); // 故障类型 List<SysDictData> errorList = workOrderErrorTypeService.getBaseMapper().getErrorList(workOrder.getWorkOrderNo()); List<String> errList = errorList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()); workOrder.setErrorTypeList(errList); return Result.ok().data(workOrder); } } ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml
@@ -97,4 +97,8 @@ </foreach> </insert> <select id="getErrorList" resultType="com.ycl.system.entity.SysDictData"> SELECT da.dict_value, da.dict_label FROM t_work_order_error_type oer INNER JOIN sys_dict_data da ON oer.error_name = da.dict_value WHERE oer.work_order_no = #{workOrderNo} </select> </mapper> ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -68,9 +68,6 @@ <if test="query.status != null and query.status != ''"> AND wo.status = #{query.status} </if> <if test="query.status == null or query.status == ''"> AND wo.status = 'DISTRIBUTED' </if> <if test="query.start != null"> AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end} </if>