diff --git a/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml b/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml index 11b4ffd0..6cffa5c4 100644 --- a/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml +++ b/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml @@ -85,12 +85,10 @@ SELECT , bcb.brand_name AS brandStr, - bcb.logo_img AS logoImg, - bcm.model_name AS modelStr + bcb.logo_img AS logoImg FROM `base_car_main` tbcm LEFT JOIN base_car_brand bcb ON bcb.deleted = 0 AND tbcm.car_brand = bcb.id - LEFT JOIN base_car_model bcm ON bcm.deleted = 0 AND tbcm.car_model = bcm.id WHERE tbcm.deleted = 0 AND diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java index db3ad74a..fde8d479 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java @@ -26,8 +26,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static cn.iocoder.yudao.common.BaseConstants.REPAIR_RECORD_TYPE_RECORD; - /** * 维修记录 Service 实现类 * @@ -106,10 +104,8 @@ public class RepairRecordsServiceImpl extends ServiceImpl itemList = itemService.getByMainId(REPAIR_RECORD_TYPE_RECORD, item.getId(), pageReqVO.getIsOpen()); - item.setItemList(itemList); //相对路径按照“，”分隔 - item.setImages(itemList.stream().map(RepairRecordsItem::getImage).collect(Collectors.joining(","))); + item.setImages(item.getItemList().stream().map(RepairRecordsItem::getImage).collect(Collectors.joining(","))); }); return list; } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java index eadcf5ef..09957768 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java @@ -163,7 +163,7 @@ public class DlRepairTitemController { @GetMapping("/getProjList") @Operation(summary = "查某工单维修项目进度") public CommonResult getProjList(@RequestParam("ticketId") String ticketId){ - return success(dlRepairTitemService.getProjList(ticketId)); + return success(dlRepairTitemService.getProjList(ticketId,null)); } } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/app/ApiRepairTitemController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/app/ApiRepairTitemController.java index 7452f3bd..1798a6db 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/app/ApiRepairTitemController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/app/ApiRepairTitemController.java @@ -37,7 +37,7 @@ public class ApiRepairTitemController { @Operation(summary = "查某工单维修项目进度") @TenantIgnore public CommonResult getProjList(@RequestParam("ticketId") String ticketId){ - return success(dlRepairTitemService.getProjList(ticketId)); + return success(dlRepairTitemService.getProjList(ticketId,"1")); } } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java index a17f4976..c3ac254b 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 针对表【dl_repair_titem(维修工单子表)】的数据库操作Mapper * @@ -31,6 +33,15 @@ public interface DlRepairTitemMapper extends BaseMapper { * @param dlRepairTitem */ void updateRepairAndSale(DlRepairTitem dlRepairTitem); + + /** + * 查某工单维修项目进度 + * @author vinjor-M + * @date 15:33 2024/11/12 + * @param ticketId 工单id + * @return java.util.List + **/ + List selectProjList(@Param("ticketId")String ticketId,@Param("isOpen")String isOpen); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java index a0c126b3..9c2d3977 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java @@ -82,5 +82,5 @@ public interface DlRepairTitemService extends IService { * @param ticketId 工单ID * @return java.util.List **/ - List getProjList(String ticketId); + List getProjList(String ticketId,String isOpen); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java index 1d78bf57..7761d84a 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java @@ -342,7 +342,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl itemList = titemService.list(new LambdaQueryWrapper().eq(DlRepairTitem::getTicketId, id)); diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java index 14e735d6..a15315ac 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -31,6 +32,8 @@ public class DlRepairTitemServiceImpl extends ServiceImpl getProjList(String ticketId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(DlRepairTitem::getTicketId,ticketId) - .eq(DlRepairTitem::getItemType,"01") - .orderByDesc(DlRepairTitem::getItemStatus); - return this.list(queryWrapper); + public List getProjList(String ticketId,String isOpen) { + return dlRepairTitemMapper.selectProjList(ticketId,isOpen); } } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTitemRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTitemRespVO.java index 4788e3d4..e79b78f1 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTitemRespVO.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTitemRespVO.java @@ -1,9 +1,11 @@ package cn.iocoder.yudao.module.tickets.vo; +import cn.iocoder.yudao.module.base.entity.RepairRecordsItem; import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem; import lombok.Data; import java.util.Date; +import java.util.List; /** * 维修工单子表 响应VO @@ -24,4 +26,9 @@ public class DlRepairTitemRespVO extends DlRepairTitem { private String corpId; private String ticketNo; + + /** + * 维修项目的维修过程图片 + **/ + private List recordsItemList; } diff --git a/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml b/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml index 83ecb10f..6b9f4cee 100644 --- a/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml @@ -8,14 +8,43 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - SELECT main.*, - drt.item_name AS projectName + drt.item_name AS projectName, + drri.id AS item_id, + drri.record_id AS item_record_id, + drri.ticket_id AS item_ticket_id, + drri.repair_item_id AS item_repair_item_id, + drri.remark AS item_remark, + drri.image AS item_image, + drri.is_open AS item_is_open, + drri.create_time AS item_create_time FROM dl_repair_records main LEFT JOIN dl_repair_titem drt ON main.repair_item_id = drt.id AND drt.deleted = 0 + LEFT JOIN dl_repair_records_item drri ON main.id = drri.record_id - main.deleted = '0' + main.deleted = '0' AND drri.deleted = '0' AND main.ticket_id = #{entity.ticketId} @@ -28,8 +57,11 @@ AND main.type = #{entity.type} + + AND drri.is_open = #{entity.type} + - order by main.create_time desc + order by main.create_time desc,drri.create_time +