Commit 6f2ca29f authored by 韩桐桐's avatar 韩桐桐

fix(jg):1,使用登记添加了创建人姓名,2,使用登记流水内容修改

parent 32c39296
...@@ -90,6 +90,9 @@ public class JgUseRegistrationDto extends BaseDto { ...@@ -90,6 +90,9 @@ public class JgUseRegistrationDto extends BaseDto {
@ApiModelProperty(value = "创建人ID") @ApiModelProperty(value = "创建人ID")
private String createUserId; private String createUserId;
@ApiModelProperty(value = "创建人姓名")
private String createUserName;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
......
...@@ -134,6 +134,12 @@ public class JgUseRegistration extends BaseEntity { ...@@ -134,6 +134,12 @@ public class JgUseRegistration extends BaseEntity {
private String createUserId; private String createUserId;
/** /**
* 创建人姓名
*/
@TableField("create_user_name")
private String createUserName;
/**
* 创建时间 * 创建时间
*/ */
@TableField("create_date") @TableField("create_date")
......
...@@ -474,6 +474,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -474,6 +474,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] : company.getCompanyCode()); company.getCompanyCode().split("_")[1] : company.getCompanyCode());
jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId()); jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
jgUseRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) { if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString()); jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
} }
...@@ -710,6 +711,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -710,6 +711,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
useRegistration.setManageType(map.getString("manageType")); useRegistration.setManageType(map.getString("manageType"));
useRegistration.setPromoter(reginParams.getUserModel().getUserId()); useRegistration.setPromoter(reginParams.getUserModel().getUserId());
useRegistration.setCreateUserId(reginParams.getUserModel().getUserId()); useRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
useRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
// 使用单位信息 // 使用单位信息
useRegistration.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? useRegistration.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyName().split("_")[1] : company.getCompanyName()); company.getCompanyName().split("_")[1] : company.getCompanyName());
...@@ -1346,7 +1348,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1346,7 +1348,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private String buildRecordContent(JgUseRegistration obj, String businessName, Boolean flag) { private String buildRecordContent(JgUseRegistration obj, String businessName, Boolean flag) {
//张三办理了【单位变更】 ,单号【DWBG202407050001】,办理日期2024-07-05 //张三办理了【单位变更】 ,单号【DWBG202407050001】,办理日期2024-07-05
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
return obj.getRecUserName() + "办理了【" + businessName + (flag ? "设备增补" : "") + "】," + return obj.getCreateUserName() + "办理了【" + businessName + (flag ? "设备增补" : "") + "】," +
"单号【" + obj.getApplyNo() + "】,申请日期" + simpleDateFormat.format(obj.getRecDate()); "单号【" + obj.getApplyNo() + "】,申请日期" + simpleDateFormat.format(obj.getRecDate());
} }
...@@ -2650,6 +2652,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2650,6 +2652,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] : company.getCompanyCode()); company.getCompanyCode().split("_")[1] : company.getCompanyCode());
jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId()); jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
jgUseRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) { if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString()); jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
} }
...@@ -2974,7 +2977,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2974,7 +2977,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord(); JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
jgCertificateChangeRecord.setApplyNo(""); jgCertificateChangeRecord.setApplyNo("");
try { try {
changeContent = jgUseRegistration.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】," + changeContent = jgUseRegistration.getCreateUserName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】," +
"办理日期" + map.get("installStartDate"); "办理日期" + map.get("installStartDate");
jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("installStartDate"))); jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("installStartDate")));
jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("installStartDate"))); jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("installStartDate")));
...@@ -3005,7 +3008,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -3005,7 +3008,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord(); JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
jgCertificateChangeRecord.setApplyNo(""); jgCertificateChangeRecord.setApplyNo("");
try { try {
changeContent = jgUseRegistration.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName() + "】," + changeContent = jgUseRegistration.getCreateUserName() + "办理了【" + BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName() + "】," +
"办理日期" + map.get("installStartDate"); "办理日期" + map.get("installStartDate");
jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("informEnd"))); jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("informEnd")));
jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("informStart"))); jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("informStart")));
......
...@@ -195,6 +195,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -195,6 +195,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
throw new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同充装介质设备!"); throw new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同充装介质设备!");
} }
if (SUBMIT_TYPE_FLOW.equals(submit)) { if (SUBMIT_TYPE_FLOW.equals(submit)) {
// 检查设备是否已经在使用
// 个人主体的身份证(6600_620422199903010258) 特殊处理 只取_后的身份证号码 // 个人主体的身份证(6600_620422199903010258) 特殊处理 只取_后的身份证号码
this.repeatUsedEquipCheck(equipmentLists, this.repeatUsedEquipCheck(equipmentLists,
CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode()); CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode());
......
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