1

doc/update.1.7.0.sql

@@ -71,4 +71,8 @@ ALTER TABLE `4dkankan_v4_sale`.`t_repair`
     ADD COLUMN `repair_item` varchar(255) NULL AFTER `repair_type`;
 
 ALTER TABLE `4dkankan_v4_sale`.`t_repair_register`
-    ADD COLUMN `fault_type` varchar(255) NULL AFTER `define_damage`;
+    ADD COLUMN `fault_type` varchar(255) NULL AFTER `define_damage`;
+
+
+ALTER TABLE `4dkankan_v4_sale`.`t_repair`
+    ADD COLUMN `fault_version` varchar(255) NULL DEFAULT 'V1' AFTER `repair_item`;

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

@@ -21,9 +21,9 @@ public class FaultController {
         return ResultData.ok(faultService.list());
     }
 
-    @GetMapping("/tree")
-    public ResultData getTreeByKey(){
+    @GetMapping("/tree/{version}")
+    public ResultData getTreeByKey(@PathVariable String version){
 
-        return ResultData.ok(faultService.getTree());
+        return ResultData.ok(faultService.getTree(version));
     }
 }

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

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

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

@@ -17,5 +17,5 @@ public interface IFaultService extends IService<Fault> {
 
     List<Fault> getByRepairId(String repairId);
 
-    Object getTree();
+    Object getTree(String version);
 }

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

@@ -28,9 +28,10 @@ public class FaultServiceImpl extends ServiceImpl<IFaultMapper, Fault> implement
     }
 
     @Override
-    public Object getTree() {
-        //LambdaQueryWrapper<Fault> wrapper = new LambdaQueryWrapper<>();
-        List<Fault> list = this.list();
+    public Object getTree(String version) {
+        LambdaQueryWrapper<Fault> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Fault::getVersion,version);
+        List<Fault> list = this.list(wrapper);
         if(list.isEmpty()){
             return list;
         }

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

@@ -148,6 +148,7 @@ public class RepairSaleService {
         repair.setSysUserId(userId);
         repair.setWarrantyDate(date1);
         repair.setWarrantyType(2);
+        repair.setFaultVersion("V2");
         if(DateUtil.getDateByStr(date1).getTime() >= new Date().getTime()){
             repair.setWarrantyType(0);
         }