党员认证-待审核列表、审核历史接口bug修改

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 :拒绝

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网格

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<CustomerGridDao, Cu
         if(null==customerGridDTO){
             return new Result<>();
         }
+        gridInfoResultDTO.setGridId(gridId);
         gridInfoResultDTO.setCustomerId(customerGridDTO.getCustomerId());
+        gridInfoResultDTO.setGridName(customerGridDTO.getGridName());
         String pids=customerGridDTO.getPids();
         String[] pidArray = pids.split(":");
         for(String agencyId:pidArray){

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 :拒绝

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未读

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,