1

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

@@ -5,6 +5,8 @@ import java.util.List;
 
 import com.alibaba.fastjson.JSONArray;
 import com.fdkankan.sale.entity.PriceList;
+import com.fdkankan.sale.entity.RepairLog;
+import com.fdkankan.sale.service.IRepairLogService;
 import com.fdkankan.sale.util.StatusUtil;
 import com.fdkankan.sale.vo.response.PriceListExcelVo;
 import com.google.common.collect.Lists;
@@ -32,6 +34,8 @@ public class RepairInfoController extends BaseController{
     RepairInfoService repairInfoService;
     @Autowired
     MyExcelUtil excelUtil;
+    @Autowired
+    IRepairLogService repairLogService;
 
     @GetMapping("/details")
     public ResultData details(@RequestParam(required = false) String repairId){
@@ -69,22 +73,32 @@ public class RepairInfoController extends BaseController{
         vo.setCustomerName(repairDetailVo.getCustomer().getCustomerName());
         vo.setCustomerPhone(repairDetailVo.getCustomer().getPhone());
         vo.setCustomerAddress(repairDetailVo.getCustomerAddress().getGetAddress());
+
+        vo.setRepairId(repairDetailVo.getRepairerVo().getRepairId());
         vo.setCameraName(StatusUtil.getCameraName(repairDetailVo.getRepairerVo().getCameraType()));
         vo.setCameraSnCode(repairDetailVo.getRepairerVo().getCameraSnCode());
         vo.setSendDate(repairDetailVo.getRepairerVo().getCreateTime());
-        vo.setWarrantyType(StatusUtil.getWarrantyType(repairDetailVo.getOrderReceivingVo().getWarrantyType()));
         vo.setFaultMsg(repairDetailVo.getRepairerVo().getFaultMsg());
-        vo.setCheckDate(repairDetailVo.getRepairRegisterVo().getCreateTime());
-        vo.setOrderFaultMsg(repairDetailVo.getOrderReceivingVo().getOrderFaultMsg());
-        vo.setCheckResult(repairDetailVo.getRepairRegisterVo().getCheckResult());
-        vo.setCheckImg(JSONArray.toJSONString(repairDetailVo.getRepairRegisterVo().getCheckImg()));
 
+        vo.setWarrantyType(StatusUtil.getWarrantyType(repairDetailVo.getOrderReceivingVo().getWarrantyType()));
+        vo.setOrderFaultMsg(repairDetailVo.getOrderReceivingVo().getOrderFaultMsg());
         vo.setSaleName(repairDetailVo.getOrderReceivingVo().getSysUserName());
         vo.setSaleDate(repairDetailVo.getOrderReceivingVo().getCreateTime());
+        vo.setWarrantyExpirationDate(repairDetailVo.getOrderReceivingVo().getWarrantyExpirationDate());
+
+        vo.setCheckImg(JSONArray.toJSONString(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());
+
+
         List<PriceList> priceList = repairDetailVo.getPriceList();
         BigDecimal totalAmount = BigDecimal.ZERO;
+        String priceData = "";
         List<PriceListExcelVo> excelVos = new ArrayList<>();
         for (PriceList list : priceList) {
             PriceListExcelVo excelVo = new PriceListExcelVo();
@@ -92,8 +106,21 @@ public class RepairInfoController extends BaseController{
             excelVo.setAmount(list.getPrice().multiply(new BigDecimal(list.getCount())));
             excelVos.add(excelVo);
             totalAmount = totalAmount.add(excelVo.getAmount());
+            priceData = list.getCreateTime();
         }
         vo.setTotalCount(totalAmount);
-        excelUtil.listFill(response,"四维时代服务清单",vo,excelVos,type);
+        vo.setPriceListDate(priceData);
+        String priceData2 = "";
+        List<RepairLog> repairLogList = repairLogService.getByRepairIdAndStatus(repairId, 5);
+        for (RepairLog repairLog : repairLogList) {
+            priceData2 = repairLog.getCreateTime();
+        }
+        vo.setConfirmPriceListDate(priceData2);
+        if(type == 0){
+            excelUtil.listFill(response,"四维时代服务清单",vo,excelVos,type);
+        }
+        if(type == 1){
+            excelUtil.listFill(response,"维修服务工作单",vo,excelVos,type);
+        }
     }
 }

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

@@ -9,6 +9,8 @@ import java.util.List;
 @Data
 public class OrderListVo {
 
+    private String repairId;                        //维修单号
+    private String lastRepairId;                        //上次维修单号
     private String companyName;                     //客户名称
     private String customerName;                    //联系人
     private String customerPhone;                   //联系方式
@@ -18,12 +20,16 @@ public class OrderListVo {
     private String sendDate;                        //送检日期
 
     private String warrantyType;                    // 保修期确认类型
+    private String warrantyExpirationDate;          // 保修界面日期
     private String faultMsg;                        // 用户反应事项
     private String checkDate;                       // 检测日期
     private String orderFaultMsg;                   // 机器外观
     private String checkResult;                     // 故障确认结果
+    private String repairRemark;                     // 维修记录
     private String checkImg;                        // 故障现象图片
     private BigDecimal totalCount;                  //总金额
+    private String priceListDate;                  //报价日期
+    private String confirmPriceListDate;                  //报价日期
     private String saleName;                    //售后人员
     private String saleDate;                    //接单日期
     private String repairMan;                    //维修人员

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

@@ -8,6 +8,7 @@ import java.util.List;
 
 @Data
 public class PriceListExcelVo {
+    private Integer priceListId;
     private String name;
     private BigDecimal price;
     private Integer count;