操作日志根据合同显示

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/OperationLogVO.java

@@ -47,4 +47,6 @@ public class OperationLogVO extends OperationLog {
     @ApiModelProperty("结束时间")
     private String endTime;
 
+    private Long contractId;
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/OperationLogController.java

@@ -17,6 +17,7 @@
 package org.springblade.business.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -25,6 +26,7 @@ import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.jetbrains.annotations.NotNull;
+import org.springblade.business.mapper.OperationLogMapper;
 import org.springblade.business.wrapper.OperationLogWrapper;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -60,6 +62,8 @@ public class OperationLogController extends BladeController {
 
     private final IDictBizClient dictBizClient;
 
+    private final OperationLogMapper logMapper;
+
 
 
     /**
@@ -156,8 +160,9 @@ public class OperationLogController extends BladeController {
         }
 
 
-
-        IPage<OperationLog> pages = operationLogService.page(Condition.getPage(query), wrapper.lambda().orderBy(true, false, OperationLog::getCreateTime));
+        IPage<OperationLog> pages = new Page<>(query.getCurrent(),query.getSize());
+//        IPage<OperationLog> pages = operationLogService.page(Condition.getPage(query), wrapper.lambda().orderBy(true, false, OperationLog::getCreateTime));
+        pages = logMapper.getPage(pages,operationLog);
 
         //获取业务字典
         List<DictBiz> dictBizList = this.dictBizClient.getList("operation_type", "notRoot").getData();

blade-service/blade-business/src/main/java/org/springblade/business/mapper/OperationLogMapper.java

@@ -16,9 +16,11 @@
  */
 package org.springblade.business.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.business.entity.OperationLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.business.vo.OperationLogVO;
 
 import java.util.List;
 
@@ -37,4 +39,6 @@ public interface OperationLogMapper extends BaseMapper<OperationLog> {
     List<String> queryBusinessModule(@Param("userId") Long userId);
 
     Long getAdminId();
+
+    IPage<OperationLog> getPage(IPage<OperationLog> pages,@Param("vo") OperationLogVO operationLog);
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/OperationLogMapper.xml

@@ -52,5 +52,11 @@
     <select id="getAdminId" resultType="java.lang.Long">
         select id from blade_role WHERE role_name = '超级管理员'
     </select>
+    <select id="getPage" resultType="org.springblade.business.entity.OperationLog">
+        select *
+        from u_operation_log uol where is_deleted = 0
+        and (SELECT contract_id from m_wbs_tree_contract WHERE p_key_id = SUBSTRING_INDEX(uol.business_id,",",1)) = #{vo.contractId}
+        order by uol.create_time desc
+    </select>
 
 </mapper>