state_grid
/
invoice_fill_service
Слідкувати 3
Зірка 0
Відгалуження 0
Код Питання 0 Запити до злиття 0 Релізи 1 Wiki Activity
Browse Source

fff

[baozhangchao] 2 years ago
parent
4f761284a9
commit
57a34b30f9
9 changed files with 40 additions and 40 deletions
Split View Show Diff Stats
  1. 6
    5
      src/main/java/com/njyunzhi/invoice/controller/TaInvoiceDetailController.java
  2. 4
    4
      src/main/java/com/njyunzhi/invoice/controller/TaInvoiceFillController.java
  3. 3
    2
      src/main/java/com/njyunzhi/invoice/controller/TaInvoiceItemTplController.java
  4. 15
    11
      src/main/java/com/njyunzhi/invoice/controller/TaInvoicePersonController.java
  5. 1
    1
      src/main/java/com/njyunzhi/invoice/entity/TaInvoiceFill.java
  6. 3
    1
      src/main/java/com/njyunzhi/invoice/entity/TaInvoiceItemTpl.java
  7. 8
    1
      src/main/java/com/njyunzhi/invoice/entity/TaInvoicePerson.java
  8. 0
    14
      src/main/resources/mapper/SysBankMapper.xml
  9. 0
    1
      src/main/resources/mapper/TaInvoiceFillMapper.xml

+ 6
- 5
src/main/java/com/njyunzhi/invoice/controller/TaInvoiceDetailController.java View File 

@@ -49,12 +49,13 @@ public class TaInvoiceDetailController extends BaseController {
49 49 
     @RequestMapping(value="/admin/taInvoiceDetail",method= RequestMethod.GET)
50 50 
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
51 51 
     public ResponseBean taInvoiceDetailList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
52 
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
52 
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
53 
+                                     @ApiParam("报销ID") @RequestParam(value ="invoiceId",defaultValue = "") String invoiceId) throws Exception{
53 54
54 55 
 		    IPage<TaInvoiceDetail> pg = new Page<>(pageNum, pageSize);
55 56 
             QueryWrapper<TaInvoiceDetail> queryWrapper = new QueryWrapper<>();
56 57 
             queryWrapper.orderByDesc("create_date");
57 
-
58 
+            queryWrapper.eq("invoice_id",invoiceId);
58 59 
             IPage<TaInvoiceDetail> result = iTaInvoiceDetailService.page(pg, queryWrapper);
59 60 
             return ResponseBean.success(result);
60 61 
     }
 
