张延森 3 years ago
parent
commit
2b8d3b4834

+ 4
- 0
src/main/java/com/njyunzhi/pet_identity/common/BaseController.java View File

@@ -44,4 +44,8 @@ public class BaseController {
44 44
 
45 45
         return user;
46 46
     }
47
+
48
+    public boolean checkRole(String srcRole, String targRole) {
49
+        return Constants.USER_ADMIN.equals(srcRole) || srcRole.equals(targRole);
50
+    }
47 51
 }

+ 26
- 3
src/main/java/com/njyunzhi/pet_identity/common/Constants.java View File

@@ -5,14 +5,37 @@ public class Constants {
5 5
     public final static int STATUS_READY = 0;
6 6
     public final static int STATUS_NORMAL = 1;
7 7
 
8
-    public final static String SETTING_REPORT_URL = "report_url";
9 8
 
10
-    //
9
+    // 客户端类型
11 10
     public final static String LOGIN_TYPE_ADMIN = "admin";
12 11
     public final static String LOGIN_TYPE_MINIAPP = "miniapp";
13 12
 
14
-    //
13
+    // 用户角色
15 14
     public final static String USER_ADMIN = "admin";
16 15
     public final static String USER_AUDITOR = "auditor";
17 16
     public final static String USER_MAKER = "maker";
17
+
18
+    // 申领方式
19
+    public final static int APPLY_METHOD_AUTO = 1;  // 自主领取
20
+    public final static int APPLY_METHOD_EXPRESS = 2;  // 快递
21
+
22
+    // 支付状态
23
+    public final static int PAY_STATUS_READY = 0;  // 未支付
24
+    public final static int PAY_STATUS_PAYING = 1;  // 支付中
25
+    public final static int PAY_STATUS_PAID = 2;  // 已支付
26
+
27
+    // 审核状态
28
+    public final static int AUDIT_STATUS_READY = 0;  // 未审核
29
+    public final static int AUDIT_STATUS_PASSED = 1;  // 审核通过
30
+    public final static int AUDIT_STATUS_REJECT = 2;  // 审核驳回
31
+
32
+    // 发证(制卡)状态
33
+    public final static int MAKE_STATUS_READY = 0;  // 待发放
34
+    public final static int MAKE_STATUS_MADE = 1;  // 已发放
35
+
36
+    // 流程状态
37
+    public final static int WORKFLOW_STATUS_READY = 0;  // 提交申请(未支付)
38
+    public final static int WORKFLOW_STATUS_PROCESSING = 1;  // 审批中
39
+    public final static int WORKFLOW_STATUS_AUDIT = 2;  // 已审批
40
+    public final static int WORKFLOW_STATUS_MADE = 3;  // 已发证
18 41
 }

+ 189
- 13
src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java View File

@@ -4,7 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.njyunzhi.pet_identity.common.BaseController;
7
+import com.njyunzhi.pet_identity.common.Constants;
7 8
 import com.njyunzhi.pet_identity.common.ResponseBean;
9
+import com.njyunzhi.pet_identity.common.StringUtils;
10
+import com.njyunzhi.pet_identity.entity.SysUser;
11
+import com.njyunzhi.pet_identity.entity.TaPerson;
12
+import com.njyunzhi.pet_identity.vo.AuditParam;
13
+import com.njyunzhi.pet_identity.vo.MakeCardParam;
8 14
 import io.swagger.annotations.Api;
9 15
 import io.swagger.annotations.ApiOperation;
10 16
 import io.swagger.annotations.ApiParam;
@@ -20,6 +26,8 @@ import com.njyunzhi.pet_identity.service.ITaApplicationService;
20 26
 import com.njyunzhi.pet_identity.entity.TaApplication;
21 27
 import org.springframework.web.bind.annotation.RestController;
22 28
 
29
+import java.time.LocalDateTime;
30
+
23 31
 /**
24 32
  * <p>
25 33
     * 我的申请 前端控制器
@@ -46,13 +54,55 @@ public class TaApplicationController extends BaseController {
46 54
      * @param pageSize
47 55
      * @return
48 56
      */
49
-    @RequestMapping(value="/taApplication",method= RequestMethod.GET)
57
+    @RequestMapping(value="/admin/application",method= RequestMethod.GET)
50 58
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
51 59
     public ResponseBean taApplicationList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
