1

src/main/java/com/fdkankan/sale/common/ResultCode.java

@@ -44,6 +44,7 @@ public enum ResultCode  {
     REPAIR_SN_EXITS(60019, "设备正在维修，请勿重复报修。"),
     MATH_TO_MAX(60020, "请输入正确金额"),
     DEL_USER_REPAIR(60021, "当前用户存在未完结的工单，不可删除"),
+    REPAIR_CHECK_EMPTY(60022, "维修检测记录为空"),
 
 
 

src/main/java/com/fdkankan/sale/controller/RepairRegisterLogController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.sale.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-22
+ */
+@RestController
+@RequestMapping("/sale/repairRegisterLog")
+public class RepairRegisterLogController {
+
+}
+

src/main/java/com/fdkankan/sale/entity/RepairLog.java

@@ -69,7 +69,4 @@ public class RepairLog implements Serializable {
     @TableField("test_id")
     private Integer testId;
 
-    @TableField("register_id")
-    private Integer registerId;
-
 }

src/main/java/com/fdkankan/sale/entity/RepairRegisterLog.java

@@ -0,0 +1,78 @@
+package com.fdkankan.sale.entity;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fdkankan.sale.typehandle.JsonArrayTypeHandler;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-22
+ */
+@Getter
+@Setter
+@TableName("t_repair_register_log")
+public class RepairRegisterLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "register_log_id", type = IdType.AUTO)
+    private Integer registerLogId;
+
+    /**
+     * 报修单id
+     */
+    @TableField("repair_id")
+    private String repairId;
+
+    /**
+     * 检测结果
+     */
+    @TableField("check_result")
+    private String checkResult;
+
+    /**
+     * 相关图片
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray checkImg;
+
+    /**
+     * 0维修登记，1维修中添加备件，2维修完成
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 备注，维修记录
+     */
+    @TableField("remark")
+    private String remark;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("sys_user_id")
+    private Integer sysUserId;
+
+
+}

src/main/java/com/fdkankan/sale/entity/RepairRegisterPart.java

@@ -50,5 +50,6 @@ public class RepairRegisterPart implements Serializable {
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
-
+    @TableField("register_log_id")
+    private Integer registerLogId;
 }

