Commit 139a6e84 authored by suhuiguang's avatar suhuiguang

1.app证扫码扩展逻辑实现,调整字段名称

parent cfb3429d
...@@ -116,6 +116,6 @@ public class JgUseRegistrationManageDto extends BaseDto { ...@@ -116,6 +116,6 @@ public class JgUseRegistrationManageDto extends BaseDto {
@ApiModelProperty(value = "登记版本号") @ApiModelProperty(value = "登记版本号")
private Integer version; private Integer version;
@ApiModelProperty(value = "注销原因") @ApiModelProperty(value = "变更原因")
private String deregisterReason; private String changeReason;
} }
...@@ -58,7 +58,7 @@ public class CertDetailServiceImpl { ...@@ -58,7 +58,7 @@ public class CertDetailServiceImpl {
} }
private String buildErrorInfo(JgUseRegistrationManageDto jgUseRegistrationManage) { private String buildErrorInfo(JgUseRegistrationManageDto jgUseRegistrationManage) {
return "该证发生" + jgUseRegistrationManage.getDeregisterReason() + "导致证注销, 请联系监管单位进行换证!"; return "该证发生" + jgUseRegistrationManage.getChangeReason() + "导致证注销, 请联系监管单位进行换证!";
} }
private String deCodeByAES(@NotBlank(message = "证类型不能为空!") String data) { private String deCodeByAES(@NotBlank(message = "证类型不能为空!") String data) {
......
...@@ -116,7 +116,7 @@ public class JgUseRegistrationManageDto extends BaseDto { ...@@ -116,7 +116,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
@ApiModelProperty(value = "登记版本号") @ApiModelProperty(value = "登记版本号")
private Integer version; private Integer version;
@ApiModelProperty(value = "注销原因") @ApiModelProperty(value = "变更原因")
private String deregisterReason; private String changeReason;
} }
...@@ -204,9 +204,9 @@ public class JgUseRegistrationManage extends BaseEntity { ...@@ -204,9 +204,9 @@ public class JgUseRegistrationManage extends BaseEntity {
private Integer version = 1; private Integer version = 1;
/** /**
* 注销原因 * 变更原因
*/ */
@TableField("deregister_reason") @TableField("change_reason")
private String deregisterReason; private String changeReason;
} }
...@@ -1023,6 +1023,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -1023,6 +1023,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
registrationManage.setReceiveOrgName(registration.getReceiveOrgName()); registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode()); registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
registrationManage.setAuditPassDate(registration.getAuditPassDate()); registrationManage.setAuditPassDate(registration.getAuditPassDate());
registrationManage.setVersion(registrationManage.getVersion() + 1);
registrationManage.setChangeReason(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {//回填新单位地址 if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {//回填新单位地址
TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode())); TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode()));
if (useCodeResult != null) { if (useCodeResult != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment