dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairRecordsController.java

@@ -1,72 +0,0 @@
-package cn.iocoder.yudao.module.base.controller.admin;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.base.service.RepairRecordsService;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsPageReqVO;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsRespVO;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsSaveReqVO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-/**
- * 维修记录 管理 API
- * @author lzt
- */
-@Tag(name = "管理后台 - 维修记录")
-@RestController
-@RequestMapping("/dl/repair-records")
-@Validated
-public class RepairRecordsController {
-
-    @Resource
-    private RepairRecordsService repairRecordsService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建维修记录")
-    public CommonResult<String> createRepairRecords(@Valid @RequestBody RepairRecordsSaveReqVO createReqVO) {
-        return success(repairRecordsService.createRepairRecords(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新维修记录")
-    public CommonResult<Boolean> updateRepairRecords(@Valid @RequestBody RepairRecordsSaveReqVO updateReqVO) {
-        repairRecordsService.updateRepairRecords(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除维修记录")
-    @Parameter(name = "id", description = "编号", required = true)
-    public CommonResult<Boolean> deleteRepairRecords(@RequestParam("id") String id) {
-        repairRecordsService.deleteRepairRecords(id);
-        return success(true);
-    }
-
-//    @GetMapping("/get")
-//    @Operation(summary = "获得维修记录")
-//    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-//    public CommonResult<RepairRecordsRespVO> getRecords(@RequestParam("id") String id) {
-//        RepairRecords records = repairRecordsService.getRepairRecords(id);
-//        return success(BeanUtils.toBean(records, RepairRecordsRespVO.class));
-//    }
-
-    /**
-     * 维修工查询维修记录
-     * @param pageReqVO 维修工分页查询条件
-     *
-     */
-    @GetMapping("/page")
-    @Operation(summary = "获得维修记录分页")
-    public List<RepairRecordsRespVO> queryAllRepairRecords(@RequestBody RepairRecordsPageReqVO pageReqVO) {
-        return repairRecordsService.queryAllRepairRecords(pageReqVO);
-    }
-}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/entity/RepairRecords.java

@@ -1,57 +0,0 @@
-package cn.iocoder.yudao.module.base.entity;
-
-import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-/**
- * 维修记录 DO
- *
- * @author lzt
- */
-@TableName("dl_repair_records")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class RepairRecords extends TenantBaseDO {
-
-    /**
-     * 主键标识
-     */
-    @TableId(type = IdType.INPUT)
-    private String id;
-    /**
-     * 工单id
-     */
-    private String ticketId;
-    /**
-     * 工单子表id
-     */
-    private String repairTitemId;
-    /**
-     * 记录类型（repair_records_type）
-     */
-    private String type;
-    /**
-     * 记录描述
-     */
-    private String remark;
-    /**
-     * 过程记录中的图片（多个，拼接）
-     */
-    private String image;
-    /**
-     * 处理人
-     */
-    private String dealUserName;
-    /**
-     * 处理人员工表id
-     */
-    private String dealUserId;
-
-}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairRecordsMapper.java

@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.base.mapper;
-
-import cn.iocoder.yudao.module.base.entity.RepairRecords;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsPageReqVO;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsRespVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 维修记录 Mapper
- *
- * @author lzt
- */
-@Mapper
-public interface RepairRecordsMapper extends BaseMapper<RepairRecords> {
-
-
-    /**
-     * 查询维修记录
-     * @author lzt
-     * @param entity 查询条件
-     * @return List<RepairRecordsRespVO>
-     * @date 2024年10月9日
-     */
-    List<RepairRecordsRespVO> queryAllRepairRecords(@Param("entity") RepairRecordsPageReqVO entity);
-
-}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairRecordsService.java

@@ -1,60 +0,0 @@
-package cn.iocoder.yudao.module.base.service;
-
-import cn.iocoder.yudao.module.base.entity.RepairRecords;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsPageReqVO;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsRespVO;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsSaveReqVO;
-import cn.iocoder.yudao.module.base.vo.RepairWorkerPageReqVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 维修记录 Service 接口
- *
- * @author lzt
- */
-public interface RepairRecordsService extends IService<RepairRecords> {
-
-    /**
-     * 创建维修记录
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    String createRepairRecords(@Valid RepairRecordsSaveReqVO createReqVO);
-
-    /**
-     * 更新维修记录
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateRepairRecords(@Valid RepairRecordsSaveReqVO updateReqVO);
-
-    /**
-     * 删除维修记录
-     *
-     * @param id 编号
-     */
-    void deleteRepairRecords(String id);
-
-//    /**
-//     * 获得维修记录
-//     *
-//     * @param id 编号
-//     * @return 维修记录
-//     */
-//    RepairRecords getRepairRecords(String id);
-
-    /**
-     * 获得维修记录
-     *
-     * @param pageReqVO 查询条件
-     * @return queryAllRepairRecords 所有维修记录
-     */
-    List<RepairRecordsRespVO> queryAllRepairRecords(RepairRecordsPageReqVO pageReqVO);
-
-}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairWorkerService.java

@@ -1,9 +1,12 @@
 package cn.iocoder.yudao.module.base.service;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.base.entity.RepairWorker;
 import cn.iocoder.yudao.module.base.vo.RepairWorkerPageReqVO;
 import cn.iocoder.yudao.module.base.vo.RepairWorkerRespVO;
 import cn.iocoder.yudao.module.base.vo.RepairWorkerSaveReqVO;
+import cn.iocoder.yudao.module.project.vo.RepairProjectPageReqVO;
+import cn.iocoder.yudao.module.project.vo.RepairProjectRespVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -57,4 +60,4 @@ public interface RepairWorkerService extends IService<RepairWorker> {
      **/
     IPage<RepairWorkerRespVO> queryListPage(RepairWorkerPageReqVO pageReqVO, Page<RepairWorkerRespVO> page);
 
-}
+}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java

@@ -1,73 +0,0 @@
-package cn.iocoder.yudao.module.base.service.impl;
-
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.base.entity.RepairRecords;
-import cn.iocoder.yudao.module.base.mapper.RepairRecordsMapper;
-import cn.iocoder.yudao.module.base.service.RepairRecordsService;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsPageReqVO;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsRespVO;
-import cn.iocoder.yudao.module.base.vo.RepairRecordsSaveReqVO;
-import cn.iocoder.yudao.module.base.vo.RepairWorkerPageReqVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 维修记录 Service 实现类
- *
- * @author lzt
- */
-@Service
-@Validated
-public class RepairRecordsServiceImpl extends ServiceImpl<RepairRecordsMapper, RepairRecords> implements RepairRecordsService {
-
-    @Resource
-    private RepairRecordsMapper repairRecordsMapper;
-
-    @Override
-    public String createRepairRecords(RepairRecordsSaveReqVO createReqVO) {
-        // 插入
-        RepairRecords records = BeanUtils.toBean(createReqVO, RepairRecords.class);
-        repairRecordsMapper.insert(records);
-        // 返回
-        return records.getId();
-    }
-
-    @Override
-    public void updateRepairRecords(RepairRecordsSaveReqVO updateReqVO) {
-        // 更新
-        RepairRecords updateObj = BeanUtils.toBean(updateReqVO, RepairRecords.class);
-        repairRecordsMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteRepairRecords(String id) {
-        // 删除
-        repairRecordsMapper.deleteById(id);
-    }
-
-//    @Override
-//    public RepairRecords getRepairRecords(String id) {
-//        return repairRecordsMapper.selectById(id);
-//    }
-
-
-    /**
-     * 查询维修记录
-     * @apiNote lzt
-     * @param pageReqVO 查询条件
-     * @return queryAllRepairRecords 所有维修记录
-     * @date
-     */
-    @Override
-    public List<RepairRecordsRespVO> queryAllRepairRecords(RepairRecordsPageReqVO pageReqVO) {
-        return repairRecordsMapper.queryAllRepairRecords(pageReqVO);
-    }
-
-
-}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairRecordsPageReqVO.java

@@ -1,15 +0,0 @@
-package cn.iocoder.yudao.module.base.vo;
-
-import cn.iocoder.yudao.module.base.entity.RepairRecords;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "接受维修记录的分页查询参数")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class RepairRecordsPageReqVO extends RepairRecords {
-
-}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairRecordsRespVO.java

@@ -1,13 +0,0 @@
-package cn.iocoder.yudao.module.base.vo;
-
-import cn.iocoder.yudao.module.base.entity.RepairRecords;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - 维修记录 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class RepairRecordsRespVO extends RepairRecords {
-
-}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairRecordsSaveReqVO.java

@@ -1,12 +0,0 @@
-package cn.iocoder.yudao.module.base.vo;
-
-import cn.iocoder.yudao.module.base.entity.RepairRecords;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - 维修记录新增/修改 Request VO")
-@Data
-public class RepairRecordsSaveReqVO extends RepairRecords {
-
-
-}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerPageReqVO.java

@@ -6,11 +6,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-@Schema(description = "接受页数查询参数")
+@Schema(description = "接受分页查询参数")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class RepairWorkerPageReqVO extends RepairWorker {
 
 
-}
+}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerRespVO.java

@@ -1,9 +1,10 @@
 package cn.iocoder.yudao.module.base.vo;
 
 import cn.iocoder.yudao.module.base.entity.RepairWorker;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
+import lombok.*;
+import java.util.*;
+import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 维修工人 Response VO")
 @Data
@@ -12,4 +13,4 @@ public class RepairWorkerRespVO extends RepairWorker {
 
 
 
-}
+}

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerSaveReqVO.java

@@ -2,7 +2,9 @@ package cn.iocoder.yudao.module.base.vo;
 
 import cn.iocoder.yudao.module.base.entity.RepairWorker;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 维修工人新增/修改 Request VO")
 @Data
@@ -10,4 +12,4 @@ public class RepairWorkerSaveReqVO extends RepairWorker {
 
 
 
-}
+}

dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml

@@ -1,23 +0,0 @@
-<?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="cn.iocoder.yudao.module.base.mapper.RepairRecordsMapper">
-
-    <!--
-        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
-
-    <select id="queryAllRepairRecords" resultType="cn.iocoder.yudao.module.base.vo.RepairRecordsRespVO">
-        SELECT *
-        FROM dl_repair_records
-        <where>
-            <if test="entity.someField != null">
-                AND some_column = #{entity.someField}
-            </if>
-        </where>
-    </select>
-
-
-</mapper>