xiangpei
2024-03-06 9911179b723c99db6580007ae4b3a1596c58baa9
工单完善
6个文件已修改
16个文件已添加
818 ■■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderYwConditionRecord.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderCheckResultForm.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWResultForm.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderAuditingRecordQuery.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderYwConditionRecordQuery.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderAuditingRecordVO.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderAuditingRecordMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderAuditingRecordService.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderYwConditionRecordService.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderAuditingRecordServiceImpl.java 110 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java 73 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderYwConditionRecordServiceImpl.java 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
@@ -29,6 +29,14 @@
    @TableField("work_order_no")
    private String workOrderNo;
    /** 故障类型 */
    @TableField("error_type")
    private String errorType;
    @ApiModelProperty("工单来源")
    @TableField("source")
    private String source;
    @ApiModelProperty("运维单位")
    @TableField("unit_id")
    private Integer unitId;
@@ -37,6 +45,10 @@
    @TableField("yw_people_id")
    private Integer ywPeopleId;
    @ApiModelProperty("状态")
    @TableField("status")
    private String status;
    @ApiModelProperty("运维处理时间")
    @TableField("yw_handle_time")
    private LocalDateTime ywHandleTime;
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java
New file
@@ -0,0 +1,42 @@
package com.ycl.platform.domain.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
 * 工单审核记录
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
@TableName("t_work_order_auditing_record")
@ApiModel(value = "WorkOrderAuditingRecord对象", description = "工单审核记录")
public class WorkOrderAuditingRecord extends AbsEntity {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("工单ID")
    @TableField("work_order_id")
    private Integer workOrderId;
    @ApiModelProperty("审核人")
    @TableField("auditing_user")
    private Integer auditingUser;
    @ApiModelProperty("审核结果")
    @TableField("result")
    private String result;
    @ApiModelProperty("审核备注")
    @TableField("remark")
    private String remark;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderYwConditionRecord.java
New file
@@ -0,0 +1,38 @@
package com.ycl.platform.domain.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
 * 工单运维情况记录
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
@TableName("t_work_order_yw_condition_record")
@ApiModel(value = "WorkOrderYwConditionRecord对象", description = "工单运维情况记录")
public class WorkOrderYwConditionRecord extends AbsEntity {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("工单ID")
    @TableField("work_order_id")
    private Integer workOrderId;
    @ApiModelProperty("提交人")
    @TableField("commit_user")
    private Integer commitUser;
    @ApiModelProperty("运维情况")
    @TableField("yw_condition")
    private String ywCondition;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java
New file
@@ -0,0 +1,27 @@
package com.ycl.platform.domain.form;
import com.ycl.platform.base.AbsForm;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
/**
 * 工单审核表单
 *
 * @author:xp
 * @date:2024/3/6 8:59
 */
@Data
public class WorkOrderAuditingForm extends AbsForm {
    /**
     * 审核结果
     */
    @NotBlank(message = "审核结果不能为空")
    private String auditingResult;
    /**
     * 审核说明
     */
    private String auditingRemark;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderCheckResultForm.java
New file
@@ -0,0 +1,25 @@
package com.ycl.platform.domain.form;
import lombok.Data;
/**
 * 检测结果表单
 *
 * @author:xp
 * @date:2024/3/6 8:59
 */
@Data
public class WorkOrderCheckResultForm {
    /**
     * 工单ID
     */
    private Integer id;
    /**
     * 检测结果
     */
    private String ywCheckResult;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java
New file
@@ -0,0 +1,25 @@
package com.ycl.platform.domain.form;
import lombok.Data;
/**
 * 运维情况表单
 *
 * @author:xp
 * @date:2024/3/6 8:59
 */
@Data
public class WorkOrderYWConditionForm {
    /**
     * 工单ID
     */
    private Integer id;
    /**
     * 运维情况
     */
    private String ywCondition;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWResultForm.java
New file
@@ -0,0 +1,25 @@
package com.ycl.platform.domain.form;
import lombok.Data;
/**
 * 运维结果表单
 *
 * @author:xp
 * @date:2024/3/6 8:59
 */
@Data
public class WorkOrderYWResultForm {
    /**
     * 工单ID
     */
    private Integer id;
    /**
     * 运维结果
     */
    private String ywResult;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderAuditingRecordQuery.java
New file
@@ -0,0 +1,23 @@
package com.ycl.platform.domain.query;
import com.ycl.platform.base.AbsQuery;
import java.util.List;
import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
 * 工单审核记录查询
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "WorkOrderAuditingRecord查询", description = "工单审核记录查询")
public class WorkOrderAuditingRecordQuery extends AbsQuery {
}
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -1,8 +1,10 @@
package com.ycl.platform.domain.query;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
@@ -30,12 +32,14 @@
    /**
     * 运维处理时间
     */
    private LocalDateTime start;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date start;
    /**
     * 运维处理时间
     */
    private LocalDateTime end;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date end;
}
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderYwConditionRecordQuery.java
New file
@@ -0,0 +1,23 @@
package com.ycl.platform.domain.query;
import com.ycl.platform.base.AbsQuery;
import java.util.List;
import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
 * 工单运维情况记录查询
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
@ApiModel(value = "WorkOrderYwConditionRecord查询", description = "工单运维情况记录查询")
public class WorkOrderYwConditionRecordQuery extends AbsQuery {
}
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderAuditingRecordVO.java
New file
@@ -0,0 +1,44 @@
package com.ycl.platform.domain.vo;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
 * 工单审核记录展示
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
public class WorkOrderAuditingRecordVO extends AbsVo {
    /** 工单ID */
    private Integer workOrderId;
    /** 审核人 */
    private Integer auditingUser;
    /** 审核结果 */
    private String result;
    /** 审核备注 */
    private String remark;
    public static WorkOrderAuditingRecordVO getVoByEntity(@NonNull WorkOrderAuditingRecord entity, WorkOrderAuditingRecordVO vo) {
        if(vo == null) {
            vo = new WorkOrderAuditingRecordVO();
        }
        BeanUtils.copyProperties(entity, vo);
        return vo;
    }
}
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -30,6 +30,12 @@
    private Integer unitId;
    private String unitName;
    /** 工单来源 */
    private String source;
    /** 故障类型 */
    private String errorType;
    /** 运维人员 */
    private Integer ywPeopleId;
    private String ywPeopleName;
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
New file
@@ -0,0 +1,41 @@
package com.ycl.platform.domain.vo;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.WorkOrderYwConditionRecord;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
 * 工单运维情况记录展示
 *
 * @author xp
 * @since 2024-03-06
 */
@Data
@Accessors(chain = true)
public class WorkOrderYwConditionRecordVO extends AbsVo {
    /** 工单ID */
    private Integer workOrderId;
    /** 提交人 */
    private Integer commitUser;
    /** 运维情况 */
    private String ywCondition;
    public static WorkOrderYwConditionRecordVO getVoByEntity(@NonNull WorkOrderYwConditionRecord entity, WorkOrderYwConditionRecordVO vo) {
        if(vo == null) {
            vo = new WorkOrderYwConditionRecordVO();
        }
        BeanUtils.copyProperties(entity, vo);
        return vo;
    }
}
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -1,5 +1,6 @@
package com.ycl.platform.controller;
import com.ycl.platform.domain.form.*;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import org.springframework.validation.annotation.Validated;
@@ -11,7 +12,6 @@
import io.swagger.annotations.ApiOperation;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.WorkOrderForm;
import com.ycl.platform.domain.query.WorkOrderQuery;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +43,30 @@
        return workOrderService.update(form);
    }
    @PutMapping("/auditing")
    @ApiOperation(value = "审核", notes = "工单审核")
    public Result auditing(@RequestBody @Validated(Update.class) WorkOrderAuditingForm form) {
        return workOrderService.auditing(form);
    }
    @PutMapping("/yw-condition")
    @ApiOperation(value = "运维情况", notes = "运维情况")
    public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWConditionForm form) {
        return workOrderService.ywCondition(form);
    }
    @PutMapping("/yw-result")
    @ApiOperation(value = "运维结果", notes = "运维结果")
    public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWResultForm form) {
        return workOrderService.ywResult(form);
    }
    @PutMapping("/check-result")
    @ApiOperation(value = "检测结果", notes = "检测结果")
    public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderCheckResultForm form) {
        return workOrderService.checkResult(form);
    }
    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    public Result removeById(@PathVariable("id") String id) {
@@ -57,7 +81,7 @@
    @PostMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(WorkOrderQuery query) {
    public Result page(@RequestBody WorkOrderQuery query) {
        return workOrderService.page(query);
    }
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderAuditingRecordMapper.java
New file
@@ -0,0 +1,16 @@
package com.ycl.platform.mapper;
import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
 * 工单审核记录 Mapper 接口
 *
 * @author xp
 * @since 2024-03-06
 */
@Mapper
public interface WorkOrderAuditingRecordMapper extends BaseMapper<WorkOrderAuditingRecord> {
}
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java
New file
@@ -0,0 +1,16 @@
package com.ycl.platform.mapper;
import com.ycl.platform.domain.entity.WorkOrderYwConditionRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
 * 工单运维情况记录 Mapper 接口
 *
 * @author xp
 * @since 2024-03-06
 */
@Mapper
public interface WorkOrderYwConditionRecordMapper extends BaseMapper<WorkOrderYwConditionRecord> {
}
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderAuditingRecordService.java
New file
@@ -0,0 +1,51 @@
package com.ycl.platform.service;
import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.system.Result;
import com.ycl.platform.domain.query.WorkOrderAuditingRecordQuery;
import java.util.List;
/**
 * 工单审核记录 服务类
 *
 * @author xp
 * @since 2024-03-06
 */
public interface WorkOrderAuditingRecordService extends IService<WorkOrderAuditingRecord> {
    /**
     * 批量删除
     * @param ids
     * @return
     */
    Result remove(List<String> ids);
    /**
     * id删除
     * @param id
     * @return
     */
    Result removeById(String id);
    /**
     * 分页查询
     * @param query
     * @return
     */
    Result page(WorkOrderAuditingRecordQuery query);
    /**
     * 根据id查找
     * @param id
     * @return
     */
    Result detail(String id);
    /**
     * 列表
     * @return
     */
    Result all();
}
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -2,8 +2,8 @@
import com.ycl.platform.domain.entity.WorkOrder;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.form.*;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.WorkOrderForm;
import com.ycl.platform.domain.query.WorkOrderQuery;
import java.util.List;
@@ -62,4 +62,32 @@
     * @return
     */
    Result all();
    /**
     * 工单审核
     * @param form
     * @return
     */
    Result auditing(WorkOrderAuditingForm form);
    /**
     * 运维情况
     * @param form
     * @return
     */
    Result ywCondition(WorkOrderYWConditionForm form);
    /**
     * 运维结果
     * @param form
     * @return
     */
    Result ywResult(WorkOrderYWResultForm form);
    /**
     * 检测结果
     * @param form
     * @return
     */
    Result checkResult(WorkOrderCheckResultForm form);
}
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderYwConditionRecordService.java
New file
@@ -0,0 +1,50 @@
package com.ycl.platform.service;
import com.ycl.platform.domain.entity.WorkOrderYwConditionRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.system.Result;
import com.ycl.platform.domain.query.WorkOrderYwConditionRecordQuery;
import java.util.List;
/**
 * 工单运维情况记录 服务类
 *
 * @author xp
 * @since 2024-03-06
 */
public interface WorkOrderYwConditionRecordService extends IService<WorkOrderYwConditionRecord> {
    /**
     * 批量删除
     * @param ids
     * @return
     */
    Result remove(List<String> ids);
    /**
     * id删除
     * @param id
     * @return
     */
    Result removeById(String id);
    /**
     * 分页查询
     * @param query
     * @return
     */
    Result page(WorkOrderYwConditionRecordQuery query);
    /**
     * 根据id查找
     * @param id
     * @return
     */
    Result detail(String id);
    /**
     * 列表
     * @return
     */
    Result all();
}
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderAuditingRecordServiceImpl.java
New file
@@ -0,0 +1,110 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
import com.ycl.platform.mapper.WorkOrderAuditingRecordMapper;
import com.ycl.platform.service.WorkOrderAuditingRecordService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.vo.WorkOrderAuditingRecordVO;
import com.ycl.platform.domain.query.WorkOrderAuditingRecordQuery;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import java.util.ArrayList;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
/**
 * 工单审核记录 服务实现类
 *
 * @author xp
 * @since 2024-03-06
 */
@Service
@RequiredArgsConstructor
public class WorkOrderAuditingRecordServiceImpl extends ServiceImpl<WorkOrderAuditingRecordMapper, WorkOrderAuditingRecord> implements WorkOrderAuditingRecordService {
    private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;
    /**
     * 批量删除
     * @param ids
     * @return
     */
    @Override
    public Result remove(List<String> ids) {
        if(baseMapper.deleteBatchIds(ids) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }
    /**
     * id删除
     * @param id
     * @return
     */
    @Override
    public Result removeById(String id) {
        if(baseMapper.deleteById(id) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }
    /**
     * 分页查询
     * @param query
     * @return
     */
    @Override
    public Result page(WorkOrderAuditingRecordQuery query) {
        IPage<WorkOrderAuditingRecord> page = new LambdaQueryChainWrapper<>(baseMapper)
                .orderByDesc(WorkOrderAuditingRecord::getCreateTime)
                .page(PageUtil.getPage(query, WorkOrderAuditingRecord.class));
        List<WorkOrderAuditingRecordVO> vos = page.getRecords().stream()
                .map(
                        entity -> WorkOrderAuditingRecordVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos).total(page.getTotal());
    }
    /**
     * 根据id查找
     * @param id
     * @return
     */
    @Override
    public Result detail(String id) {
        WorkOrderAuditingRecord entity = baseMapper.selectById(id);
        Assert.notNull(entity, "记录不存在");
        WorkOrderAuditingRecordVO vo = WorkOrderAuditingRecordVO.getVoByEntity(entity, null);
        return Result.ok().data(vo);
    }
    /**
     * 列表
     * @return
     */
    @Override
    public Result all() {
        List<WorkOrderAuditingRecord> entities = baseMapper.selectList(null);
        List<WorkOrderAuditingRecordVO> vos = entities.stream()
                .map(
                        entity -> WorkOrderAuditingRecordVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }
}
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -1,21 +1,19 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.WorkOrder;
import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.WorkOrderMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.mapper.*;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.form.WorkOrderForm;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.query.WorkOrderQuery;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
@@ -42,6 +40,8 @@
    private final WorkOrderMapper workOrderMapper;
    private final YwUnitMapper ywUnitMapper;
    private final YwPeopleMapper ywPeopleMapper;
    private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;
    private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
    /**
@@ -77,6 +77,59 @@
        return Result.error("修改失败");
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result auditing(WorkOrderAuditingForm form) {
        WorkOrder workOrder = baseMapper.selectById(form.getId());
        if (Objects.isNull(workOrder)) {
            throw new ServiceException("工单不存在");
        }
        // 工单状态
        if ("pass".equals(form.getAuditingResult())) {
            workOrder.setStatus("finish");
        } else {
            workOrder.setStatus("auditing");
        }
        baseMapper.updateById(workOrder);
        // 添加一条审核记录
        WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
        workOrderAuditingRecord.setWorkOrderId(workOrder.getId());
        workOrderAuditingRecord.setAuditingUser(1);
        workOrderAuditingRecord.setResult(form.getAuditingResult());
        workOrderAuditingRecord.setRemark(form.getAuditingRemark());
        workOrderAuditingRecordMapper.insert(workOrderAuditingRecord);
        return Result.ok("操作成功");
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result ywCondition(WorkOrderYWConditionForm form) {
        WorkOrder workOrder = baseMapper.selectById(form.getId());
        if (Objects.isNull(workOrder)) {
            throw new ServiceException("工单不存在");
        }
        // 工单状态
        workOrder.setStatus("commit-condition");
        baseMapper.updateById(workOrder);
        // 添加一条运维情况记录
        WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();
        workOrderYwConditionRecord.setWorkOrderId(workOrder.getId());
        workOrderYwConditionRecord.setCommitUser(1);
        workOrderYwConditionRecord.setYwCondition(form.getYwCondition());
        workOrderYwConditionRecordMapper.insert(workOrderYwConditionRecord);
        return Result.ok("操作成功");
    }
    @Override
    public Result ywResult(WorkOrderYWResultForm form) {
        return null;
    }
    @Override
    public Result checkResult(WorkOrderCheckResultForm form) {
        return null;
    }
    /**
     * 批量删除
     * @param ids
@@ -110,10 +163,12 @@
     */
    @Override
    public Result page(WorkOrderQuery query) {
        IPage<WorkOrder> page = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(StringUtils.hasText(query.getWorkOrderNo()), WorkOrder::getWorkOrderNo, query.getWorkOrderNo())
                .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),WorkOrder::getYwHandleTime, query.getStart(), query.getEnd())
                .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
                        WorkOrder::getYwHandleTime,
                        DateUtils.getDayStart(query.getStart()),
                        DateUtils.getDayEnd(query.getEnd()))
                .orderByDesc(WorkOrder::getCreateTime)
                .page(PageUtil.getPage(query, WorkOrder.class));
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderYwConditionRecordServiceImpl.java
New file
@@ -0,0 +1,105 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.WorkOrderYwConditionRecord;
import com.ycl.platform.mapper.WorkOrderYwConditionRecordMapper;
import com.ycl.platform.service.WorkOrderYwConditionRecordService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.domain.query.WorkOrderYwConditionRecordQuery;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
/**
 * 工单运维情况记录 服务实现类
 *
 * @author xp
 * @since 2024-03-06
 */
@Service
@RequiredArgsConstructor
public class WorkOrderYwConditionRecordServiceImpl extends ServiceImpl<WorkOrderYwConditionRecordMapper, WorkOrderYwConditionRecord> implements WorkOrderYwConditionRecordService {
    private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
    /**
     * 批量删除
     * @param ids
     * @return
     */
    @Override
    public Result remove(List<String> ids) {
        if(baseMapper.deleteBatchIds(ids) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }
    /**
     * id删除
     * @param id
     * @return
     */
    @Override
    public Result removeById(String id) {
        if(baseMapper.deleteById(id) > 0) {
            return Result.ok("删除成功");
        }
        return Result.error("删除失败");
    }
    /**
     * 分页查询
     * @param query
     * @return
     */
    @Override
    public Result page(WorkOrderYwConditionRecordQuery query) {
        IPage<WorkOrderYwConditionRecord> page = new LambdaQueryChainWrapper<>(baseMapper)
                .orderByDesc(WorkOrderYwConditionRecord::getCreateTime)
                .page(PageUtil.getPage(query, WorkOrderYwConditionRecord.class));
        List<WorkOrderYwConditionRecordVO> vos = page.getRecords().stream()
                .map(
                        entity -> WorkOrderYwConditionRecordVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos).total(page.getTotal());
    }
    /**
     * 根据id查找
     * @param id
     * @return
     */
    @Override
    public Result detail(String id) {
        WorkOrderYwConditionRecord entity = baseMapper.selectById(id);
        Assert.notNull(entity, "记录不存在");
        WorkOrderYwConditionRecordVO vo = WorkOrderYwConditionRecordVO.getVoByEntity(entity, null);
        return Result.ok().data(vo);
    }
    /**
     * 列表
     * @return
     */
    @Override
    public Result all() {
        List<WorkOrderYwConditionRecord> entities = baseMapper.selectList(null);
        List<WorkOrderYwConditionRecordVO> vos = entities.stream()
                .map(
                        entity -> WorkOrderYwConditionRecordVO.getVoByEntity(entity, null)
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }
}