张延森 2 年之前
父節點
當前提交
9cfa25621c

+ 18
- 12
src/main/java/com/njyunzhi/invoice/controller/TaInvoicePersonController.java 查看文件

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

+ 1
- 1
src/main/java/com/njyunzhi/invoice/entity/TaInvoicePerson.java 查看文件

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

+ 2
- 1
src/main/java/com/njyunzhi/invoice/entity/TaPerson.java 查看文件

48
     @ApiModelProperty(value = "创建日期")
48
     @ApiModelProperty(value = "创建日期")
49
     private LocalDateTime createDate;
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 查看文件

1
 package com.njyunzhi.invoice.service;
1
 package com.njyunzhi.invoice.service;
2
 
2
 
3
 import com.njyunzhi.invoice.entity.TaInvoiceOrg;
3
 import com.njyunzhi.invoice.entity.TaInvoiceOrg;
4
-import com.baomidou.mybatisplus.extension.service.IService;
5
 
4
 
6
 /**
5
 /**
7
  * <p>
6
  * <p>
11
  * @author yansen
10
  * @author yansen
12
  * @since 2022-07-04
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 查看文件

1
 package com.njyunzhi.invoice.service;
1
 package com.njyunzhi.invoice.service;
2
 
2
 
3
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
3
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
4
-import com.baomidou.mybatisplus.extension.service.IService;
5
 
4
 
6
 /**
5
 /**
7
  * <p>
6
  * <p>
11
  * @author yansen
10
  * @author yansen
12
  * @since 2022-07-04
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 查看文件

3
 import com.njyunzhi.invoice.entity.TaInvoiceOrg;
3
 import com.njyunzhi.invoice.entity.TaInvoiceOrg;
4
 import com.njyunzhi.invoice.mapper.TaInvoiceOrgMapper;
4
 import com.njyunzhi.invoice.mapper.TaInvoiceOrgMapper;
5
 import com.njyunzhi.invoice.service.ITaInvoiceOrgService;
5
 import com.njyunzhi.invoice.service.ITaInvoiceOrgService;
6
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
 import org.springframework.stereotype.Service;
6
 import org.springframework.stereotype.Service;
8
 
7
 
9
 /**
8
 /**
15
  * @since 2022-07-04
14
  * @since 2022-07-04
16
  */
15
  */
17
 @Service
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 查看文件

3
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
3
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
4
 import com.njyunzhi.invoice.mapper.TaInvoicePersonMapper;
4
 import com.njyunzhi.invoice.mapper.TaInvoicePersonMapper;
5
 import com.njyunzhi.invoice.service.ITaInvoicePersonService;
5
 import com.njyunzhi.invoice.service.ITaInvoicePersonService;
6
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
 import org.springframework.stereotype.Service;
6
 import org.springframework.stereotype.Service;
8
 
7
 
9
 /**
8
 /**
15
  * @since 2022-07-04
14
  * @since 2022-07-04
16
  */
15
  */
17
 @Service
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
 }