Merge branch 'master' into yantai_zhengwu_master

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java

@@ -1,6 +1,7 @@
 package com.epmet.mq.listener.listener;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.auth.constants.AuthOperationConstants;
 import com.epmet.auth.constants.AuthOperationEnum;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.epmet.commons.rocketmq.messages.LoginMQMsg;
@@ -77,7 +78,11 @@ public class AuthOperationLogListener implements MessageListenerConcurrently {
         logEntity.setOperatorName(operatorInfo.getName());
         logEntity.setOperatorMobile(operatorInfo.getMobile());
         logEntity.setOperatingTime(msgObj.getLoginTime());
-        logEntity.setContent("成功登录系统");
+        if(AuthOperationConstants.LOGIN.equals(logEntity.getType())){
+            logEntity.setContent("成功登录系统");
+        }else{
+            logEntity.setContent("成功退出系统");
+        }
 
         DistributedLock distributedLock = null;
         RLock lock = null;

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -28,6 +28,7 @@
           <if test="orgType == 'grid'">
               and e.GRID_ID=#{orgId}
           </if>
+          and e.DEL_FLAG = '0'
           and CUSTOMER_ID = #{customerId}
           and HAPPEN_TIME >= #{queryStartTime}
           and HAPPEN_TIME <![CDATA[<=]]> #{queryEndTime}
@@ -81,7 +82,8 @@
             select date_format(e.HAPPEN_TIME, '%Y-%m') monthName
             from ic_event e
             <where>
-                      e.HAPPEN_TIME >= date_format(#{queryStartTime}, '%Y-%m')
+                e.DEL_FLAG = '0'
+                and e.HAPPEN_TIME >= date_format(#{queryStartTime}, '%Y-%m')
                 and e.HAPPEN_TIME <![CDATA[ <= ]]> date_format(#{queryEndTime}, '%Y-%m')
                 <if test="orgType == 'grid'">
                     and e.GRID_ID =#{orgId}

epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java

@@ -16,7 +16,7 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_VACCINE;
  * @Author zxc
  * @Date 2022/11/22 14:08
  */
-@Component
+// @Component
 @Slf4j
 public class YanTaiTripReportSyncProcessor extends AbstractDataSyncJobProcessor {