上次维修单号

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

@@ -62,7 +62,7 @@ public class RepairInfoController extends BaseController{
      */
     @GetMapping("/exportExcel")
     public void exportExcel(@RequestParam(required = false) String repairId,
-                            @RequestParam(required = false) Integer type){
+                            @RequestParam(required = false,defaultValue = "0") Integer type){
         RepairDetailVo repairDetailVo = repairInfoService.getDetailsByRepairId(repairId);
         OrderListVo vo = new OrderListVo();
         vo.setCompanyName(repairDetailVo.getCustomer().getCompanyName());

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

@@ -42,4 +42,6 @@ public interface IRepairService extends IService<Repair> {
     Page<RepairerVo> pageInfoList(RepairInfoListParam param);
 
     List<Repair> getBySnCode(String snCode);
+
+    String getLastRepairId(String cameraSnCode, String repairId);
 }

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

@@ -58,6 +58,9 @@ public class RepairInfoService {
         RepairTestVo repairTestVo = repairTestService.getPassVoByRepairId(repairId);
         RepairComment comment = repairCommentService.getByRepairId(repairId);
         List<Fault> faultList = faultService.getByRepairId(repairId);
+        List<Repair> repairList = repairService.getBySnCode(repair.getCameraSnCode());
+        String lastRepairId = repairService.getLastRepairId(repair.getCameraSnCode(),repair.getRepairId());
+
 
         detailVo.setCustomer(customer);
         detailVo.setCustomerAddress(customerAddress);
@@ -69,6 +72,7 @@ public class RepairInfoService {
         detailVo.setRepairTestVo(repairTestVo);
         detailVo.setRepairComment(comment);
         detailVo.setFaultList(faultList);
+        detailVo.setLastRepairId(lastRepairId);
 
         return detailVo;
     }

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

@@ -149,6 +149,21 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
     public List<Repair> getBySnCode(String snCode) {
         LambdaQueryWrapper<Repair> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Repair::getCameraSnCode,snCode);
+        wrapper.orderByDesc(Repair::getCreateTime);
         return this.list(wrapper);
     }
+
+    @Override
+    public String getLastRepairId(String cameraSnCode, String repairId) {
+
+        LambdaQueryWrapper<Repair> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Repair::getCameraSnCode,cameraSnCode);
+        wrapper.notIn(Repair::getRepairId,Arrays.asList(repairId));
+        wrapper.orderByDesc(Repair::getCreateTime);
+        List<Repair> list  =  this.list(wrapper);
+        if(list.isEmpty()){
+            return null;
+        }
+        return list.get(0).getRepairId();
+    }
 }

src/main/java/com/fdkankan/sale/util/MyExcelUtil.java

@@ -68,12 +68,12 @@ public class MyExcelUtil {
         FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
         if(excelWriter != null && obj != null){
             excelWriter.fill(obj, fillConfig, writeSheet);
-            excelWriter.finish();
         }
         if(excelWriter != null &&obj2 != null){
             excelWriter.fill(obj2, fillConfig, writeSheet);
-            excelWriter.finish();
         }
+        assert excelWriter != null;
+        excelWriter.finish();
     }
 
 

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

@@ -29,5 +29,6 @@ public class RepairDetailVo {
 
     private  List<Fault> faultList;
 
+    private String lastRepairId;
 
 }