张延森 2 vuotta sitten
vanhempi
commit
9cfa25621c

+ 18
- 12
src/main/java/com/njyunzhi/invoice/controller/TaInvoicePersonController.java Näytä tiedosto

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.njyunzhi.invoice.common.BaseController;
7 7
 import com.njyunzhi.invoice.common.ResponseBean;
8
+import com.njyunzhi.invoice.service.ITaInvoiceOrgService;
8 9
 import io.swagger.annotations.Api;
9 10
 import io.swagger.annotations.ApiOperation;
10 11
 import io.swagger.annotations.ApiParam;
@@ -39,6 +40,9 @@ public class TaInvoicePersonController extends BaseController {
39 40
     @Autowired
40 41
     public ITaInvoicePersonService iTaInvoicePersonService;
41 42
 
43
+    @Autowired
44
+    public ITaInvoiceOrgService iTaInvoiceOrgService;
45
+
42 46
 
43 47
     /**
44 48
      * 分页查询列表
@@ -46,17 +50,17 @@ public class TaInvoicePersonController extends BaseController {
46 50
      * @param pageSize
47 51
      * @return
48 52
      */
49
-    @RequestMapping(value="/admin/taInvoicePerson",method= RequestMethod.GET)
53
+    @RequestMapping(value="/admin/invoice/person",method= RequestMethod.GET)
50 54
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
51 55
     public ResponseBean taInvoicePersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
52 56
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
53 57
 
54
-		    IPage<TaInvoicePerson> pg = new Page<>(pageNum, pageSize);
55
-            QueryWrapper<TaInvoicePerson> queryWrapper = new QueryWrapper<>();
56
-            queryWrapper.orderByDesc("create_date");
58
+        IPage<TaInvoicePerson> pg = new Page<>(pageNum, pageSize);
59
+        QueryWrapper<TaInvoicePerson> queryWrapper = new QueryWrapper<>();
60
+        queryWrapper.orderByDesc("create_date");
57 61
 
58
-            IPage<TaInvoicePerson> result = iTaInvoicePersonService.page(pg, queryWrapper);
59
-            return ResponseBean.success(result);
62
+        IPage<TaInvoicePerson> result = iTaInvoicePersonService.page(pg, queryWrapper);
63
+        return ResponseBean.success(result);
60 64
     }
61 65
 
62 66
     /**
@@ -64,13 +68,15 @@ public class TaInvoicePersonController extends BaseController {
64 68
      * @param taInvoicePerson 实体对象
65 69
      * @return
66 70
      */
