Merge remote-tracking branch 'remotes/origin/dev_report_bugfix' into dev_temp

# Conflicts:
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -238,7 +238,7 @@
     <select id="difficultyRank" resultType="com.epmet.project.dto.result.ProjectDifficultRankResultDTO">
          SELECT
             diff.EVENT_ID AS projectId,
-            diff.EVENT_CONTENT AS title,
+            ifnull(diff.EVENT_CONTENT,diff.EVENT_TITLE) AS title,
             diff.EVENT_STATUS_CODE AS statusCode,
             diff.EVENT_SOURCE AS gridName,
             diff.EVENT_IMG_URL AS imgUrl,
@@ -275,4 +275,4 @@
 		WHERE EVENT_ID = #{eventId}
 		ORDER BY SORT
     </select>
-</mapper>
+</mapper>

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -51,12 +51,12 @@ import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.IssueVoteDetailService;
 import com.epmet.service.IssueVoteStatisticalService;
 import com.epmet.utils.ModuleConstants;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -403,9 +403,12 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
                         }
                     }*/
 
-                    if(!toInsert.isEmpty())
                     // 批量插入
-                    baseDao.insertBatch(toInsert);
+                    if(CollectionUtils.isNotEmpty(toInsert)) {
+                        List<IssueVoteStatisticalEntity> issueVoteStatisticalEntityList = ConvertUtils.sourceToTarget(toInsert,
+                                IssueVoteStatisticalEntity.class);
+                        insertBatch(issueVoteStatisticalEntityList);
+                    }
                 }
            //}
          //else if (ids.size() < statisiticalIds.size()) {
@@ -433,8 +436,9 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         //根据ids去缓存中取值
         List<IssueVoteStatisticalDTO> listToAdd = new ArrayList<>();
         setVotableCountsAndUpdateCache(listToAdd,issues,votableCountMap);
+        List<IssueVoteStatisticalEntity> issueVoteStatisticalEntityList = ConvertUtils.sourceToTarget(listToAdd, IssueVoteStatisticalEntity.class);
          //  批量新增listToAdd
-         baseDao.insertBatch(listToAdd);
+         insertBatch(issueVoteStatisticalEntityList);
     }
 
 
@@ -614,4 +618,4 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         return collect;
     }
 
-}
+}