Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java

@@ -22,10 +22,10 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.constant.IssueConstant;
 import com.epmet.dto.form.VoteRedisFormDTO;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.lang.reflect.Field;
 import java.util.Map;
 
 /**
@@ -51,16 +51,43 @@ public class IssueVoteDetailRedis {
     }
 
     public VoteRedisFormDTO get(String issueId){
-        VoteRedisFormDTO voteRedis = new VoteRedisFormDTO();
         String key = IssueConstant.REDIS_KEY + issueId;
         Map<String, Object> stringObjectMap = redisUtils.hGetAll(key);
         if (stringObjectMap.size()== NumConstant.ZERO || stringObjectMap == null){
             return new VoteRedisFormDTO();
         }
-        voteRedis.setShouldVoteCount(Integer.valueOf(stringObjectMap.get("shouldVoteCount").toString()));
-        voteRedis.setSupportAmount(Integer.valueOf(stringObjectMap.get("supportAmount").toString()));
-        voteRedis.setOppositionAmount(Integer.valueOf(stringObjectMap.get("oppositionAmount").toString()));
-        return voteRedis;
+        VoteRedisFormDTO voteRedisFormDTO = mapToEntity(stringObjectMap, VoteRedisFormDTO.class);
+        return voteRedisFormDTO;
+    }
+
+    /**
+     * @Description  map 转 Entity
+     * @param map
+     * @param entity
+     * @author zxc
+     */
+    public  <T> T mapToEntity(Map<String, Object> map, Class<T> entity) {
+        T t = null;
+        try {
+            t = entity.newInstance();
+            for(Field field : entity.getDeclaredFields()) {
+                if (map.containsKey(field.getName())) {
+                    boolean flag = field.isAccessible();
+                    field.setAccessible(true);
+                    Object object = map.get(field.getName());
+                    if (object!= null && field.getType().isAssignableFrom(object.getClass())) {
+                        field.set(t, object);
+                    }
+                    field.setAccessible(flag);
+                }
+            }
+            return t;
+        } catch (InstantiationException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return t;
     }
 
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -340,7 +340,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		resultDTO.setIdCard(partyMemberInfoEntity.getIdCard());
 		resultDTO.setMobile(partyMemberInfoEntity.getMobile());
 		resultDTO.setAddress(partyMemberInfoEntity.getStreet() + partyMemberInfoEntity.getEstate() + partyMemberInfoEntity.getBuilding());
-		resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime());
+		resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()/1000);
 
 		//获取党员自动认证信息
 		List<String> failedReason = new ArrayList<>();
@@ -426,7 +426,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			failedReason.add("手机号未匹配");
 			failedReason.add("身份证未匹配");
 			failedReason.add("姓名未匹配");
-			resultDTO.setCertifyTime(partyMemberInfo.getUpdatedTime().getTime());
+			resultDTO.setCertifyTime(partyMemberInfo.getUpdatedTime().getTime()/1000);
 		}
 		resultDTO.setFailedReason(failedReason);
 		//查询网格信息
@@ -488,7 +488,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		resultDTO.setFailedReason(failedReason);
 		//获取人工审核信息
 		PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId());
-		resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime());
+		resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()/1000);
 		resultDTO.setRejectedReason(manualEntity.getRefuseReason());
 		//查询网格信息
 		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfo.getGridId());