1550076451 лет назад: 2
Родитель
Сommit
99ff82137d

+ 1 - 1
zxkf-api/src/main/java/api/controller/system/WorkroderTypeController.java

@@ -70,7 +70,7 @@ public class WorkroderTypeController extends BaseController {
70 70
     @PostMapping
71 71
     public AjaxResult add(@RequestBody WorkroderType input) {
72 72
         Date currentDate = new Date(System.currentTimeMillis());
73
-        if (input.getParentId()>0)
73
+        if (input.getParentId()!=null&&input.getParentId()>0)
74 74
         {
75 75
             var model=workrodertypeService.getEntity(input.getParentId());
76 76
             if (model!=null)

+ 4 - 0
zxkf-entity/src/main/java/api/entity/database/call/CallLog.java

@@ -1,6 +1,7 @@
1 1
 package api.entity.database.call;
2 2
 
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableField;
4 5
 import com.baomidou.mybatisplus.annotation.TableId;
5 6
 import com.baomidou.mybatisplus.annotation.TableName;
6 7
 import io.swagger.annotations.ApiModel;
@@ -83,4 +84,7 @@ public class CallLog {
83 84
     /** 工单号 */
84 85
     @ApiModelProperty("工单号")
85 86
     private String workordercode;
87
+
88
+    @TableField(exist = false)
89
+    private Long longTime;
86 90
 }

+ 7 - 0
zxkf-entity/src/main/java/api/entity/database/call/Record.java

@@ -1,12 +1,17 @@
1 1
 package api.entity.database.call;
2 2
 
3
+import api.entity.database.system.Dept;
3 4
 import com.baomidou.mybatisplus.annotation.IdType;
5
+import com.baomidou.mybatisplus.annotation.TableField;
4 6
 import com.baomidou.mybatisplus.annotation.TableId;
5 7
 import com.baomidou.mybatisplus.annotation.TableName;
6 8
 import io.swagger.annotations.ApiModel;
7 9
 import io.swagger.annotations.ApiModelProperty;
8 10
 import lombok.Data;
11
+
12
+import java.util.ArrayList;
9 13
 import java.util.Date;
14
+import java.util.List;
10 15
 
11 16
 /** 通话记录表 */
12 17
 @ApiModel(value = "Record", description = "通话记录表实体")
@@ -116,4 +121,6 @@ public class Record {
116 121
     /** 工单号 */
117 122
     @ApiModelProperty("工单号")
118 123
     private String workorderId;
124
+
125
+
119 126
 }