From 2e155fe72afb511bfdfe11a18be7c81907d42793 Mon Sep 17 00:00:00 2001 From: schry <2433098676@qq.com> Date: Mon, 3 Jul 2023 11:36:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sup/UserRegisterController.java | 14 ++++++- .../glxp/api/entity/sup/UserCertEntity.java | 38 ------------------- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java index 506c7bc..b5c760a 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java +++ b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java @@ -211,9 +211,9 @@ public class UserRegisterController extends BaseController { // BeanUtils.copyProperties(registComPerResponse,userPersonEntity); BeanUtils.copyProperties(registComPerResponse, userCompanyEntity); userRegisterEntity.setId(Long.valueOf(registComPerResponse.getUrId())); - System.out.println(Long.valueOf(registComPerResponse.getUrId())); + // userPersonEntity.setId(Long.valueOf(registComPerResponse.getUpId())); - userCompanyEntity.setId(Long.valueOf(registComPerResponse.getUrId())); + userCompanyEntity.setId(Long.valueOf(registComPerResponse.getUcId())); userCompanyEntity.setContactWay(registComPerResponse.getFmobile()); if ("key".equals(registComPerResponse.getKey())) { //提交审核 @@ -323,6 +323,15 @@ public class UserRegisterController extends BaseController { userRegisterService.updateById(userRegisterEntity); userCompanyService.updateById(userCompanyEntity); userCheckService.insert(userCheckEntity); + UserCompanyEntity company = userCompanyService.getById(registComPerResponse.getUcId()); + supCompanyEntity.setCustomerId(String.valueOf(company.getId())); + supCompanyEntity.setCompanyName(company.getCompanyName()); + supCompanyEntity.setAuditStatus(Integer.valueOf(userCompanyEntity.getCheckStatus())); + supCompanyEntity.setCreditNum(company.getCreditNum()); + supCompanyEntity.setBussinessStatus(Integer.valueOf(company.getBussinessStatus())); + supCompanyEntity.setCreateTime(company.getRegisterTime()); + supCompanyEntity.setAuditStatus(Integer.valueOf(company.getCheckStatus())); + supCompanyService.insertCompany(supCompanyEntity); // userCertSetService.insert(userCertSetEntity); return ResultVOUtils.success(); } @@ -359,3 +368,4 @@ public class UserRegisterController extends BaseController { } + diff --git a/src/main/java/com/glxp/api/entity/sup/UserCertEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCertEntity.java index b0eab4c..6fe6194 100644 --- a/src/main/java/com/glxp/api/entity/sup/UserCertEntity.java +++ b/src/main/java/com/glxp/api/entity/sup/UserCertEntity.java @@ -133,46 +133,8 @@ public class UserCertEntity implements Serializable { @TableField("CustomerId") private String customerId; - /** - * 有效期 - */ - @TableField("vailDate") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date vailDate; - - - @TableField("remark1") - private String remark1; - /** - * 证书类型:1:供应商;2.生产企业;3.产品品种 - */ - @TableField("type") - private Integer type; - - /** - * 生产企业ID外键 - */ - @TableField("manufacturerIdFk") - private String manufacturerIdFk; - /** - * 产品证书ID外键 - */ - @TableField("productIdFk") - private String productIdFk; - - /** - * 审核状态 - */ - @TableField("auditStatus") - private Integer auditStatus; - - /** - * 审核说明 - */ - @TableField("auditComment") - private String auditComment;