1

README.md

@@ -79,7 +79,7 @@ http://120.25.146.52:3090/project/297/interface/api/9528
 
 2.录单添加字段
     repairType      维修类型
-    repairItem      维修物品 子集 - 隔开
+    repairItem      维修物品 
 
 3.添加修改维修完成备注接口
      /service/sale/repairPersonnel/repairOverRemark

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

@@ -130,7 +130,6 @@ public class Repair implements Serializable {
     @TableField("fault_version")
     private String faultVersion;
 
-
     @TableField(exist = false)
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal payAmount;

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[]{
-                "t_dict",
+                "t_repair_goods",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

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

@@ -112,46 +112,42 @@ public class RepairSaleService {
     }
 
     public void recording(RecordingParam param, Long userId,Integer receiverType) {
-        if(StringUtils.isBlank(param.getCameraSnCode())){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-        }
-        Camera camera = cameraService.getBySnCode(param.getCameraSnCode());
-        if(camera == null){
-            throw new BusinessException(ResultCode.CAMERA_SN_NOT_EXITS);
-        }
-//        List<Repair> repairList  = repairService.getBySnCode(camera.getSnCode());
-//        if(repairList.size() >0){
-//            for (Repair repair : repairList) {
-//                if(!StatusUtil.overStatusList.contains(repair.getStatus())){
-//                    throw new BusinessException(ResultCode.REPAIR_SN_EXITS);
-//                }
-//            }
-//        }
-        CameraDetail cameraDetail = cameraService.getCameraTypeByCameraId(camera.getId());
-        Integer cameraType = null;
-        switch (cameraDetail.getType()){
-            case 9: cameraType = 1;break;
-            case 10: cameraType = 2;break;
-            case 11: cameraType = 3;break;
-            default: cameraType = 0; break;
-        }
-        Date outTime = cameraDetail.getBuyDate() == null ? cameraDetail.getCreateTime() : DateUtil.getDateByStr2(cameraDetail.getBuyDate());
-        Date date = DateUtil.dateAddOneYear(outTime, 1);
-        date = DateUtil.dateAddOne(date, 7);
-        String date1 = DateUtil.getDate(DateUtil.dayFmt, date) +" 23:59:59";
+
 
         Repair repair = new Repair();
         BeanUtils.copyProperties(param,repair);
+
+        if(StringUtils.isNotBlank(param.getCameraSnCode())){
+            Camera camera = cameraService.getBySnCode(param.getCameraSnCode());
+            if(camera == null){
+                throw new BusinessException(ResultCode.CAMERA_SN_NOT_EXITS);
+            }
+            CameraDetail cameraDetail = cameraService.getCameraTypeByCameraId(camera.getId());
+            Integer cameraType = null;
+            switch (cameraDetail.getType()){
+                case 9: cameraType = 1;break;
+                case 10: cameraType = 2;break;
+                case 11: cameraType = 3;break;
+                default: cameraType = 0; break;
+            }
+            Date outTime = cameraDetail.getBuyDate() == null ? cameraDetail.getCreateTime() : DateUtil.getDateByStr2(cameraDetail.getBuyDate());
+            Date date = DateUtil.dateAddOneYear(outTime, 1);
+            date = DateUtil.dateAddOne(date, 7);
+            String date1 = DateUtil.getDate(DateUtil.dayFmt, date) +" 23:59:59";
+
+
+            repair.setCameraType(cameraType);
+            repair.setWarrantyDate(date1);
+            if(DateUtil.getDateByStr(date1).getTime() >= new Date().getTime()){
+                repair.setWarrantyType(0);
+            }
+        }
+
         repair.setRepairId(DateUtil.getDate(DateUtil.repairIdFmt));
         repair.setReceiverType(receiverType);
-        repair.setCameraType(cameraType);
         repair.setSysUserId(userId);
-        repair.setWarrantyDate(date1);
         repair.setWarrantyType(2);
         repair.setFaultVersion("V2");
-        if(DateUtil.getDateByStr(date1).getTime() >= new Date().getTime()){
-            repair.setWarrantyType(0);
-        }
 
         Customer customer = new Customer();
         BeanUtils.copyProperties(param,customer);