Merge branch 'feature-2022-11-log' into 'master'

fix:日志

See merge request !418

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/logrecord/HbLogRecordController.java

@@ -10,6 +10,7 @@ import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.web.qo.logrecord.LogRecordQo;
 import com.gic.haoban.manage.web.vo.logrecord.LogRecordTypeVO;
 import com.gic.log.record.bean.OptRecordLog;
+import com.gic.log.record.bean.OptRecordLogHaoban;
 import com.gic.log.record.enums.OrderEnum;
 import com.gic.log.record.service.LogSearchApiService;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
@@ -54,14 +55,14 @@ public class HbLogRecordController {
             eid = loginUser.getEnterpriseId() ;
         }
         //使用lambda拼装查询表达式
-        LogQueryWrapper<OptRecordLog> queryWrapper = new LogQueryWrapper<>();
-        queryWrapper.eq(OptRecordLog::getEnterpriseId, eid).eq(OptRecordLog::getStatusFlag, 1);
-        queryWrapper.eq(OptRecordLog::getWxEnterpriseId, loginUser.getWxEnterpriseId());
+        LogQueryWrapper<OptRecordLogHaoban> queryWrapper = new LogQueryWrapper<>();
+        queryWrapper.eq(OptRecordLogHaoban::getEnterpriseId, eid).eq(OptRecordLogHaoban::getStatusFlag, 1);
+        queryWrapper.eq(OptRecordLogHaoban::getWxEnterpriseId, loginUser.getWxEnterpriseId());
         if (StringUtils.isNotBlank(qo.getBusinessType())) {
-            queryWrapper.eq(OptRecordLog::getBusinessType, qo.getBusinessType());
+            queryWrapper.eq(OptRecordLogHaoban::getBusinessType, qo.getBusinessType());
         }
         if (StringUtils.isNotBlank(qo.getOptType())) {
-            queryWrapper.eq(OptRecordLog::getOptType, qo.getOptType());
+            queryWrapper.eq(OptRecordLogHaoban::getOptType, qo.getOptType());
         }
         if (StringUtils.isNoneBlank(qo.getStartDate(),qo.getEndDate())) {
             String endDate = qo.getEndDate() + " 23:59:59";
@@ -69,24 +70,24 @@ public class HbLogRecordController {
             try {
                 Date startDateD = DateUtils.parseDate(startDate, "yyyy-MM-dd HH:mm:ss");
                 Date endDateD = DateUtils.parseDate(endDate, "yyyy-MM-dd HH:mm:ss");
-                queryWrapper.between(OptRecordLog::getCreateTime,startDateD,endDateD);
+                queryWrapper.between(OptRecordLogHaoban::getCreateTime,startDateD,endDateD);
             } catch (Exception e) {
                 e.printStackTrace();
             }
         }
         if(null == loginUser || StringUtils.isBlank(loginUser.getOperationUserName())) {
             //历史数据会刷成0.
-            queryWrapper.eq(OptRecordLog::getYwFlag, 0);
+            queryWrapper.eq(OptRecordLogHaoban::getYwFlag, 0);
         }
         if (StringUtils.isNotBlank(qo.getSearch())) {
-            queryWrapper.like(OptRecordLog::getContent, qo.getSearch());
+            queryWrapper.like(OptRecordLogHaoban::getContent, qo.getSearch());
         }
         if (StringUtils.isNotBlank(qo.getOptUser())) {
-            queryWrapper.eq(OptRecordLog::getUserId, qo.getOptUser());
+            queryWrapper.eq(OptRecordLogHaoban::getUserId, qo.getOptUser());
         }
         //0:gic 1:好办 2：运维
-        queryWrapper.eq(OptRecordLog::getSystemType, systemType);
-        queryWrapper.orderBy(OptRecordLog::getCreateTime, OrderEnum.DESC);
+        queryWrapper.eq(OptRecordLogHaoban::getSystemType, systemType);
+        queryWrapper.orderBy(OptRecordLogHaoban::getCreateTime, OrderEnum.DESC);
 
         BasePageInfo basePageInfo = new BasePageInfo();
         basePageInfo.setPageNum(pageNum);