Merge branch 'feature/社群' into 'master'

Feature/社群

See merge request !828

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabQywxErrorLogMapper.java

@@ -22,11 +22,6 @@ public interface TabQywxErrorLogMapper {
 
     /**
      * 分页列表
-     *
-     * @param qywxErrorLogListQDTO qdto qywx错误日志列表
-     * @return {@link List }<{@link TabQywxErrorLog }>
-     * @author mozhu
-     * @date 2022-04-18 16:55:23
      */
     List<TabQywxErrorLog> queryListByPage(QywxErrorLogListQDTO qywxErrorLogListQDTO);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QywxErrorLogApiServiceImpl.java

@@ -41,7 +41,7 @@ public class QywxErrorLogApiServiceImpl implements QywxErrorLogApiService {
     @Override
     public Page<QywxErrorLogDTO> queryListByPage(QywxErrorLogListQDTO qywxErrorLogListQDTO) {
         qywxErrorLogListQDTO.setStartDate(DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(qywxErrorLogListQDTO.getStartDate())), DatePattern.NORM_DATETIME_PATTERN));
-        qywxErrorLogListQDTO.setEndDate(DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(qywxErrorLogListQDTO.getEndDate())), DatePattern.NORM_DATETIME_PATTERN));
+        qywxErrorLogListQDTO.setEndDate(DateUtil.format(DateUtil.endOfDay(DateUtil.parse(qywxErrorLogListQDTO.getEndDate())), DatePattern.NORM_DATETIME_PATTERN));
         PageHelper.startPage(qywxErrorLogListQDTO.getPageNum(), qywxErrorLogListQDTO.getPageSize());
         List<TabQywxErrorLog> list = this.tabQywxErrorLogService.queryListByPage(qywxErrorLogListQDTO);
         return PageUtil.changePageHelperToCurrentPage(new PageInfo<>(list), QywxErrorLogDTO.class);

haoban-manage3-service/src/main/resources/jdbc-haoban-manage-service.xml

@@ -12,7 +12,7 @@
 
     <context:annotation-config />
 
-    <import resource="classpath*:applicationContext-db-only.xml"/>
+    <import resource="classpath*:applicationContext-db-only-with-emoji.xml"/>
 
     <bean class="com.gic.haoban.common.init.HaobanSqlSessionFactoryBean" id="sqlSessionFactory">
         <property name="dataSource" ref="dataSource" />