src/main/java/com/fdkankan/sale/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"sale", getTables(new String[]{
-                "sys_user_role"
+                "t_repair_register_log"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/sale/mapper/IRepairRegisterLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.sale.mapper;
+
+import com.fdkankan.sale.entity.RepairRegisterLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-22
+ */
+@Mapper
+public interface IRepairRegisterLogMapper extends BaseMapper<RepairRegisterLog> {
+
+}

src/main/java/com/fdkankan/sale/mapper/IRepairRegisterMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Mapper
 public interface IRepairRegisterMapper extends BaseMapper<RepairRegister> {
 
-    List<RepairRegisterVo> getVoByRepairId(@Param("repairId") String repairId);
+    RepairRegisterVo getVoByRepairId(@Param("repairId") String repairId);
 
-    RepairRegisterVo getVoByRegisterId(@Param("registerId")Integer registerId);
+    List<RepairRegisterVo> getVoListByRepairId(@Param("repairId") String repairId);
 }

src/main/java/com/fdkankan/sale/service/IRepairRegisterLogService.java

@@ -0,0 +1,22 @@
+package com.fdkankan.sale.service;
+
+import com.fdkankan.sale.entity.RepairRegister;
+import com.fdkankan.sale.entity.RepairRegisterLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.sale.vo.response.RepairRegisterVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-22
+ */
+public interface IRepairRegisterLogService extends IService<RepairRegisterLog> {
+
+    RepairRegisterLog saveLog( RepairRegister repairRegister);
+
+}

src/main/java/com/fdkankan/sale/service/IRepairRegisterPartService.java

@@ -15,5 +15,8 @@ import java.util.List;
  */
 public interface IRepairRegisterPartService extends IService<RepairRegisterPart> {
 
+
     List<RepairRegisterPart> getByRegisterId(Integer registerId);
+
+    List<RepairRegisterPart> getByRepairId(Integer registerId);
 }

src/main/java/com/fdkankan/sale/service/IRepairRegisterService.java

@@ -21,9 +21,7 @@ public interface IRepairRegisterService extends IService<RepairRegister> {
 
     RepairRegister getByRepairId(String repairId);
 
-    List<RepairRegisterVo> getVoByRepairId(String repairId);
+   RepairRegisterVo getVoByRepairId(String repairId);
 
-    RepairRegisterVo getVoByRegisterId(Integer registerId);
-
-    void testPassOrFail(String repairId,Integer status);
+    List<RepairRegisterVo> getVoListByRepairId(String repairId);
 }

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -47,6 +47,8 @@ public class RepairInfoService {
     IFaultService faultService;
     @Autowired
     IRepairInvoiceService repairInvoiceService;
+    @Autowired
+    IRepairRegisterLogService repairRegisterLogService;
 
 
     public RepairDetailVo getDetailsByRepairId(String repairId) {
@@ -62,11 +64,13 @@ public class RepairInfoService {
         List<PriceList> priceLists = priceListService.getByRepairId(repairId);
         RepairPay repairPay = repairPayService.getByRepairId(repairId,1);
         OrderReceivingVo receiving = orderReceivingService.getVoByRepairId(repairId);
-        List<RepairRegisterVo> repairRegisterVoList = repairRegisterService.getVoByRepairId(repairId);
         RepairTestVo repairTestVo = repairTestService.getPassVoByRepairId(repairId);
         RepairComment comment = repairCommentService.getByRepairId(repairId);
         List<Fault> faultList = faultService.getByRepairId(repairId);
         String lastRepairId = repairService.getLastRepairId(repair.getCameraSnCode(),repair.getRepairId());
+        RepairRegisterVo repairRegisterVo = repairRegisterService.getVoByRepairId(repairId);
+
+        List<RepairRegisterVo> repairRegisterVoList = repairRegisterService.getVoListByRepairId(repairId);
 
         RepairInvoice repairInvoice = repairInvoiceService.getByRepairId(repairId);
         if(repairInvoice !=null){
@@ -89,7 +93,8 @@ public class RepairInfoService {
         detailVo.setPriceList(priceLists);
         detailVo.setRepairPay(repairPay);
         detailVo.setOrderReceivingVo(receiving);
-        detailVo.setRepairRegisterVo(repairRegisterVoList);
+        detailVo.setRepairRegisterVo(repairRegisterVo);
+        detailVo.setRepairRegisterVoList(repairRegisterVoList);
         detailVo.setRepairTestVo(repairTestVo);
         detailVo.setRepairComment(comment);
         detailVo.setFaultList(faultList);
@@ -118,7 +123,7 @@ public class RepairInfoService {
                     }
                     break;
                 case 20 : //维修检测
-                    RepairRegisterVo repairRegisterVo = repairRegisterService.getVoByRegisterId(repairLogVo.getRegisterId());
+                    RepairRegisterVo repairRegisterVo = repairRegisterService.getVoByRepairId(repairLogVo.getRepairId());
                     repairLogVo.setRepairRegisterVo(repairRegisterVo);
                     if(repairRegisterVo != null){
                         repairLogVo.setImagesInfo(repairRegisterVo.getCheckImg());
@@ -167,17 +172,12 @@ public class RepairInfoService {
         vo.setSaleDate(repairDetailVo.getOrderReceivingVo().getCreateTime());
         vo.setWarrantyExpirationDate(repairDetailVo.getRepairerVo().getWarrantyDate());
 
-        List<RepairRegisterVo> repairRegisterVo = repairDetailVo.getRepairRegisterVo();
-        for (RepairRegisterVo registerVo1 : repairRegisterVo) {
-            if(registerVo1.getStatus() == 2){
-                vo.setExportImg(registerVo1.getCheckImg());
-                vo.setRepairMan(registerVo1.getSysUserName());
-                vo.setRepairOverTime(registerVo1.getOverTime());
-                vo.setRepairRemark(registerVo1.getRemark());
-                vo.setCheckDate(registerVo1.getCreateTime());
-                vo.setCheckResult(registerVo1.getCheckResult());
-            }
-        }
+        vo.setExportImg(repairDetailVo.getRepairRegisterVo().getCheckImg());
+        vo.setRepairMan(repairDetailVo.getRepairRegisterVo().getSysUserName());
+        vo.setRepairOverTime(repairDetailVo.getRepairRegisterVo().getOverTime());
+        vo.setRepairRemark(repairDetailVo.getRepairRegisterVo().getRemark());
+        vo.setCheckDate(repairDetailVo.getRepairRegisterVo().getCreateTime());
+        vo.setCheckResult(repairDetailVo.getRepairRegisterVo().getCheckResult());
 
         vo.setLastRepairId(repairDetailVo.getLastRepairId());
 

src/main/java/com/fdkankan/sale/service/impl/RepairPersonnelService.java

@@ -56,6 +56,8 @@ public class RepairPersonnelService {
     IPriceListService priceListService;
     @Autowired
     IPartService partService;
+    @Autowired
+    IRepairRegisterLogService repairRegisterLogService;
 
 
 
@@ -87,19 +89,19 @@ public class RepairPersonnelService {
         if(!repair.getStatus().equals(RepairStatusEnum.TO_BE_CHECK.status())){ //待检测
             throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
         }
-//        RepairRegister repairRegister  = repairRegisterService.getByRepairId(repair.getRepairId());
-//        if(repairRegister == null){
-//            repairRegister = new RepairRegister();
-//        }
-        RepairRegister repairRegister = new RepairRegister();
+        RepairRegister repairRegister  = repairRegisterService.getByRepairId(repair.getRepairId());
+        if(repairRegister == null){
+            repairRegister = new RepairRegister();
+        }
+        Integer repairRegisterId = repairRegister.getRepairRegisterId();
         BeanUtils.copyProperties(param,repairRegister);
 
         if(repairRegister.getDefineDamage() == 1 && repair.getWarrantyType() == 0){
             repairService.updateWarrantyType(repair.getRepairId(),1);
         }
-
+        repairRegister.setRepairRegisterId(repairRegisterId);
         repairRegister.setSysUserId(userId);
-        repairRegisterService.save(repairRegister);
+        repairRegisterService.saveOrUpdate(repairRegister);
 
 
         Integer repairStatus = RepairStatusEnum.TO_BE_QUOTED.status();
@@ -111,7 +113,11 @@ public class RepairPersonnelService {
             }
         }
         repairLogService.saveBySysUser(userId,repair.getRepairId(),repairStatus,"维修检测");
-        this.addRepairPart(param.getPartList(),repair,repairRegister);
+
+        repairRegister.setStatus(0);
+        RepairRegisterLog repairRegisterLog = repairRegisterLogService.saveLog(repairRegister);
+
+        this.addRepairPart(param.getPartList(),repair,repairRegister,repairRegisterLog.getRegisterLogId());
 
         repairFaultService.delByRepairId(repair.getRepairId());
 
@@ -126,7 +132,7 @@ public class RepairPersonnelService {
 
     }
 
-    private void addRepairPart(List<RepairRegisterPartVo> partVoList,Repair repair,RepairRegister repairRegister) {
+    private void addRepairPart(List<RepairRegisterPartVo> partVoList,Repair repair,RepairRegister repairRegister,Integer registerLogId) {
         for (RepairRegisterPartVo partVo : partVoList) {
             Part part = partService.getById(partVo.getPartId());
             if(part == null){
@@ -137,6 +143,7 @@ public class RepairPersonnelService {
             repairRegisterPart.setRepairRegisterId(repairRegister.getRepairRegisterId());
             repairRegisterPart.setPartId(partVo.getPartId());
             repairRegisterPart.setPartCount(partVo.getPartCount());
+            repairRegisterPart.setRegisterLogId(registerLogId);
             repairRegisterPartService.save(repairRegisterPart);
 
             PriceList priceList = new PriceList();
@@ -162,18 +169,13 @@ public class RepairPersonnelService {
         if(!repair.getStatus().equals(RepairStatusEnum.TO_BE_REPAIRED.status())){ //维修中
             throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
         }
-//        RepairRegister repairRegister  = repairRegisterService.getByRepairId(repair.getRepairId());
-//        if(repairRegister == null){
-//            repairRegister = new RepairRegister();
-//        }
-        RepairRegister repairRegister = new RepairRegister();
-        BeanUtils.copyProperties(param,repairRegister);
-        repairRegister.setSysUserId(userId);
-        repairRegister.setDefineDamage(0);
+        RepairRegister repairRegister  = repairRegisterService.getByRepairId(repair.getRepairId());
+        if(repairRegister == null){
+            throw new BusinessException(ResultCode.REPAIR_CHECK_EMPTY);
+        }
         repairRegister.setStatus(1);
-        repairRegisterService.save(repairRegister);
-
-        this.addRepairPart(param.getPartList(),repair,repairRegister);
+        RepairRegisterLog repairRegisterLog = repairRegisterLogService.saveLog(repairRegister);
+        this.addRepairPart(param.getPartList(),repair,repairRegister,repairRegisterLog.getRegisterLogId());
 
         repairLogService.saveBySysUser(userId,repair.getRepairId(),RepairStatusEnum.TO_BE_QUOTED.status(),"维修中添加备件");
 

src/main/java/com/fdkankan/sale/service/impl/RepairRegisterLogServiceImpl.java

@@ -0,0 +1,36 @@
+package com.fdkankan.sale.service.impl;
+import java.util.Date;
+import java.util.List;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.fdkankan.sale.entity.Part;
+import com.fdkankan.sale.entity.RepairRegister;
+import com.fdkankan.sale.entity.RepairRegisterLog;
+import com.fdkankan.sale.entity.RepairRegisterPart;
+import com.fdkankan.sale.mapper.IRepairRegisterLogMapper;
+import com.fdkankan.sale.service.IRepairRegisterLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.sale.vo.response.RepairRegisterVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-22
+ */
+@Service
+public class RepairRegisterLogServiceImpl extends ServiceImpl<IRepairRegisterLogMapper, RepairRegisterLog> implements IRepairRegisterLogService {
+
+    @Override
+    public RepairRegisterLog saveLog(RepairRegister repairRegister) {
+        RepairRegisterLog repairRegisterLog = new RepairRegisterLog();
+        BeanUtil.copyProperties(repairRegister,repairRegisterLog);
+        this.save(repairRegisterLog);
+        return repairRegisterLog;
+    }
+
+}

src/main/java/com/fdkankan/sale/service/impl/RepairRegisterPartServiceImpl.java

@@ -22,9 +22,15 @@ import java.util.List;
 public class RepairRegisterPartServiceImpl extends ServiceImpl<IRepairRegisterPartMapper, RepairRegisterPart> implements IRepairRegisterPartService {
 
     @Override
-    public List<RepairRegisterPart> getByRegisterId(Integer registerId) {
+    public List<RepairRegisterPart> getByRegisterId(Integer registerLogId) {
         LambdaQueryWrapper<RepairRegisterPart> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(RepairRegisterPart::getRepairRegisterId,registerId);
+        wrapper.eq(RepairRegisterPart::getRegisterLogId,registerLogId);
+        return this.list(wrapper);
+    }
+    @Override
+    public List<RepairRegisterPart> getByRepairId(Integer repairId) {
+        LambdaQueryWrapper<RepairRegisterPart> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RepairRegisterPart::getRepairId,repairId);
         return this.list(wrapper);
     }
 }

src/main/java/com/fdkankan/sale/service/impl/RepairRegisterServiceImpl.java

@@ -41,26 +41,15 @@ public class RepairRegisterServiceImpl extends ServiceImpl<IRepairRegisterMapper
 
     @Override
     public void repairOver(String repairId, String remark,Long userId) {
-        RepairRegister repairRegister = new RepairRegister();
-        repairRegister.setRepairId(repairId);
-        repairRegister.setStatus(2);
-        repairRegister.setRemark(remark);
-        repairRegister.setOverTime(DateUtil.getDate());
-        repairRegister.setSysUserId(userId);
-        this.save(repairRegister);
-
-    }
-
-    @Override
-    public void testPassOrFail(String repairId,Integer status) {
         LambdaUpdateWrapper<RepairRegister> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(RepairRegister::getRepairId,repairId);
-        wrapper.eq(RepairRegister::getStatus,2);
-        wrapper.set(RepairRegister::getStatus,status);
+        wrapper.eq(RepairRegister::getStatus,1);
+        wrapper.set(RepairRegister::getRemark,remark);
         wrapper.set(RepairRegister::getOverTime, DateUtil.getDate());
         this.update(wrapper);
     }
 
+
     @Override
     public RepairRegister getByRepairId(String repairId) {
         LambdaQueryWrapper<RepairRegister> wrapper = new LambdaQueryWrapper<>();
@@ -70,35 +59,12 @@ public class RepairRegisterServiceImpl extends ServiceImpl<IRepairRegisterMapper
 
 
     @Override
-    public  List<RepairRegisterVo> getVoByRepairId(String repairId) {
-        List<RepairRegisterVo> voList = this.getBaseMapper().getVoByRepairId(repairId);
-        for (RepairRegisterVo vo : voList) {
-            List<RepairRegisterPart> partList = repairRegisterPartService.getByRegisterId(vo.getRepairRegisterId());
-            StringBuilder partNamesList = new StringBuilder();
-            for (RepairRegisterPart repairRegisterPart : partList) {
-                Integer partId = repairRegisterPart.getPartId();
-                Part part = partService.getById(partId);
-                if(part == null){
-                    continue;
-                }
-                partNamesList.append(part.getPartName()).append("x").append(repairRegisterPart.getPartCount()).append(",");
-            }
-            if(StringUtils.isNotBlank(partNamesList.toString()) && partNamesList.toString().contains(",")){
-                partNamesList.deleteCharAt(partNamesList.lastIndexOf(","));
-            }
-            vo.setPartNamesStr(partNamesList.toString());
-        }
-
-        return voList;
-    }
-
-    @Override
-    public RepairRegisterVo getVoByRegisterId(Integer registerId) {
-        RepairRegisterVo vo = this.getBaseMapper().getVoByRegisterId(registerId);
+    public  RepairRegisterVo getVoByRepairId(String repairId) {
+        RepairRegisterVo vo = this.getBaseMapper().getVoByRepairId(repairId);
         if(vo == null){
             return null;
         }
-        List<RepairRegisterPart> partList = repairRegisterPartService.getByRegisterId(vo.getRepairRegisterId());
+        List<RepairRegisterPart> partList = repairRegisterPartService.getByRepairId(vo.getRepairRegisterId());
         StringBuilder partNamesList = new StringBuilder();
         for (RepairRegisterPart repairRegisterPart : partList) {
             Integer partId = repairRegisterPart.getPartId();
@@ -112,6 +78,30 @@ public class RepairRegisterServiceImpl extends ServiceImpl<IRepairRegisterMapper
             partNamesList.deleteCharAt(partNamesList.lastIndexOf(","));
         }
         vo.setPartNamesStr(partNamesList.toString());
+
         return vo;
     }
+
+    @Override
+    public List<RepairRegisterVo> getVoListByRepairId(String repairId) {
+        List<RepairRegisterVo> voList = this.getBaseMapper().getVoListByRepairId(repairId);
+        for (RepairRegisterVo vo : voList) {
+            List<RepairRegisterPart> partList = repairRegisterPartService.getByRegisterId(vo.getRegisterLogId());
+            StringBuilder partNamesList = new StringBuilder();
+            for (RepairRegisterPart repairRegisterPart : partList) {
+                Integer partId = repairRegisterPart.getPartId();
+                Part part = partService.getById(partId);
+                if(part == null){
+                    continue;
+                }
+                partNamesList.append(part.getPartName()).append("x").append(repairRegisterPart.getPartCount()).append(",");
+            }
+            if(StringUtils.isNotBlank(partNamesList.toString()) && partNamesList.toString().contains(",")){
+                partNamesList.deleteCharAt(partNamesList.lastIndexOf(","));
+            }
+            vo.setPartNamesStr(partNamesList.toString());
+        }
+
+        return voList;
+    }
 }

src/main/java/com/fdkankan/sale/service/impl/RepairTesterService.java

@@ -76,14 +76,12 @@ public class RepairTesterService {
         if(testParam.getResultStatus() == 0){
             entity.setPassTime(DateUtil.getDate());
             repairTestService.save(entity);
-            repairRegisterService.testPassOrFail(repair.getRepairId(),3);
             if(repair.getWarrantyType() == 0 ){
                 repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_RECOVERED.status(),"测试通过",entity.getTestId());
             }else {
                 repairLogService.saveBySysUser(userId,testParam.getRepairId(), RepairStatusEnum.TO_BE_PAID.status(),"测试通过",entity.getTestId());
             }
         }else {
-            repairRegisterService.testPassOrFail(repair.getRepairId(),4);
             repairTestService.save(entity);
             repairLogService.saveBySysUser(userId,testParam.getRepairId(),RepairStatusEnum.TO_BE_REPAIRED.status(),"测试不通过",entity.getTestId());
         }

src/main/java/com/fdkankan/sale/vo/response/RepairDetailVo.java

@@ -23,7 +23,7 @@ public class RepairDetailVo {
 
     private OrderReceivingVo orderReceivingVo;      //产品及故障信息
 
-    private List<RepairRegisterVo> repairRegisterVo;
+    private RepairRegisterVo repairRegisterVo;
 
     private RepairTestVo repairTestVo;
 
@@ -40,4 +40,6 @@ public class RepairDetailVo {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal payAmount;
 
+    private List<RepairRegisterVo> repairRegisterVoList;
+
 }

src/main/java/com/fdkankan/sale/vo/response/RepairRegisterVo.java

@@ -7,4 +7,5 @@ import lombok.Data;
 public class RepairRegisterVo extends RepairRegister {
     private String sysUserName;
     private String partNamesStr;
+    private Integer registerLogId;
 }

src/main/resources/mapper/sale/RepairRegisterLogMapper.xml

@@ -0,0 +1,5 @@
+<?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.fdkankan.sale.mapper.IRepairRegisterLogMapper">
+
+</mapper>

src/main/resources/mapper/sale/RepairRegisterMapper.xml

@@ -6,8 +6,8 @@
         select  rp.*,u.nick_name as sysUserName from t_repair_register rp left join sys_user u on rp.sys_user_id = u.id
         where rp.rec_status = 'A' and rp.repair_id =#{repairId}
     </select>
-    <select id="getVoByRegisterId" resultType="com.fdkankan.sale.vo.response.RepairRegisterVo">
-        select  rp.*,u.nick_name as sysUserName from t_repair_register rp left join sys_user u on rp.sys_user_id = u.id
-        where rp.rec_status = 'A' and rp.repair_register_id =#{registerId}
+    <select id="getVoListByRepairId" resultType="com.fdkankan.sale.vo.response.RepairRegisterVo">
+        select  rp.*,u.nick_name as sysUserName from t_repair_register_log rp left join sys_user u on rp.sys_user_id = u.id
+        where rp.rec_status = 'A' and rp.repair_id =#{repairId}
     </select>
 </mapper>