lyhzzz 1 周之前
父節點
當前提交
19d4c2348d

+ 3 - 0
src/main/java/com/fdkankan/sale/entity/Repair.java

@@ -60,6 +60,9 @@ public class Repair implements Serializable {
     @TableField(typeHandler= JsonArrayTypeHandler.class)
     private JSONArray faultImg;
 
+    @TableField(typeHandler= JsonArrayTypeHandler.class)
+    private JSONArray dictIds;
+
     /**
      * 状态0待接单,1待检测,2待报价,3待确认,4已取消,5待备料,6待回收,7维修中,8待测试,9已完成,10待收货,11已发货,12已评价
      */

+ 12 - 1
src/main/java/com/fdkankan/sale/service/impl/RepairSaleService.java

@@ -2,6 +2,7 @@ package com.fdkankan.sale.service.impl;
 import java.math.BigDecimal;
 import java.util.*;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -115,8 +116,18 @@ public class RepairSaleService {
 
         Repair repair = new Repair();
         BeanUtils.copyProperties(param,repair);
+
+        Boolean flag = false;
+        List<List<Integer>> faultIds = param.getFaultIds();
+        for (List<Integer> list : faultIds) {
+            if(list.contains(6)){
+                flag = true;
+            }
+        }
+        repair.setDictIds(JSONArray.parseArray(JSONObject.toJSONString(faultIds)));
+
         repair.setCameraType(4);
-        if(StringUtils.isNotBlank(param.getCameraSnCode())){
+        if(flag && StringUtils.isNotBlank(param.getCameraSnCode())){
             Camera camera = cameraService.getBySnCode(param.getCameraSnCode());
             if(camera == null){
                 throw new BusinessException(ResultCode.CAMERA_SN_NOT_EXITS);

+ 5 - 0
src/main/java/com/fdkankan/sale/vo/request/RecordingParam.java

@@ -1,11 +1,14 @@
 package com.fdkankan.sale.vo.request;
 
+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.fdkankan.sale.entity.Repair;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class RecordingParam extends Repair {
 
@@ -66,4 +69,6 @@ public class RecordingParam extends Repair {
     private Integer getType;
 
     private Integer sendType;
+
+    private List<List<Integer>> faultIds;
 }