From a29ee9355404e4daa3188307065e0cc7792a1b91 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Apr 2020 17:12:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81-=E5=BE=85?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8=E3=80=81=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/AuditedPartyMemberResultDTO.java | 2 +- .../com/epmet/dto/result/AuditingPartyMemberResultDTO.java | 2 +- .../com/epmet/service/impl/CustomerGridServiceImpl.java | 2 ++ .../dto/partymember/result/ReviewedParyMemberResultDTO.java | 2 +- .../partymember/result/UnderReviewParyMemberResultDTO.java | 2 +- .../resources/mapper/partymember/PartymemberBaseInfoDao.xml | 6 +++--- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java index 96cfa3ffe4..7324243e89 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java @@ -31,7 +31,7 @@ public class AuditedPartyMemberResultDTO implements Serializable { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * auto_confirm_failed:自动认证失败,rejected :拒绝 diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java index b7fa6ff38d..21733fe9fb 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java @@ -32,7 +32,7 @@ public class AuditingPartyMemberResultDTO implements Serializable { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * 提交网格：XXX街道-XXX社区-XXX网格 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index ab835da389..8f54c62f10 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -435,7 +435,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl(); } + gridInfoResultDTO.setGridId(gridId); gridInfoResultDTO.setCustomerId(customerGridDTO.getCustomerId()); + gridInfoResultDTO.setGridName(customerGridDTO.getGridName()); String pids=customerGridDTO.getPids(); String[] pidArray = pids.split(":"); for(String agencyId:pidArray){ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java index 704b9f9b7a..4b9d082184 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java @@ -29,7 +29,7 @@ public class ReviewedParyMemberResultDTO { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * auto_confirm_failed:自动认证失败,rejected :拒绝 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java index f625e3117c..bef4f48ad2 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java @@ -32,7 +32,7 @@ public class UnderReviewParyMemberResultDTO implements Serializable { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * read已读unread未读 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml index 809493652a..2cbad32ae0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml @@ -60,7 +60,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - pi.CREATED_TIME AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pcm.READ_FLAG AS readFlag, pi.id as partyMemberId, pca.id as autoId, @@ -85,7 +85,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - pi.CREATED_TIME AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pi.CONFIRM_RESULT AS status, pi.id as partyMemberId, pca.id as autoId, @@ -102,7 +102,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - pi.CREATED_TIME AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pi.CONFIRM_RESULT AS status, pi.id as partyMemberId, pca.id as autoId,