工单处理记录接口重构

xiangpei

2024-07-19 34ef93d02c402663740ecfeccf772fba7cd53c3f

工单处理记录接口重构

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java

@@ -26,10 +26,14 @@

    /** 提交人 */
    private Integer commitUser;
    private String commitUserName;

    /** 运维情况 */
    private String ywCondition;

    /** 佐证材料 */
    private String ywProofMaterials;

    public static WorkOrderYwConditionRecordVO getVoByEntity(@NonNull WorkOrderYwConditionRecord entity, WorkOrderYwConditionRecordVO vo) {
        if(vo == null) {
            vo = new WorkOrderYwConditionRecordVO();

 ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java

@@ -71,14 +71,8 @@

    @GetMapping("/yw-condition/{id}")
    @ApiOperation(value = "运维情况", notes = "运维情况")
    public Result ywCondition(@PathVariable @Validated(Update.class) String id) {
    public Result ywCondition(@PathVariable Integer id) {
        return workOrderService.selectYwConditionByYwId(id);
    }

    @GetMapping("/yw-condition-list/{id}")
    @ApiOperation(value = "运维情况记录", notes = "运维情况记录")
    public Result ywConditionList(@PathVariable @Validated(Update.class) String id) {
        return workOrderService.selectYwConditionListByYwId(id);
    }

    @GetMapping("/yw-auditing-list/{id}")

 ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java

@@ -8,6 +8,8 @@
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.form.WorkOrderForm;
import java.util.List;

import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;


 ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java

@@ -2,7 +2,11 @@

import com.ycl.platform.domain.entity.WorkOrderYwConditionRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 工单运维情况记录 Mapper 接口
@@ -13,4 +17,12 @@
@Mapper
public interface WorkOrderYwConditionRecordMapper extends BaseMapper<WorkOrderYwConditionRecord> {

    /**
     * 根据工单ID查询运维记录
     *
     * @param workOrderId
     * @return
     */
    List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(@Param("workOrderId") Integer workOrderId);

}

 ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java

@@ -119,14 +119,7 @@
     * @param id 工单id
     * @return 工单运维情况
     */
    Result selectYwConditionByYwId(String id);

    /**
     * 获取工单运维情况记录
     * @param id 工单id
     * @return 工单运维情况记录
     */
    Result selectYwConditionListByYwId(String id);
    Result selectYwConditionByYwId(Integer id);

    /**
     * 获取工单运维审核记录

 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java

@@ -12,6 +12,7 @@
import com.ycl.platform.domain.query.WorkOrderQuery;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.mapper.*;
import com.ycl.platform.service.NotifyService;
import com.ycl.platform.service.WorkOrderAuditingRecordService;
@@ -191,21 +192,9 @@
    }

    @Override
    public Result selectYwConditionByYwId(String id) {
        return Result.ok().data(
                new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
                        .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
                        .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
                        .list());
    }

    @Override
    public Result selectYwConditionListByYwId(String id) {
        return Result.ok().data(
                new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
                        .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
                        .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
                        .list());
    public Result selectYwConditionByYwId(Integer id) {
        List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(id);
        return Result.ok().data(ywConditionList);
    }

    @Override

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml

New file
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.WorkOrderYwConditionRecordMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO">
        <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="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, 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
        ORDER BY yw.create_time DESC
    </select>

</mapper>