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

+ 13 - 6
zxkf-api/src/main/java/api/controller/system/UserExtensionController.java

@@ -1,23 +1,30 @@
1 1
 package api.controller.system;
2 2
 
3
+import api.entity.database.system.UserExtension;
4
+import api.service.system.IUserExtensionService;
5
+
6
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
7
+
8
+import com.baomidou.mybatisplus.core.metadata.IPage;
9
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 10
 import api.controller.BaseController;
11
+
4 12
 import api.entity.database.system.User;
5
-import api.entity.database.system.UserExtension;
6 13
 import api.entity.input.PageInput;
7 14
 import api.model.AjaxResult;
8
-import api.service.system.IUserExtensionService;
15
+
9 16
 import api.service.system.IUserService;
10 17
 import api.util.annotation.Log;
11 18
 import api.util.enums.BusinessType;
12
-import api.util.helper.StringHelper;
13
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
14
-import com.baomidou.mybatisplus.core.metadata.IPage;
15
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
19
+import api.util.helper.*;
16 20
 import io.swagger.annotations.Api;
17 21
 import io.swagger.annotations.ApiOperation;
18 22
 import org.springframework.beans.factory.annotation.Autowired;
23
+
19 24
 import org.springframework.web.bind.annotation.*;
20 25
 
26
+
27
+
21 28
 import java.util.Arrays;
22 29
 
23 30
 @Api(value = "分机管理表",tags = "分机管理表")

+ 5 - 4
zxkf-entity/src/main/java/api/entity/database/system/UserExtension.java

@@ -1,7 +1,8 @@
1 1
 package api.entity.database.system;
2 2
 
3
-import com.baomidou.mybatisplus.annotation.IdType;
4
-import com.baomidou.mybatisplus.annotation.TableId;
3
+
4
+import com.baomidou.mybatisplus.annotation.TableField;
5
+
5 6
 import com.baomidou.mybatisplus.annotation.TableName;
6 7
 import io.swagger.annotations.ApiModel;
7 8
 import io.swagger.annotations.ApiModelProperty;
@@ -13,10 +14,10 @@ import lombok.Data;
13 14
 public class UserExtension {
14 15
     /** usercode */
15 16
     @ApiModelProperty("usercode")
16
-    @TableId(type = IdType.AUTO)
17
+    @TableField("usercode")
17 18
     private String usercode;
18 19
     /** extension */
19 20
     @ApiModelProperty("extension")
20
-    @TableId(type = IdType.AUTO)
21
+    @TableField("extension")
21 22
     private String extension;
22 23
 }

+ 1 - 1
zxkf-service/src/main/java/api/service/system/IUserExtensionService.java

@@ -1,6 +1,6 @@
1 1
 package api.service.system;
2 2
 
3
-import api.entity.database.system.User;
3
+
4 4
 import api.entity.database.system.UserExtension;
5 5
 import api.service.IBaseService;
6 6
 

+ 4 - 2
zxkf-service/src/main/java/api/service/system/impl/UserExtensionServiceImpl.java

@@ -1,15 +1,17 @@
1 1
 package api.service.system.impl;
2 2
 
3
-import api.entity.database.system.User;
3
+
4
+
4 5
 import api.entity.database.system.UserExtension;
5 6
 import api.mapper.system.UserExtensionMapper;
6 7
 import api.service.BaseServiceImpl;
7 8
 import api.service.system.IUserExtensionService;
8 9
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
10
+
9 11
 import org.springframework.stereotype.Service;
10 12
 import org.springframework.transaction.annotation.Transactional;
11 13
 
12
-import java.util.regex.Pattern;
14
+
13 15
 
14 16
 @Transactional
15 17
 @Service

+ 1 - 0
zxkf-service/src/main/java/api/service/system/impl/WorkroderTypeServiceImpl.java

@@ -7,6 +7,7 @@ import api.entity.view.system.WorkroderTypeView;
7 7
 import api.mapper.system.WorkroderTypeMapper;
8 8
 import api.service.BaseServiceImpl;
9 9
 import api.service.system.IWorkroderTypeService;
10
+
10 11
 import org.springframework.beans.factory.annotation.Autowired;
11 12
 import org.springframework.stereotype.Service;
12 13
 import org.springframework.transaction.annotation.Transactional;