diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java index 3f33cae..9189774 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java +++ b/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; import com.chinagas.common.security.enums.Logical; import com.chinagas.modules.schsf.domain.McVisit; import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo; +import com.chinagas.modules.schsf.domain.vo.McVisitModificationVo; import com.chinagas.modules.schsf.domain.vo.McVisitVo; import com.chinagas.modules.schsf.enums.YesNoEnums; import com.chinagas.modules.schsf.service.IMcVisitService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -131,7 +133,7 @@ public class McVisitController extends BaseController { @RequirePermission("schsf:mcVisit:ticket_submitAuditOne") @Log(title = "拜访工单", businessType = BusinessType.INSERT) @PostMapping("/ticket/submitAuditOne") - public AjaxResult ticketSubmitAuditOne(@RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { + public AjaxResult ticketSubmitAuditOne(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { mcVisitAuditVo.setType("1"); mcVisitService.SubmitAudit(mcVisitAuditVo); return AjaxResult.success(); @@ -144,7 +146,7 @@ public class McVisitController extends BaseController { @RequirePermission("schsf:mcVisit:ticket_submitAuditTwo") @Log(title = "拜访工单", businessType = BusinessType.INSERT) @PostMapping("/ticket/submitAuditTwo") - public AjaxResult ticketsubmitAuditTwo(@RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { + public AjaxResult ticketsubmitAuditTwo(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { mcVisitAuditVo.setType("2"); mcVisitService.SubmitAudit(mcVisitAuditVo); return AjaxResult.success(); @@ -158,7 +160,7 @@ public class McVisitController extends BaseController { @RequirePermission("schsf:mcVisit:modification_submitAuditOne") @Log(title = "拜访工单", businessType = BusinessType.INSERT) @PostMapping("/modification/submitAuditOne") - public AjaxResult modificationSubmitAuditOne(@RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { + public AjaxResult modificationSubmitAuditOne(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { mcVisitAuditVo.setType("3"); mcVisitService.SubmitAudit(mcVisitAuditVo); return AjaxResult.success(); @@ -171,7 +173,7 @@ public class McVisitController extends BaseController { @RequirePermission("schsf:mcVisit:modification_submitAuditTwo") @Log(title = "拜访工单", businessType = BusinessType.INSERT) @PostMapping("/modification/submitAuditTwo") - public AjaxResult modificationSubmitAuditTwo(@RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { + public AjaxResult modificationSubmitAuditTwo(@Validated @RequestBody McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException { mcVisitAuditVo.setType("4"); mcVisitService.SubmitAudit(mcVisitAuditVo); return AjaxResult.success(); @@ -188,7 +190,7 @@ public class McVisitController extends BaseController { @RequirePermission("schsf:mcVisit:modification") @Log(title = "拜访工单", businessType = BusinessType.UPDATE) @PostMapping("/modification") - public AjaxResult modification(@RequestBody McVisit mcVisit) throws CloneNotSupportedException { + public AjaxResult modification(@Validated @RequestBody McVisitModificationVo mcVisitModificationVo) throws CloneNotSupportedException { // McVisit mcVisit = new McVisit(); // mcVisit.setId(id); // mcVisit.setUserIdCard(userIdCard); @@ -197,7 +199,7 @@ public class McVisitController extends BaseController { // mcVisit.setPaymentMeth(paymentMeth); // mcVisit.setChargeType(chargeType); // mcVisit.setRemark(remark); - return toAjax(mcVisitService.updateMcVisitModification(mcVisit)); + return toAjax(mcVisitService.updateMcVisitModification(mcVisitModificationVo)); } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitAuditVo.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitAuditVo.java index 634d431..ff815d6 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitAuditVo.java +++ b/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; import com.chinagas.common.core.web.domain.BaseEntity; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + public class McVisitAuditVo extends BaseEntity { private String type; + @NotNull(message = "ID不能为空") private Long id; + @NotBlank(message = "状态不能为空") private String status; private String remarks; diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitModificationVo.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitModificationVo.java new file mode 100644 index 0000000..b7405e5 --- /dev/null +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/vo/McVisitModificationVo.java @@ -0,0 +1,106 @@ +package com.chinagas.modules.schsf.domain.vo; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +/** + * 数据异动申请 + */ +public class McVisitModificationVo { + /** 主键id */ + @NotNull(message = "ID不能为空") + private Long id; + + + /** 身份证号 */ + @NotBlank(message = "身份证号不能为空") + private String userIdCard; + + /** 票据单号 */ + @NotBlank(message = "票据单号不能为空") + private String invoiceNo; + + /** 收费金额(元) */ + @NotNull(message = "收费金额不能为空") + private BigDecimal chargeAmt; + + /** 缴费方式 */ + @NotNull(message = "缴费方式不能为空") + private String paymentMeth; + + /** 收费类型 */ + @NotNull(message = "收费类型不能为空") + private String chargeType; + + /** 附件(文件id，逗号分隔) */ + private String attachmentFile; + + /** 备注 */ + @NotBlank(message = "异动备注不能为空") + private String remark; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUserIdCard() { + return userIdCard; + } + + public void setUserIdCard(String userIdCard) { + this.userIdCard = userIdCard; + } + + public String getInvoiceNo() { + return invoiceNo; + } + + public void setInvoiceNo(String invoiceNo) { + this.invoiceNo = invoiceNo; + } + + public BigDecimal getChargeAmt() { + return chargeAmt; + } + + public void setChargeAmt(BigDecimal chargeAmt) { + this.chargeAmt = chargeAmt; + } + + public String getPaymentMeth() { + return paymentMeth; + } + + public void setPaymentMeth(String paymentMeth) { + this.paymentMeth = paymentMeth; + } + + public String getChargeType() { + return chargeType; + } + + public void setChargeType(String chargeType) { + this.chargeType = chargeType; + } + + public String getAttachmentFile() { + return attachmentFile; + } + + public void setAttachmentFile(String attachmentFile) { + this.attachmentFile = attachmentFile; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java index 6bc6021..132fe46 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java +++ b/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; import com.chinagas.api.system.domain.SysUser; import com.chinagas.modules.schsf.domain.McVisit; import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo; +import com.chinagas.modules.schsf.domain.vo.McVisitModificationVo; import com.chinagas.modules.schsf.domain.vo.McVisitVo; import java.util.List; @@ -71,10 +72,10 @@ public interface IMcVisitService { /** * 数据异动 * - * @param mcVisit + * @param mcVisitModificationVo * @return */ - int updateMcVisitModification(McVisit mcVisit) throws CloneNotSupportedException; + int updateMcVisitModification(McVisitModificationVo mcVisitModificationVo) throws CloneNotSupportedException; /** diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java index 8cad021..0aa783c 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java +++ b/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; import com.chinagas.modules.schsf.domain.McVisit; import com.chinagas.modules.schsf.domain.McVisitStatusNodeInfo; import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo; +import com.chinagas.modules.schsf.domain.vo.McVisitModificationVo; import com.chinagas.modules.schsf.domain.vo.McVisitVo; import com.chinagas.modules.schsf.enums.*; import com.chinagas.modules.schsf.mapper.McVisitMapper; @@ -372,8 +373,8 @@ public class McVisitServiceImpl implements IMcVisitService { */ @DataScope(deptAlias = "d", userAlias = "u") @Override - public int updateMcVisitModification(McVisit Modification_mcVisit) throws CloneNotSupportedException { - McVisit mcVisit_old = mcVisitMapper.selectMcVisitById(Modification_mcVisit.getId()); + public int updateMcVisitModification(McVisitModificationVo mcVisitModificationVo) throws CloneNotSupportedException { + McVisit mcVisit_old = mcVisitMapper.selectMcVisitById(mcVisitModificationVo.getId()); if (BeanUtil.isEmpty(mcVisit_old)) { throw new RuntimeException("未查询到记录"); } @@ -384,16 +385,20 @@ public class McVisitServiceImpl implements IMcVisitService { String userId = SecurityUtils.getUserId().toString(); String userAccount = SecurityUtils.getUsername(); String userName = SecurityUtils.getLoginUser().getSysUser().getNickName(); - - McVisit mcVisit_new = mcVisit_old.clone(); mcVisit_new.setUpdateTime(updateTime); mcVisit_new.setUpdateBy(userId); getStatusNodeInfo(mcVisit_new, VisitlsEventEnums.MODIFICATION); + mcVisit_new.setUserIdCard(mcVisitModificationVo.getUserIdCard()); + mcVisit_new.setInvoiceNo(mcVisitModificationVo.getInvoiceNo()); + mcVisit_new.setChargeAmt(mcVisitModificationVo.getChargeAmt()); + mcVisit_new.setPaymentMeth(mcVisitModificationVo.getPaymentMeth()); + mcVisit_new.setChargeType(mcVisitModificationVo.getChargeType()); + mcVisit_new.setAttachmentFile(mcVisitModificationVo.getAttachmentFile()); int i = mcVisitMapper.updateMcVisit(mcVisit_new); //1:添加记录 iMcOperationLogService.insertMcOperationLog("mc_visit", mcVisit_new.getId(), "schsf:mcVisit:modification", - "发起异动", "2", Modification_mcVisit.getRemark(), JSON.toJSONString(mcVisit_old), JSON.toJSONString(mcVisit_new)); + "发起异动", "2", mcVisitModificationVo.getRemark(), JSON.toJSONString(mcVisit_old), JSON.toJSONString(mcVisit_new)); return i; } -- libgit2 0.21.2