52 60
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
53 61
 
62
+        SysUser sysUser = currentUser();
63
+
54 64
         IPage<TaApplication> pg = new Page<>(pageNum, pageSize);
55 65
         QueryWrapper<TaApplication> queryWrapper = new QueryWrapper<>();
66
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
67
+
68
+        // 审核人角色
69
+        if (Constants.USER_AUDITOR.equals(sysUser.getRoleName())) {
70
+            queryWrapper.ge("status", Constants.WORKFLOW_STATUS_PROCESSING);
71
+            queryWrapper.le("status", Constants.WORKFLOW_STATUS_AUDIT);
72
+        }
73
+
74
+        // 发证(制卡)人角色
75
+        if (Constants.USER_MAKER.equals(sysUser.getRoleName())) {
76
+            queryWrapper.ge("status", Constants.WORKFLOW_STATUS_AUDIT);
77
+            queryWrapper.le("status", Constants.WORKFLOW_STATUS_MADE);
78
+        }
79
+
80
+        queryWrapper.orderByAsc("status");
81
+        queryWrapper.orderByDesc("create_date");
82
+
83
+        IPage<TaApplication> result = iTaApplicationService.page(pg, queryWrapper);
84
+        return ResponseBean.success(result);
85
+    }
86
+
87
+
88
+    /**
89
+     * 分页查询列表
90
+     * @param pageNum
91
+     * @param pageSize
92
+     * @return
93
+     */
94
+    @RequestMapping(value="/wx/{client}/application",method= RequestMethod.GET)
95
+    @ApiOperation(value="微信列表", notes = "微信列表", httpMethod = "GET", response = ResponseBean.class)
96
+    public ResponseBean wxList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
97
+                               @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
98
+
99
+        TaPerson taPerson = currentPerson();
100
+
101
+        IPage<TaApplication> pg = new Page<>(pageNum, pageSize);
102
+        QueryWrapper<TaApplication> queryWrapper = new QueryWrapper<>();
103
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
104
+        queryWrapper.eq("person_id", taPerson.getPersonId());
105
+
56 106
         queryWrapper.orderByDesc("create_date");
57 107
 
58 108
         IPage<TaApplication> result = iTaApplicationService.page(pg, queryWrapper);
