diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java index 41ee82265b..d3ee4e2a5e 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java @@ -52,7 +52,7 @@ public class CertifiedDetailResultDTO implements Serializable { /** * 注册时间(进入本平台的时间) */ - private Long certifyTime; + private Long registerTime; /** * 工作单位/所处街道 diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java index 1cba7b47ab..e3e441283f 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java @@ -16,19 +16,16 @@ public class CustomerHomeFormDTO implements Serializable { /** * 客户ID */ - @NotBlank(message = "客户ID不能为空") private String customerId; /** * 所属端类型0.居民端,1.政府端 */ - @NotBlank(message = "所属端类型不能为空(0居民端1政府端)") private String clientType; /** * 状态:0.已发布 1.草稿 */ - @NotBlank(message = "状态(0已发布1草稿)") private String status; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java index 60689d7f01..7c1b813838 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java @@ -53,6 +53,7 @@ public class HomeServiceImpl implements HomeService { public Result getHomeDesignByCustomer(CustomerHomeFormDTO formDTO) { HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO(); //根据客户id,所属端获取客户首页配置的设计稿 + formDTO.setStatus(OperCustomizeConstant.STATUS_DRAFT); List list = customerHomeDetailDao.selectCustomerHomeDetail(formDTO); List titleList = new ArrayList<>(); List topList = new ArrayList<>(); diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedDetailResultDTO.java index e94ec46f07..433e1f9c4a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedDetailResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedDetailResultDTO.java @@ -57,7 +57,7 @@ public class CertifiedDetailResultDTO implements Serializable { /** * 注册时间(进入本平台的时间) */ - private Long certifyTime; + private Long registerTime; /** * 工作单位/所处街道 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index 37861ebcc4..680a3ba35a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -185,7 +185,7 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl registerTime = epmetUserFeignClient.createdTimeByUserId(time); - certifiedDetail.setCertifyTime(registerTime.getData().getRegisterTime()); + certifiedDetail.setRegisterTime(registerTime.getData().getRegisterTime()); //查询gridFullName Result gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedDetail.getGridId()); String gridFullPath = "";