修改定损回显

README.md

@@ -2,7 +2,8 @@
 
 ###**v1.0.0** 
 ~~~~
-
+api接口文档地址
+http://120.25.146.52:3090/project/297/interface/api/9528
 ~~~~
 
 
@@ -28,3 +29,22 @@
         discount        0没折扣，1有折扣
 6.添加状态 91取消维修备件回收
 ~~~~
+
+###**v1.1.0** 
+~~~~
+详见文档
+1. 新增v8发货管理
+2.新增核账管理
+3.维修管理新增修改定损回显 
+    /service/sale/repairPersonnel/checkRegisterInfo
+4.售后接单新增参数  
+    /service/sale/salePersonnel/orderReceiving
+        annex  附件
+        convert_warranty    保外转保内 0未勾选，1勾选
+5.备件回收新增参数
+    /service/sale/supplyPersonnel/partRecovery
+        remark  备注
+6.确认报价新增参数 
+    /service/sale/salePersonnel/confirmRepair
+        remark 备注
+~~~~

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

@@ -57,6 +57,15 @@ public class RepairPersonnelController extends BaseController{
         repairPersonnelService.checkRegister(param,getUserId());
         return ResultData.ok();
     }
+
+    /**
+     * 修改定损回显
+     */
+    @GetMapping("/checkRegisterInfo")
+    public ResultData checkRegisterInfo(@RequestParam(required = false) String repairId){
+        return ResultData.ok(repairPersonnelService.checkRegisterInfo(repairId));
+    }
+
     /**
      * 维修中添加备件
      */

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

@@ -20,4 +20,5 @@ public interface IRepairFaultService extends IService<RepairFault> {
 
     List<RepairFault> getByFaultId(Integer faultId);
 
+    List<RepairFault> getByRepairId(String repairId);
 }

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

@@ -35,5 +35,10 @@ public class RepairFaultServiceImpl extends ServiceImpl<IRepairFaultMapper, Repa
         return this.list(wrapper);
     }
 
-
+    @Override
+    public List<RepairFault> getByRepairId(String repairId) {
+        LambdaQueryWrapper<RepairFault> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RepairFault::getRepairId,repairId);
+        return this.list(wrapper);
+    }
 }

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

@@ -15,6 +15,7 @@ import com.fdkankan.sale.util.DateUtil;
 import com.fdkankan.sale.util.StatusUtil;
 import com.fdkankan.sale.vo.request.*;
 import com.fdkankan.sale.vo.response.CheckRegisterVo;
+import com.fdkankan.sale.vo.response.RepairRegisterCheckVo;
 import com.fdkankan.sale.vo.response.RepairRegisterPartVo;
 import com.fdkankan.sale.vo.response.RepairerVo;
 import org.apache.commons.lang3.StringUtils;
@@ -58,6 +59,8 @@ public class RepairPersonnelService {
     IPartService partService;
     @Autowired
     IRepairRegisterLogService repairRegisterLogService;
+    @Autowired
+    RepairSupplyService repairSupplyService;
 
 
 
@@ -214,5 +217,18 @@ public class RepairPersonnelService {
     }
 
 
+    public Object checkRegisterInfo(String repairId) {
+        RepairRegister repairRegister = repairRegisterService.getByRepairId(repairId);
+        RepairRegisterCheckVo vo = new RepairRegisterCheckVo();
+        BeanUtils.copyProperties(repairRegister,vo);
+
+        List<RepairFault> repairFaults = repairFaultService.getByRepairId(repairId);
+        List<Integer> collect = repairFaults.stream().map(RepairFault::getFaultId).collect(Collectors.toList());
+        vo.setFaultIds(collect);
 
+        List<RepairRegisterPartVo> partVoList = repairSupplyService.partInfo(repairId, 2);
+        vo.setPartList(partVoList);
+
+        return vo;
+    }
 }

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

@@ -0,0 +1,12 @@
+package com.fdkankan.sale.vo.response;
+
+import com.fdkankan.sale.entity.RepairRegister;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RepairRegisterCheckVo extends RepairRegister {
+    private List<Integer> faultIds;
+    private List<RepairRegisterPartVo> partList;
+}