@@ -64,13 +114,27 @@ public class TaApplicationController extends BaseController {
64 114
      * @param taApplication 实体对象
65 115
      * @return
66 116
      */
67
-    @RequestMapping(value="/taApplication",method= RequestMethod.POST)
68
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
117
+    @RequestMapping(value="/wx/{clientId}/application",method= RequestMethod.POST)
118
+    @ApiOperation(value="微信申请", notes = "微信申请", httpMethod = "POST", response = ResponseBean.class)
69 119
     public ResponseBean taApplicationAdd(@ApiParam("保存内容") @RequestBody TaApplication taApplication) throws Exception{
70 120
 
121
+        TaPerson taPerson = currentPerson();
122
+        if (StringUtils.isEmpty(taPerson.getPhone())) {
123
+            return ResponseBean.error("请先完善个人信息");
124
+        }
125
+
126
+        taApplication.setPersonId(taPerson.getPersonId());
127
+        taApplication.setPersonName(taPerson.getNickName());
128
+        taApplication.setPhone(taPerson.getPhone());
129
+        taApplication.setPayStatus(Constants.PAY_STATUS_READY);
130
+        taApplication.setStatus(Constants.WORKFLOW_STATUS_READY);
131
+        taApplication.setCreateDate(LocalDateTime.now());
132
+        taApplication.setVerifyStatus(Constants.AUDIT_STATUS_READY);
133
+        taApplication.setMakeStatus(Constants.MAKE_STATUS_READY);
134
+
71 135
         if (iTaApplicationService.save(taApplication)){
72 136
             return ResponseBean.success(taApplication);
73
-        }else {
137
+        } else {
74 138
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
75 139
         }
76 140
     }
@@ -79,10 +143,25 @@ public class TaApplicationController extends BaseController {
79 143
      * 根据id删除对象
80 144
      * @param id  实体ID
81 145
      */
82
-    @RequestMapping(value="/taApplication/{id}", method= RequestMethod.DELETE)
83
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
146
+    @RequestMapping(value="/wx/{clientId}/application/{id}", method= RequestMethod.DELETE)
147
+    @ApiOperation(value="微信删除", notes = "微信删除", httpMethod = "DELETE", response = ResponseBean.class)
84 148
     public ResponseBean taApplicationDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
85
-        if(iTaApplicationService.removeById(id)){
149
+        TaPerson taPerson = currentPerson();
150
+
151
+        TaApplication taApplication = iTaApplicationService.getById(id);
152
+        if (null == taApplication || taApplication.getStatus() == Constants.STATUS_DELETE) {
153
+            return ResponseBean.error("未找到数据");
154
+        }
155
+
156
+        if (!taPerson.getPersonId().equals(taApplication.getPersonId())) {
157
+            return ResponseBean.error("无权操作");
158
+        }
159
+
160
+        if (taApplication.getStatus() >= Constants.WORKFLOW_STATUS_PROCESSING) {
161
+            return ResponseBean.error("流程已提审, 不能删除");
162
+        }
163
+
164
+        if(iTaApplicationService.removeLogicById(id)){
86 165
             return ResponseBean.success("success");
87 166
         }else {
88 167
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,10 +174,36 @@ public class TaApplicationController extends BaseController {
95 174
      * @param taApplication 实体对象
96 175
      * @return
97 176
      */
98
-    @RequestMapping(value="/taApplication/{id}",method= RequestMethod.PUT)
99
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
100
-    public ResponseBean taApplicationUpdate(@ApiParam("对象ID") @PathVariable Integer id,
101
-                                        @ApiParam("更新内容") @RequestBody TaApplication taApplication) throws Exception{
177
+    @RequestMapping(value="/admin/application/{id}/audit",method= RequestMethod.PUT)
178
+    @ApiOperation(value="审批", notes = "审批", httpMethod = "PUT", response = ResponseBean.class)
179
+    public ResponseBean audit(@ApiParam("对象ID") @PathVariable Integer id,
180
+                                        @ApiParam("更新内容") @RequestBody AuditParam auditParam) throws Exception{
181
+
182
+        SysUser sysUser = currentUser();
183
+        if (!checkRole(sysUser.getRoleName(), Constants.USER_AUDITOR)) {
184
+            return ResponseBean.error("暂无权限");
185
+        }
186
+
187
+        TaApplication taApplication = iTaApplicationService.getById(id);
188
+        if (null == taApplication || taApplication.getStatus() == Constants.STATUS_DELETE) {
189
+            return ResponseBean.error("未找到数据");
190
+        }
191
+
192
+        if (taApplication.getStatus() < Constants.WORKFLOW_STATUS_PROCESSING) {
193
+            return ResponseBean.error("用户未支付");
194
+        }
195
+        if (taApplication.getStatus() >= Constants.WORKFLOW_STATUS_AUDIT) {
196
+            return ResponseBean.error("当前记录已审批");
197
+        }
198
+
199
+        if (auditParam.getVerifyStatus() == Constants.AUDIT_STATUS_REJECT && StringUtils.isEmpty(auditParam.getRejectReason())) {
200
+            return ResponseBean.error("请填写驳回理由");
201
+        }
202
+
203
+        taApplication.setVerifyStatus(auditParam.getVerifyStatus());
204
+        taApplication.setVerifyDate(LocalDateTime.now());
205
+        taApplication.setVerifyUser(sysUser.getUserId());
206
+        taApplication.setVerifyUserName(sysUser.getUserName());
102 207
 
103 208
         if (iTaApplicationService.updateById(taApplication)){
104 209
             return ResponseBean.success(iTaApplicationService.getById(id));
@@ -107,13 +212,84 @@ public class TaApplicationController extends BaseController {
107 212
         }
108 213
     }
109 214
 
215
+    /**
216
+     * 修改对象
217
+     * @param id  实体ID
218
+     * @param taApplication 实体对象
219
+     * @return
220
+     */
221
+    @RequestMapping(value="/admin/application/{id}/make",method= RequestMethod.PUT)
222
+    @ApiOperation(value="发证", notes = "发证", httpMethod = "PUT", response = ResponseBean.class)
223
+    public ResponseBean makeCard(@ApiParam("对象ID") @PathVariable Integer id,
224
+                              @ApiParam("更新内容") @RequestBody MakeCardParam makeCardParam) throws Exception{
225
+        SysUser sysUser = currentUser();
226
+        if (!checkRole(sysUser.getRoleName(), Constants.USER_MAKER)) {
227
+            return ResponseBean.error("暂无权限");
228
+        }
229
+
230
+        TaApplication taApplication = iTaApplicationService.getById(id);
231
+        if (null == taApplication || taApplication.getStatus() == Constants.STATUS_DELETE) {
232
+            return ResponseBean.error("未找到数据");
233
+        }
234
+
235
+        if (taApplication.getStatus() != Constants.WORKFLOW_STATUS_AUDIT && taApplication.getVerifyStatus() == Constants.AUDIT_STATUS_PASSED) {
236
+            return ResponseBean.error("申请未通过或状态不对");
237
+        }
238
+
239
+        if (taApplication.getApplyMethod() == Constants.APPLY_METHOD_EXPRESS) {
240
+            if (StringUtils.isEmpty(taApplication.getTrackingType()) || StringUtils.isEmpty(taApplication.getTrackingNo())) {
241
+                return ResponseBean.error("请填写快递信息");
242
+            }
243
+        }
244
+
245
+        taApplication.setMakeStatus(Constants.MAKE_STATUS_MADE);
246
+        taApplication.setMakeDate(LocalDateTime.now());
247
+        taApplication.setMakeUser(sysUser.getUserId());
248
+        taApplication.setMakeUserName(sysUser.getUserName());
249
+        taApplication.setTrackingType(makeCardParam.getTrackingType());
250
+        taApplication.setTrackingNo(makeCardParam.getTrackingNo());
251
+
252
+        if (iTaApplicationService.updateById(taApplication)){
253
+            return ResponseBean.success(iTaApplicationService.getById(id));
254
+        } else {
255
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
256
+        }
257
+    }
258
+
110 259
     /**
111 260
      * 根据id查询对象
112 261
      * @param id  实体ID
113 262
      */
114
-    @RequestMapping(value="/taApplication/{id}",method= RequestMethod.GET)
263
+    @RequestMapping(value="/admin/application/{id}",method= RequestMethod.GET)
115 264
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
116 265
     public ResponseBean taApplicationGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
117
-        return ResponseBean.success(iTaApplicationService.getById(id));
266
+
267
+        TaApplication taApplication = iTaApplicationService.getById(id);
268
+        if (taApplication == null || taApplication.getStatus() == Constants.STATUS_DELETE) {
269
+            return ResponseBean.error("未找到数据");
270
+        }
271
+
272
+        return ResponseBean.success(taApplication);
273
+    }
274
+
275
+    /**
276
+     * 根据id查询对象
277
+     * @param id  实体ID
278
+     */
279
+    @RequestMapping(value="/wx/{clientId}/application/{id}",method= RequestMethod.GET)
280
+    @ApiOperation(value="微信详情", notes = "微信详情", httpMethod = "GET", response = ResponseBean.class)
281
+    public ResponseBean wxGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
282
+
283
+        TaApplication taApplication = iTaApplicationService.getById(id);
284
+        if (taApplication == null || taApplication.getStatus() == Constants.STATUS_DELETE) {
285
+            return ResponseBean.error("未找到数据");
286
+        }
287
+
288
+        TaPerson taPerson = currentPerson();
289
+        if (!taPerson.getPersonId().equals(taApplication.getPersonId())) {
290
+            return ResponseBean.error("未找到数据");
291
+        }
292
+
293
+        return ResponseBean.success(taApplication);
118 294
     }
119 295
 }

+ 87
- 50
src/main/java/com/njyunzhi/pet_identity/entity/TaApplication.java View File

@@ -3,6 +3,8 @@ package com.njyunzhi.pet_identity.entity;
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableId;
5 5
 import java.io.Serializable;
6
+import java.time.LocalDateTime;
7
+
6 8
 import io.swagger.annotations.ApiModel;
7 9
 import io.swagger.annotations.ApiModelProperty;
8 10
 import lombok.Data;
@@ -27,55 +29,90 @@ public class TaApplication implements Serializable {
27 29
 
28 30
     @ApiModelProperty(value = "申请ID")
29 31
     @TableId(value = "apply_id", type = IdType.AUTO)
30
-    private Integer applyId;
31
-
32
-    @ApiModelProperty(value = "申请人")
33
-    private String personId;
34
-
35
-    @ApiModelProperty(value = "宠物名称")
36
-    private String petName;
37
-
38
-    @ApiModelProperty(value = "性别")
39
-    private String petSex;
40
-
41
-    @ApiModelProperty(value = "生日")
42
-    private String petBirthday;
43
-
44
-    @ApiModelProperty(value = "类别")
45
-    private String petType;
46
-
47
-    @ApiModelProperty(value = "毛色")
48
-    private String petColor;
49
-
50
-    @ApiModelProperty(value = "免疫证明")
51
-    private String immunization;
52
-
53
-    @ApiModelProperty(value = "宠养区域")
54
-    private String areaCode;
55
-
56
-    @ApiModelProperty(value = "详细地址")
57
-    private String address;
58
-
59
-    @ApiModelProperty(value = "宠物照片")
60
-    private String img1;
61
-
62
-    @ApiModelProperty(value = "图片2")
63
-    private String img2;
64
-
65
-    @ApiModelProperty(value = "状态")
66
-    private String status;
67
-
68
-    @ApiModelProperty(value = "申请时间")
69
-    private String createDate;
70
-
71
-    @ApiModelProperty(value = "申请状态")
72
-    private String verifyStatus;
73
-
74
-    @ApiModelProperty(value = "是否通过")
75
-    private String isAgree;
76
-
77
-    @ApiModelProperty(value = "驳回原因")
78
-    private String rejectReason;
79
-
32
+    private Integer applyId ;
33
+    /** 申请人 */
34
+    @ApiModelProperty(value = "申请人",notes = "")
35
+    private String personId ;
36
+    /** 申请人姓名;冗余 */
37
+    @ApiModelProperty(value = "申请人姓名",notes = "冗余")
38
+    private String personName ;
39
+    /** 申请人手机;冗余 */
40
+    @ApiModelProperty(value = "申请人手机",notes = "冗余")
41
+    private String phone ;
42
+    /** 宠物名称 */
43
+    @ApiModelProperty(value = "宠物名称",notes = "")
44
+    private String petName ;
45
+    /** 性别 */
46
+    @ApiModelProperty(value = "性别",notes = "")
47
+    private Integer petSex ;
48
+    /** 生日 */
49
+    @ApiModelProperty(value = "生日",notes = "")
50
+    private String petBirthday ;
51
+    /** 类别 */
52
+    @ApiModelProperty(value = "类别",notes = "")
53
+    private String petType ;
54
+    /** 毛色 */
55
+    @ApiModelProperty(value = "毛色",notes = "")
56
+    private String petColor ;
57
+    /** 免疫证明 */
58
+    @ApiModelProperty(value = "免疫证明",notes = "")
59
+    private String immunization ;
60
+    /** 宠养区域 */
61
+    @ApiModelProperty(value = "宠养区域",notes = "")
62
+    private String areaCode ;
63
+    /** 详细地址 */
64
+    @ApiModelProperty(value = "详细地址",notes = "")
65
+    private String address ;
66
+    /** 宠物照片 */
67
+    @ApiModelProperty(value = "宠物照片",notes = "")
68
+    private String img1 ;
69
+    /** 图片2 */
70
+    @ApiModelProperty(value = "图片2",notes = "")
71
+    private String img2 ;
72
+    /** 申领方式;1自提,2快递 */
73
+    @ApiModelProperty(value = "申领方式",notes = "1自提,2快递")
74
+    private Integer applyMethod ;
75
+    /** 付款状态;0未支付,1已支付 */
76
+    @ApiModelProperty(value = "付款状态",notes = "0未支付,1支付中,2已支付")
77
+    private Integer payStatus ;
78
+    /** 状态 */
79
+    @ApiModelProperty(value = "状态",notes = "")
80
+    private Integer status ;
81
+    /** 申请时间 */
82
+    @ApiModelProperty(value = "申请时间",notes = "")
83
+    private LocalDateTime createDate ;
84
+    /** 申请状态;0未审核,1通过,2未通过 */
85
+    @ApiModelProperty(value = "申请状态",notes = "0未审核,1通过,2未通过")
86
+    private Integer verifyStatus ;
87
+    /** 审核时间 */
88
+    @ApiModelProperty(value = "审核时间",notes = "")
89
+    private LocalDateTime verifyDate ;
90
+    /** 审核人 */
91
+    @ApiModelProperty(value = "审核人",notes = "")
92
+    private String verifyUser ;
93
+    /** 审核人姓名;冗余 */
94
+    @ApiModelProperty(value = "审核人姓名",notes = "冗余")
95
+    private String verifyUserName ;
96
+    /** 驳回原因 */
97
+    @ApiModelProperty(value = "驳回原因",notes = "")
98
+    private String rejectReason ;
99
+    /** 制证状态;0待发放,1已发放 */
100
+    @ApiModelProperty(value = "制证状态",notes = "0待发放,1已发放")
101
+    private Integer makeStatus ;
102
+    /** 发证人 */
103
+    @ApiModelProperty(value = "发证人",notes = "")
104
+    private String makeUser ;
105
+    /** 发证人姓名;冗余 */
106
+    @ApiModelProperty(value = "发证人姓名",notes = "冗余")
107
+    private String makeUserName ;
108
+    /** 发放时间 */
109
+    @ApiModelProperty(value = "发放时间",notes = "")
110
+    private LocalDateTime makeDate ;
111
+    /** 快递名称 */
112
+    @ApiModelProperty(value = "快递名称",notes = "")
113
+    private String trackingType ;
114
+    /** 快递单号 */
115
+    @ApiModelProperty(value = "快递单号",notes = "")
116
+    private String trackingNo ;
80 117
 
81 118
 }

+ 1
- 1
src/main/java/com/njyunzhi/pet_identity/service/ITaApplicationService.java View File

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
11 11
  * @author yansen
12 12
  * @since 2022-05-24
13 13
  */
14
-public interface ITaApplicationService extends IService<TaApplication> {
14
+public interface ITaApplicationService extends IBaseService<TaApplication> {
15 15
 
16 16
 }

+ 1
- 1
src/main/java/com/njyunzhi/pet_identity/service/impl/TaApplicationServiceImpl.java View File

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
15 15
  * @since 2022-05-24
16 16
  */
17 17
 @Service
18
-public class TaApplicationServiceImpl extends ServiceImpl<TaApplicationMapper, TaApplication> implements ITaApplicationService {
18
+public class TaApplicationServiceImpl extends BaseServiceImpl<TaApplicationMapper, TaApplication> implements ITaApplicationService {
19 19
 
20 20
 }

+ 16
- 0
src/main/java/com/njyunzhi/pet_identity/vo/AuditParam.java View File

@@ -0,0 +1,16 @@
1
+package com.njyunzhi.pet_identity.vo;
2
+
3
+
4
+import io.swagger.annotations.ApiModel;
5
+import io.swagger.annotations.ApiModelProperty;
6
+import lombok.Data;
7
+
8
+@ApiModel(description = "审批参数")
9
+@Data
10
+public class AuditParam {
11
+    @ApiModelProperty(value = "审批状态",notes = "0未审核,1通过,2未通过")
12
+    private Integer verifyStatus ;
13
+
14
+    @ApiModelProperty(value = "驳回原因",notes = "")
15
+    private String rejectReason ;
16
+}

+ 20
- 0
src/main/java/com/njyunzhi/pet_identity/vo/MakeCardParam.java View File

@@ -0,0 +1,20 @@
1
+package com.njyunzhi.pet_identity.vo;
2
+
3
+
4
+import io.swagger.annotations.ApiModel;
5
+import io.swagger.annotations.ApiModelProperty;
6
+import lombok.Data;
7
+
8
+@ApiModel(description = "发证参数")
9
+@Data
10
+public class MakeCardParam {
11
+    /** 制证状态;0待发放,1已发放 */
12
+    @ApiModelProperty(value = "制证状态",notes = "0待发放,1已发放")
13
+    private Integer makeStatus ;
14
+    /** 快递名称 */
15
+    @ApiModelProperty(value = "快递名称",notes = "")
16
+    private String trackingType ;
17
+    /** 快递单号 */
18
+    @ApiModelProperty(value = "快递单号",notes = "")
19
+    private String trackingNo ;
20
+}