bug修改

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java

@@ -383,6 +383,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
                 // 更新人员活动关系表
                 ActUserRelationDTO actUserRelationDTO = data.get(i);
                 actUserRelationDTO.setStatus(actUserDefaultState);// 默认状态
+                actUserRelationDTO.setAuditTime(new Date()); //自动审核时间
                 ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class);
                 updateById(entity);
                 // 存储活动日志表

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -245,7 +245,7 @@
             <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
         <if test='actType != null and actType != "" and actType == "5"'>
-            <![CDATA[ AND DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> #{timestamp}
+            <![CDATA[ AND DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
         </if>
         <if test='actType != null and actType != "" and actType != "5"'>
             AND relation.STATUS = #{actType}