@@ -81,7 +82,7 @@ public class TaInvoiceDetailController extends BaseController {
81 82 
      */
82 83 
     @RequestMapping(value="/admin/taInvoiceDetail/{id}", method= RequestMethod.DELETE)
83 84 
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
84 
-    public ResponseBean taInvoiceDetailDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
85 
+    public ResponseBean taInvoiceDetailDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
85 86 
         if(iTaInvoiceDetailService.removeById(id)){
86 87 
             return ResponseBean.success("success");
87 88 
         }else {
 
@@ -97,7 +98,7 @@ public class TaInvoiceDetailController extends BaseController {
97 98 
      */
98 99 
     @RequestMapping(value="/admin/taInvoiceDetail/{id}",method= RequestMethod.PUT)
99 100 
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
100 
-    public ResponseBean taInvoiceDetailUpdate(@ApiParam("对象ID") @PathVariable Integer id,
101 
+    public ResponseBean taInvoiceDetailUpdate(@ApiParam("对象ID") @PathVariable String id,
101 102 
                                         @ApiParam("更新内容") @RequestBody TaInvoiceDetail taInvoiceDetail) throws Exception{
102 103
103 104 
         if (iTaInvoiceDetailService.updateById(taInvoiceDetail)){
 
@@ -113,7 +114,7 @@ public class TaInvoiceDetailController extends BaseController {
113 114 
      */
114 115 
     @RequestMapping(value="/admin/taInvoiceDetail/{id}",method= RequestMethod.GET)
115 116 
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
116 
-    public ResponseBean taInvoiceDetailGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
117 
+    public ResponseBean taInvoiceDetailGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
117 118 
         return ResponseBean.success(iTaInvoiceDetailService.getById(id));
118 119 
     }
119 120 
 }

+ 4
- 4
src/main/java/com/njyunzhi/invoice/controller/TaInvoiceFillController.java View File 

@@ -20,6 +20,8 @@ import com.njyunzhi.invoice.service.ITaInvoiceFillService;
20 20 
 import com.njyunzhi.invoice.entity.TaInvoiceFill;
21 21 
 import org.springframework.web.bind.annotation.RestController;
22 22
23 
+import java.util.List;
24 
+
23 25 
 /**
24 26 
  * <p>
25 27 
     * 报销主表 前端控制器
 
@@ -50,11 +52,9 @@ public class TaInvoiceFillController extends BaseController {
50 52 
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
51 53 
     public ResponseBean taInvoiceFillList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
52 54 
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
53 
-
54 55 
 		    IPage<TaInvoiceFill> pg = new Page<>(pageNum, pageSize);
55 56 
             QueryWrapper<TaInvoiceFill> queryWrapper = new QueryWrapper<>();
56 57 
             queryWrapper.orderByDesc("create_date");
57 
-
58 58 
             IPage<TaInvoiceFill> result = iTaInvoiceFillService.page(pg, queryWrapper);
59 59 
             return ResponseBean.success(result);
60 60 
     }
 
@@ -81,7 +81,7 @@ public class TaInvoiceFillController extends BaseController {
81 81 
      */
82 82 
     @RequestMapping(value="/admin/taInvoiceFill/{id}", method= RequestMethod.DELETE)
83 83 
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
84 
-    public ResponseBean taInvoiceFillDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
84 
+    public ResponseBean taInvoiceFillDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
85 85 
         if(iTaInvoiceFillService.removeById(id)){
86 86 
             return ResponseBean.success("success");
87 87 
         }else {
 
@@ -113,7 +113,7 @@ public class TaInvoiceFillController extends BaseController {
113 113 
      */
114 114 
     @RequestMapping(value="/admin/taInvoiceFill/{id}",method= RequestMethod.GET)
115 115 
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
116 
-    public ResponseBean taInvoiceFillGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
116 
+    public ResponseBean taInvoiceFillGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
117 117 
         return ResponseBean.success(iTaInvoiceFillService.getById(id));
118 118 
     }
119 119 
 }

+ 3
- 2
src/main/java/com/njyunzhi/invoice/controller/TaInvoiceItemTplController.java View File 

@@ -49,12 +49,13 @@ public class TaInvoiceItemTplController extends BaseController {
49 49 
     @RequestMapping(value="/admin/taInvoiceItemTpl",method= RequestMethod.GET)
50 50 
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
51 51 
     public ResponseBean taInvoiceItemTplList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
52 
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
52 
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
53 
+                                     @ApiParam("报销ID") @RequestParam(value ="invoiceId",defaultValue = "") String invoiceId) throws Exception{
53 54
54 55 
 		    IPage<TaInvoiceItemTpl> pg = new Page<>(pageNum, pageSize);
55 56 
             QueryWrapper<TaInvoiceItemTpl> queryWrapper = new QueryWrapper<>();
56 57 
             queryWrapper.orderByDesc("create_date");
57 
-
58 
+            queryWrapper.eq("invoice_id",invoiceId);
58 59 
             IPage<TaInvoiceItemTpl> result = iTaInvoiceItemTplService.page(pg, queryWrapper);
59 60 
             return ResponseBean.success(result);
60 61 
     }

+ 15
- 11
src/main/java/com/njyunzhi/invoice/controller/TaInvoicePersonController.java View File 

@@ -5,9 +5,11 @@ 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.mapper.TaInvoicePersonMapper;
8 9 
 import io.swagger.annotations.Api;
9 10 
 import io.swagger.annotations.ApiOperation;
10 11 
 import io.swagger.annotations.ApiParam;
12 
+import org.junit.Test;
11 13 
 import org.slf4j.Logger;
12 14 
 import org.slf4j.LoggerFactory;
13 15 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -20,6 +22,8 @@ import com.njyunzhi.invoice.service.ITaInvoicePersonService;
20 22 
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
21 23 
 import org.springframework.web.bind.annotation.RestController;
22 24
25 
+import java.util.List;
26 
+
23 27 
 /**
24 28 
  * <p>
25 29 
     * 报销人员 前端控制器
 
@@ -49,14 +53,14 @@ public class TaInvoicePersonController extends BaseController {
49 53 
     @RequestMapping(value="/admin/taInvoicePerson",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 
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
53 
-
54 
-		    IPage<TaInvoicePerson> pg = new Page<>(pageNum, pageSize);
55 
-            QueryWrapper<TaInvoicePerson> queryWrapper = new QueryWrapper<>();
56 
-            queryWrapper.orderByDesc("create_date");
57 
-
58 
-            IPage<TaInvoicePerson> result = iTaInvoicePersonService.page(pg, queryWrapper);
59 
-            return ResponseBean.success(result);
56 
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
57 
+                                     @ApiParam("报销ID") @RequestParam(value ="invoiceId",defaultValue = "") String invoiceId) throws Exception{
58 
+        IPage<TaInvoicePerson> pg = new Page<>(pageNum, pageSize);
59 
+        QueryWrapper<TaInvoicePerson> queryWrapper = new QueryWrapper<>();
60 
+        queryWrapper.eq("invoice_id", invoiceId);
61 
+        queryWrapper.orderByDesc("create_date");
62 
+        IPage<TaInvoicePerson> result = iTaInvoicePersonService.page(pg,queryWrapper);
63 
+        return ResponseBean.success(result);
60 64 
     }
61 65
62 66 
     /**
 
@@ -81,7 +85,7 @@ public class TaInvoicePersonController extends BaseController {
81 85 
      */
82 86 
     @RequestMapping(value="/admin/taInvoicePerson/{id}", method= RequestMethod.DELETE)
83 87 
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
84 
-    public ResponseBean taInvoicePersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
88 
+    public ResponseBean taInvoicePersonDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
85 89 
         if(iTaInvoicePersonService.removeById(id)){
86 90 
             return ResponseBean.success("success");
87 91 
         }else {
 
@@ -97,7 +101,7 @@ public class TaInvoicePersonController extends BaseController {
97 101 
      */
98 102 
     @RequestMapping(value="/admin/taInvoicePerson/{id}",method= RequestMethod.PUT)
99 103 
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
100 
-    public ResponseBean taInvoicePersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
104 
+    public ResponseBean taInvoicePersonUpdate(@ApiParam("对象ID") @PathVariable String id,
101 105 
                                         @ApiParam("更新内容") @RequestBody TaInvoicePerson taInvoicePerson) throws Exception{
102 106
103 107 
         if (iTaInvoicePersonService.updateById(taInvoicePerson)){
 
@@ -113,7 +117,7 @@ public class TaInvoicePersonController extends BaseController {
113 117 
      */
114 118 
     @RequestMapping(value="/admin/taInvoicePerson/{id}",method= RequestMethod.GET)
115 119 
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
116 
-    public ResponseBean taInvoicePersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
120 
+    public ResponseBean taInvoicePersonGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
117 121 
         return ResponseBean.success(iTaInvoicePersonService.getById(id));
118 122 
     }
119 123 
 }

+ 1
- 1
src/main/java/com/njyunzhi/invoice/entity/TaInvoiceFill.java View File 

@@ -27,7 +27,7 @@ public class TaInvoiceFill implements Serializable {
27 27 
     private static final long serialVersionUID = 1L;
28 28
29 29 
     @ApiModelProperty(value = "报销ID")
30 
-    @TableId(value = "invoice_id", type = IdType.INPUT)
30 
+    @TableId(value = "invoice_id", type = IdType.ASSIGN_UUID)
31 31 
     private String invoiceId;
32 32
33 33 
     @ApiModelProperty(value = "名称")

+ 3
- 1
src/main/java/com/njyunzhi/invoice/entity/TaInvoiceItemTpl.java View File 

@@ -27,7 +27,7 @@ public class TaInvoiceItemTpl implements Serializable {
27 27 
     private static final long serialVersionUID = 1L;
28 28
29 29 
     @ApiModelProperty(value = "项目ID")
30 
-    @TableId(value = "invoice_item_tpl_id", type = IdType.INPUT)
30 
+    @TableId(value = "invoice_item_tpl_id", type = IdType.AUTO)
31 31 
     private Integer invoiceItemTplId;
32 32
33 33 
     @ApiModelProperty(value = "报销ID")

@@ -45,5 +45,7 @@ public class TaInvoiceItemTpl implements Serializable {
45 45 
     @ApiModelProperty(value = "创建日期")
46 46 
     private LocalDateTime createDate;
47 47
48 
+    @ApiModelProperty(value = "报销ID")
49 
+    private String invoice_id;
48 50
49 51 
 }

+ 8
- 1
src/main/java/com/njyunzhi/invoice/entity/TaInvoicePerson.java View File 

@@ -2,6 +2,8 @@ package com.njyunzhi.invoice.entity;
2 2
3 3 
 import com.baomidou.mybatisplus.annotation.IdType;
4 4 
 import java.time.LocalDateTime;
5 
+
6 
+import com.baomidou.mybatisplus.annotation.TableField;
5 7 
 import com.baomidou.mybatisplus.annotation.TableId;
6 8 
 import java.io.Serializable;
7 9 
 import io.swagger.annotations.ApiModel;

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

@@ -40,6 +42,7 @@ public class TaInvoicePerson implements Serializable {
40 42 
     private String orgId;
41 43
42 44 
     @ApiModelProperty(value = "名称")
45 
+    @TableField("`name`")
43 46 
     private String name;
44 47
45 48 
     @ApiModelProperty(value = "人员手机号")

@@ -51,5 +54,9 @@ public class TaInvoicePerson implements Serializable {
51 54 
     @ApiModelProperty(value = "创建日期")
52 55 
     private LocalDateTime createDate;
53 56
57 
+    @ApiModelProperty(value = "报销ID")
58 
+    private String invoiceId;
54 59
60 
+    @ApiModelProperty(value = "单位名称")
61 
+    private String orgName;
55 62 
 }

+ 0
- 14
src/main/resources/mapper/SysBankMapper.xml View File 

@@ -2,18 +2,4 @@
2 2 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 
 <mapper namespace="com.njyunzhi.invoice.mapper.SysBankMapper">
4 4
5 
-    <select id="getBankList" resultType="com.njyunzhi.invoice.entity.SysBank">
6 
-        SELECT * FROM sys_bank WHERE LIMIT #{pageNum},#{pageSize}
7 
-    </select>
8 
-    <delete id="deleteBankId">
9 
-        DELETE * FROM sys_bank WHERE id=#{id}
10 
-    </delete>
11 
-    <update id="updBankId">
12 
-        UPDATE sys_bank SET
13 
-        <if test="name!=null">name=#{name},</if>
14 
-        <if test="card_no!=null">card_no=#{card_no},</if>
15 
-        <if test="status!=null">status=#{status},</if>
16 
-        <if test="create_date!=null">create_date=#{create_date},</if>
17 
-        WHERE id=#{id}
18 
-    </update>
19 5 
 </mapper>

+ 0
- 1
src/main/resources/mapper/TaInvoiceFillMapper.xml View File 

@@ -1,5 +1,4 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 2 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 
 <mapper namespace="com.njyunzhi.invoice.mapper.TaInvoiceFillMapper">
4 
-
5 4 
 </mapper>