Commit 9d2c048af4fdd33d8025cc150e10a3410899b824
1 parent
108c9d85
Exists in
dev
拜访-参数验证
Showing
5 changed files
with
132 additions
and
13 deletions
Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
... | ... | @@ -12,10 +12,12 @@ import com.chinagas.common.security.annotation.RequirePermission; |
12 | 12 | import com.chinagas.common.security.enums.Logical; |
13 | 13 | import com.chinagas.modules.schsf.domain.McVisit; |
14 | 14 | import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo; |
15 | +import com.chinagas.modules.schsf.domain.vo.McVisitModificationVo; | |
15 | 16 | import com.chinagas.modules.schsf.domain.vo.McVisitVo; |
16 | 17 | import com.chinagas.modules.schsf.enums.YesNoEnums; |
17 | 18 | import com.chinagas.modules.schsf.service.IMcVisitService; |
18 | 19 | import org.springframework.beans.factory.annotation.Autowired; |
20 | +import org.springframework.validation.annotation.Validated; | |
19 | 21 | import org.springframework.web.bind.annotation.*; |
20 | 22 | |
21 | 23 | import java.util.List; |
... | ... | @@ -131,7 +133,7 @@ public class McVisitController extends BaseController { |
131 | 133 | @RequirePermission("schsf:mcVisit:ticket_submitAuditOne") |
132 | 134 | @Log(title = "拜访工单", businessType = BusinessType.INSERT) |
133 | 135 | @PostMapping("/ticket/submitAuditOne") |
134 | - public AjaxResult ticketSubmitAuditOne(@RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { | |
136 | + public AjaxResult ticketSubmitAuditOne(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { | |
135 | 137 | mcVisitAuditVo.setType("1"); |
136 | 138 | mcVisitService.SubmitAudit(mcVisitAuditVo); |
137 | 139 | return AjaxResult.success(); |
... | ... | @@ -144,7 +146,7 @@ public class McVisitController extends BaseController { |
144 | 146 | @RequirePermission("schsf:mcVisit:ticket_submitAuditTwo") |
145 | 147 | @Log(title = "拜访工单", businessType = BusinessType.INSERT) |
146 | 148 | @PostMapping("/ticket/submitAuditTwo") |
147 | - public AjaxResult ticketsubmitAuditTwo(@RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { | |
149 | + public AjaxResult ticketsubmitAuditTwo(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { | |
148 | 150 | mcVisitAuditVo.setType("2"); |
149 | 151 | mcVisitService.SubmitAudit(mcVisitAuditVo); |
150 | 152 | return AjaxResult.success(); |
... | ... | @@ -158,7 +160,7 @@ public class McVisitController extends BaseController { |
158 | 160 | @RequirePermission("schsf:mcVisit:modification_submitAuditOne") |
159 | 161 | @Log(title = "拜访工单", businessType = BusinessType.INSERT) |
160 | 162 | @PostMapping("/modification/submitAuditOne") |
161 | - public AjaxResult modificationSubmitAuditOne(@RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { | |
163 | + public AjaxResult modificationSubmitAuditOne(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { | |
162 | 164 | mcVisitAuditVo.setType("3"); |
163 | 165 | mcVisitService.SubmitAudit(mcVisitAuditVo); |
164 | 166 | return AjaxResult.success(); |
... | ... | @@ -171,7 +173,7 @@ public class McVisitController extends BaseController { |
171 | 173 | @RequirePermission("schsf:mcVisit:modification_submitAuditTwo") |
172 | 174 | @Log(title = "拜访工单", businessType = BusinessType.INSERT) |
173 | 175 | @PostMapping("/modification/submitAuditTwo") |
174 | - public AjaxResult modificationSubmitAuditTwo(@RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { | |
176 | + public AjaxResult modificationSubmitAuditTwo(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { | |
175 | 177 | mcVisitAuditVo.setType("4"); |
176 | 178 | mcVisitService.SubmitAudit(mcVisitAuditVo); |
177 | 179 | return AjaxResult.success(); |
... | ... | @@ -188,7 +190,7 @@ public class McVisitController extends BaseController { |
188 | 190 | @RequirePermission("schsf:mcVisit:modification") |
189 | 191 | @Log(title = "拜访工单", businessType = BusinessType.UPDATE) |
190 | 192 | @PostMapping("/modification") |
191 | - public AjaxResult modification(@RequestBody McVisit mcVisit) throws CloneNotSupportedException { | |
193 | + public AjaxResult modification(@Validated @RequestBody McVisitModificationVo mcVisitModificationVo) throws CloneNotSupportedException { | |
192 | 194 | // McVisit mcVisit = new McVisit(); |
193 | 195 | // mcVisit.setId(id); |
194 | 196 | // mcVisit.setUserIdCard(userIdCard); |
... | ... | @@ -197,7 +199,7 @@ public class McVisitController extends BaseController { |
197 | 199 | // mcVisit.setPaymentMeth(paymentMeth); |
198 | 200 | // mcVisit.setChargeType(chargeType); |
199 | 201 | // mcVisit.setRemark(remark); |
200 | - return toAjax(mcVisitService.updateMcVisitModification(mcVisit)); | |
202 | + return toAjax(mcVisitService.updateMcVisitModification(mcVisitModificationVo)); | |
201 | 203 | } |
202 | 204 | |
203 | 205 | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitAuditVo.java
... | ... | @@ -2,11 +2,16 @@ package com.chinagas.modules.schsf.domain.vo; |
2 | 2 | |
3 | 3 | import com.chinagas.common.core.web.domain.BaseEntity; |
4 | 4 | |
5 | +import javax.validation.constraints.NotBlank; | |
6 | +import javax.validation.constraints.NotNull; | |
7 | + | |
5 | 8 | public class McVisitAuditVo extends BaseEntity { |
6 | 9 | private String type; |
7 | 10 | |
11 | + @NotNull(message = "ID不能为空") | |
8 | 12 | private Long id; |
9 | 13 | |
14 | + @NotBlank(message = "状态不能为空") | |
10 | 15 | private String status; |
11 | 16 | |
12 | 17 | private String remarks; | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitModificationVo.java
0 → 100644
... | ... | @@ -0,0 +1,106 @@ |
1 | +package com.chinagas.modules.schsf.domain.vo; | |
2 | + | |
3 | +import javax.validation.constraints.NotBlank; | |
4 | +import javax.validation.constraints.NotNull; | |
5 | +import java.math.BigDecimal; | |
6 | + | |
7 | +/** | |
8 | + * 数据异动申请 | |
9 | + */ | |
10 | +public class McVisitModificationVo { | |
11 | + /** 主键id */ | |
12 | + @NotNull(message = "ID不能为空") | |
13 | + private Long id; | |
14 | + | |
15 | + | |
16 | + /** 身份证号 */ | |
17 | + @NotBlank(message = "身份证号不能为空") | |
18 | + private String userIdCard; | |
19 | + | |
20 | + /** 票据单号 */ | |
21 | + @NotBlank(message = "票据单号不能为空") | |
22 | + private String invoiceNo; | |
23 | + | |
24 | + /** 收费金额(元) */ | |
25 | + @NotNull(message = "收费金额不能为空") | |
26 | + private BigDecimal chargeAmt; | |
27 | + | |
28 | + /** 缴费方式 */ | |
29 | + @NotNull(message = "缴费方式不能为空") | |
30 | + private String paymentMeth; | |
31 | + | |
32 | + /** 收费类型 */ | |
33 | + @NotNull(message = "收费类型不能为空") | |
34 | + private String chargeType; | |
35 | + | |
36 | + /** 附件(文件id,逗号分隔) */ | |
37 | + private String attachmentFile; | |
38 | + | |
39 | + /** 备注 */ | |
40 | + @NotBlank(message = "异动备注不能为空") | |
41 | + private String remark; | |
42 | + | |
43 | + public Long getId() { | |
44 | + return id; | |
45 | + } | |
46 | + | |
47 | + public void setId(Long id) { | |
48 | + this.id = id; | |
49 | + } | |
50 | + | |
51 | + public String getUserIdCard() { | |
52 | + return userIdCard; | |
53 | + } | |
54 | + | |
55 | + public void setUserIdCard(String userIdCard) { | |
56 | + this.userIdCard = userIdCard; | |
57 | + } | |
58 | + | |
59 | + public String getInvoiceNo() { | |
60 | + return invoiceNo; | |
61 | + } | |
62 | + | |
63 | + public void setInvoiceNo(String invoiceNo) { | |
64 | + this.invoiceNo = invoiceNo; | |
65 | + } | |
66 | + | |
67 | + public BigDecimal getChargeAmt() { | |
68 | + return chargeAmt; | |
69 | + } | |
70 | + | |
71 | + public void setChargeAmt(BigDecimal chargeAmt) { | |
72 | + this.chargeAmt = chargeAmt; | |
73 | + } | |
74 | + | |
75 | + public String getPaymentMeth() { | |
76 | + return paymentMeth; | |
77 | + } | |
78 | + | |
79 | + public void setPaymentMeth(String paymentMeth) { | |
80 | + this.paymentMeth = paymentMeth; | |
81 | + } | |
82 | + | |
83 | + public String getChargeType() { | |
84 | + return chargeType; | |
85 | + } | |
86 | + | |
87 | + public void setChargeType(String chargeType) { | |
88 | + this.chargeType = chargeType; | |
89 | + } | |
90 | + | |
91 | + public String getAttachmentFile() { | |
92 | + return attachmentFile; | |
93 | + } | |
94 | + | |
95 | + public void setAttachmentFile(String attachmentFile) { | |
96 | + this.attachmentFile = attachmentFile; | |
97 | + } | |
98 | + | |
99 | + public String getRemark() { | |
100 | + return remark; | |
101 | + } | |
102 | + | |
103 | + public void setRemark(String remark) { | |
104 | + this.remark = remark; | |
105 | + } | |
106 | +} | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java
... | ... | @@ -3,6 +3,7 @@ package com.chinagas.modules.schsf.service; |
3 | 3 | import com.chinagas.api.system.domain.SysUser; |
4 | 4 | import com.chinagas.modules.schsf.domain.McVisit; |
5 | 5 | import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo; |
6 | +import com.chinagas.modules.schsf.domain.vo.McVisitModificationVo; | |
6 | 7 | import com.chinagas.modules.schsf.domain.vo.McVisitVo; |
7 | 8 | |
8 | 9 | import java.util.List; |
... | ... | @@ -71,10 +72,10 @@ public interface IMcVisitService { |
71 | 72 | /** |
72 | 73 | * 数据异动 |
73 | 74 | * |
74 | - * @param mcVisit | |
75 | + * @param mcVisitModificationVo | |
75 | 76 | * @return |
76 | 77 | */ |
77 | - int updateMcVisitModification(McVisit mcVisit) throws CloneNotSupportedException; | |
78 | + int updateMcVisitModification(McVisitModificationVo mcVisitModificationVo) throws CloneNotSupportedException; | |
78 | 79 | |
79 | 80 | |
80 | 81 | /** | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
... | ... | @@ -11,6 +11,7 @@ import com.chinagas.modules.schsf.domain.McIgnition; |
11 | 11 | import com.chinagas.modules.schsf.domain.McVisit; |
12 | 12 | import com.chinagas.modules.schsf.domain.McVisitStatusNodeInfo; |
13 | 13 | import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo; |
14 | +import com.chinagas.modules.schsf.domain.vo.McVisitModificationVo; | |
14 | 15 | import com.chinagas.modules.schsf.domain.vo.McVisitVo; |
15 | 16 | import com.chinagas.modules.schsf.enums.*; |
16 | 17 | import com.chinagas.modules.schsf.mapper.McVisitMapper; |
... | ... | @@ -372,8 +373,8 @@ public class McVisitServiceImpl implements IMcVisitService { |
372 | 373 | */ |
373 | 374 | @DataScope(deptAlias = "d", userAlias = "u") |
374 | 375 | @Override |
375 | - public int updateMcVisitModification(McVisit Modification_mcVisit) throws CloneNotSupportedException { | |
376 | - McVisit mcVisit_old = mcVisitMapper.selectMcVisitById(Modification_mcVisit.getId()); | |
376 | + public int updateMcVisitModification(McVisitModificationVo mcVisitModificationVo) throws CloneNotSupportedException { | |
377 | + McVisit mcVisit_old = mcVisitMapper.selectMcVisitById(mcVisitModificationVo.getId()); | |
377 | 378 | if (BeanUtil.isEmpty(mcVisit_old)) { |
378 | 379 | throw new RuntimeException("未查询到记录"); |
379 | 380 | } |
... | ... | @@ -384,16 +385,20 @@ public class McVisitServiceImpl implements IMcVisitService { |
384 | 385 | String userId = SecurityUtils.getUserId().toString(); |
385 | 386 | String userAccount = SecurityUtils.getUsername(); |
386 | 387 | String userName = SecurityUtils.getLoginUser().getSysUser().getNickName(); |
387 | - | |
388 | - | |
389 | 388 | McVisit mcVisit_new = mcVisit_old.clone(); |
390 | 389 | mcVisit_new.setUpdateTime(updateTime); |
391 | 390 | mcVisit_new.setUpdateBy(userId); |
392 | 391 | getStatusNodeInfo(mcVisit_new, VisitlsEventEnums.MODIFICATION); |
392 | + mcVisit_new.setUserIdCard(mcVisitModificationVo.getUserIdCard()); | |
393 | + mcVisit_new.setInvoiceNo(mcVisitModificationVo.getInvoiceNo()); | |
394 | + mcVisit_new.setChargeAmt(mcVisitModificationVo.getChargeAmt()); | |
395 | + mcVisit_new.setPaymentMeth(mcVisitModificationVo.getPaymentMeth()); | |
396 | + mcVisit_new.setChargeType(mcVisitModificationVo.getChargeType()); | |
397 | + mcVisit_new.setAttachmentFile(mcVisitModificationVo.getAttachmentFile()); | |
393 | 398 | int i = mcVisitMapper.updateMcVisit(mcVisit_new); |
394 | 399 | //1:添加记录 |
395 | 400 | iMcOperationLogService.insertMcOperationLog("mc_visit", mcVisit_new.getId(), "schsf:mcVisit:modification", |
396 | - "发起异动", "2", Modification_mcVisit.getRemark(), JSON.toJSONString(mcVisit_old), JSON.toJSONString(mcVisit_new)); | |
401 | + "发起异动", "2", mcVisitModificationVo.getRemark(), JSON.toJSONString(mcVisit_old), JSON.toJSONString(mcVisit_new)); | |
397 | 402 | return i; |
398 | 403 | } |
399 | 404 | ... | ... |