67
-    @RequestMapping(value="/admin/taInvoicePerson",method= RequestMethod.POST)
71
+    @RequestMapping(value="/admin/invoice/person",method= RequestMethod.POST)
68 72
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
69
-    public ResponseBean taInvoicePersonAdd(@ApiParam("保存内容") @RequestBody TaInvoicePerson taInvoicePerson) throws Exception{
73
+    public ResponseBean taInvoicePersonAdd(@ApiParam("保存内容") @RequestBody TaInvoicePerson taInvoicePerson) throws Exception {
74
+
75
+        iTaInvoiceOrgService.getExistBy("", taInvoicePerson.getName())
70 76
 
71 77
         if (iTaInvoicePersonService.save(taInvoicePerson)){
72 78
             return ResponseBean.success(taInvoicePerson);
73
-        }else {
79
+        } else {
74 80
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
75 81
         }
76 82
     }
@@ -79,7 +85,7 @@ public class TaInvoicePersonController extends BaseController {
79 85
      * 根据id删除对象
80 86
      * @param id  实体ID
81 87
      */
82
-    @RequestMapping(value="/admin/taInvoicePerson/{id}", method= RequestMethod.DELETE)
88
+    @RequestMapping(value="/admin/invoice/person/{id}", method= RequestMethod.DELETE)
83 89
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
84 90
     public ResponseBean taInvoicePersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
85 91
         if(iTaInvoicePersonService.removeById(id)){
@@ -95,7 +101,7 @@ public class TaInvoicePersonController extends BaseController {
95 101
      * @param taInvoicePerson 实体对象
96 102
      * @return
97 103
      */
98
-    @RequestMapping(value="/admin/taInvoicePerson/{id}",method= RequestMethod.PUT)
104
+    @RequestMapping(value="/admin/invoice/person/{id}",method= RequestMethod.PUT)
99 105
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
100 106
     public ResponseBean taInvoicePersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
101 107
                                         @ApiParam("更新内容") @RequestBody TaInvoicePerson taInvoicePerson) throws Exception{
@@ -111,7 +117,7 @@ public class TaInvoicePersonController extends BaseController {
111 117
      * 根据id查询对象
112 118
      * @param id  实体ID
113 119
      */
114
-    @RequestMapping(value="/admin/taInvoicePerson/{id}",method= RequestMethod.GET)
120
+    @RequestMapping(value="/admin/invoice/person/{id}",method= RequestMethod.GET)
115 121
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
116 122
     public ResponseBean taInvoicePersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
117 123
         return ResponseBean.success(iTaInvoicePersonService.getById(id));

+ 1
- 1
src/main/java/com/njyunzhi/invoice/entity/TaInvoicePerson.java Näytä tiedosto

@@ -27,7 +27,7 @@ public class TaInvoicePerson implements Serializable {
27 27
     private static final long serialVersionUID = 1L;
28 28
 
29 29
     @ApiModelProperty(value = "人员ID")
30
-    @TableId(value = "invoice_person_id", type = IdType.INPUT)
30
+    @TableId(value = "invoice_person_id", type = IdType.ASSIGN_UUID)
31 31
     private String invoicePersonId;
32 32
 
33 33
     @ApiModelProperty(value = "映射人员ID")

+ 2
- 1
src/main/java/com/njyunzhi/invoice/entity/TaPerson.java Näytä tiedosto

@@ -48,5 +48,6 @@ public class TaPerson implements Serializable {
48 48
     @ApiModelProperty(value = "创建日期")
49 49
     private LocalDateTime createDate;
50 50
 
51
-
51
+    @ApiModelProperty(value = "绑定用户ID")
52
+    private String userId;
52 53
 }

+ 1
- 2
src/main/java/com/njyunzhi/invoice/service/ITaInvoiceOrgService.java Näytä tiedosto

@@ -1,7 +1,6 @@
1 1
 package com.njyunzhi.invoice.service;
2 2
 
3 3
 import com.njyunzhi.invoice.entity.TaInvoiceOrg;
4
-import com.baomidou.mybatisplus.extension.service.IService;
5 4
 
6 5
 /**
7 6
  * <p>
@@ -11,6 +10,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
11 10
  * @author yansen
12 11
  * @since 2022-07-04
13 12
  */
14
-public interface ITaInvoiceOrgService extends IService<TaInvoiceOrg> {
13
+public interface ITaInvoiceOrgService extends IBaseService<TaInvoiceOrg> {
15 14
 
16 15
 }

+ 1
- 2
src/main/java/com/njyunzhi/invoice/service/ITaInvoicePersonService.java Näytä tiedosto

@@ -1,7 +1,6 @@
1 1
 package com.njyunzhi.invoice.service;
2 2
 
3 3
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
4
-import com.baomidou.mybatisplus.extension.service.IService;
5 4
 
6 5
 /**
7 6
  * <p>
@@ -11,6 +10,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
11 10
  * @author yansen
12 11
  * @since 2022-07-04
13 12
  */
14
-public interface ITaInvoicePersonService extends IService<TaInvoicePerson> {
13
+public interface ITaInvoicePersonService extends IBaseService<TaInvoicePerson> {
15 14
 
16 15
 }

+ 1
- 2
src/main/java/com/njyunzhi/invoice/service/impl/TaInvoiceOrgServiceImpl.java Näytä tiedosto

@@ -3,7 +3,6 @@ package com.njyunzhi.invoice.service.impl;
3 3
 import com.njyunzhi.invoice.entity.TaInvoiceOrg;
4 4
 import com.njyunzhi.invoice.mapper.TaInvoiceOrgMapper;
5 5
 import com.njyunzhi.invoice.service.ITaInvoiceOrgService;
6
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 6
 import org.springframework.stereotype.Service;
8 7
 
9 8
 /**
@@ -15,6 +14,6 @@ import org.springframework.stereotype.Service;
15 14
  * @since 2022-07-04
16 15
  */
17 16
 @Service
18
-public class TaInvoiceOrgServiceImpl extends ServiceImpl<TaInvoiceOrgMapper, TaInvoiceOrg> implements ITaInvoiceOrgService {
17
+public class TaInvoiceOrgServiceImpl extends BaseServiceImpl<TaInvoiceOrgMapper, TaInvoiceOrg> implements ITaInvoiceOrgService {
19 18
 
20 19
 }

+ 1
- 2
src/main/java/com/njyunzhi/invoice/service/impl/TaInvoicePersonServiceImpl.java Näytä tiedosto

@@ -3,7 +3,6 @@ package com.njyunzhi.invoice.service.impl;
3 3
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
4 4
 import com.njyunzhi.invoice.mapper.TaInvoicePersonMapper;
5 5
 import com.njyunzhi.invoice.service.ITaInvoicePersonService;
6
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 6
 import org.springframework.stereotype.Service;
8 7
 
9 8
 /**
@@ -15,6 +14,6 @@ import org.springframework.stereotype.Service;
15 14
  * @since 2022-07-04
16 15
  */
17 16
 @Service
18
-public class TaInvoicePersonServiceImpl extends ServiceImpl<TaInvoicePersonMapper, TaInvoicePerson> implements ITaInvoicePersonService {
17
+public class TaInvoicePersonServiceImpl extends BaseServiceImpl<TaInvoicePersonMapper, TaInvoicePerson> implements ITaInvoicePersonService {
19 18
 
20 19
 }