获取费用日志接口（4k同步用）

cost-service/src/main/java/com/blt/other/module/cost/controller/CostController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.blt.other.common.annotation.LoginIgnore;
+import com.blt.other.database.model.CostLogDomain;
 import com.blt.other.module.cost.dao.CostDao;
 import com.blt.other.module.cost.dto.request.AllCheckCostListReq;
 import com.blt.other.module.cost.dto.request.CheckCostListReq;
@@ -508,9 +509,9 @@ public class CostController {
     }
 
     @LoginIgnore
-    @ApiOperation("获取4k数据")
+    @ApiOperation("获取4k费用数据")
     @GetMapping("/costFor4k/{sourceFrom}/{pageSize}/{pageNum}")
-    public CostResult<Page<CostDomain>> getTypeName(@PathVariable("sourceFrom") String sourceFrom,
+    public CostResult<Page<CostDomain>> getCostFor4k(@PathVariable("sourceFrom") String sourceFrom,
                                                     @PathVariable("pageSize") long pageSize,
                                                     @PathVariable("pageNum") long pageNum) {
         // 获取费用单详细信息
@@ -518,4 +519,14 @@ public class CostController {
         return CostResult.success(costDomainPage);
     }
 
+    @LoginIgnore
+    @ApiOperation("获取4k费用日志数据")
+    @GetMapping("/costLogFor4k/{sourceFrom}/{pageSize}/{pageNum}")
+    public CostResult<Page<CostLogDomain>> getCostLogFor4k(@PathVariable("sourceFrom") String sourceFrom,
+                                                    @PathVariable("pageSize") long pageSize,
+                                                    @PathVariable("pageNum") long pageNum) {
+        // 获取费用单详细信息
+        Page<CostLogDomain> costLogDomainPage = costLogService.queryPageFor4k(new Page(pageNum,pageSize),sourceFrom);
+        return CostResult.success(costLogDomainPage);
+    }
 }

cost-service/src/main/java/com/blt/other/module/cost/dao/CostLogDao.java

 package com.blt.other.module.cost.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.blt.other.database.model.CostLogDomain;
+import com.blt.other.module.cost.model.CostDomain;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -16,4 +19,7 @@ public interface CostLogDao extends BaseMapper<CostLogDomain> {
 
     //查询部门审核日志
     CostLogDomain selectDepartmentCheckLog(String costNo);
+
+    Page<CostLogDomain> queryPageFor4k(@Param("page") Page<Object> page,
+                                    @Param("sourceFrom") String sourceFrom);
 }

cost-service/src/main/java/com/blt/other/module/cost/service/CostLogService.java

 package com.blt.other.module.cost.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.blt.other.database.model.CostLogDomain;
+import com.blt.other.module.cost.model.CostDomain;
 
 import java.util.List;
 
@@ -22,4 +24,6 @@ public interface CostLogService {
     //
     List<String> getListLogs(List<CostLogDomain> logs);
 
+    Page<CostLogDomain> queryPageFor4k(Page page, String sourceFrom);
+
 }

cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostLogServiceImpl.java

 package com.blt.other.module.cost.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.blt.other.database.model.CostCompanyDomain;
 import com.blt.other.database.model.CostLogDomain;
 import com.blt.other.database.model.UserDomain;
@@ -102,4 +103,9 @@ public class CostLogServiceImpl implements CostLogService {
         }
         return null;
     }
+
+    @Override
+    public Page<CostLogDomain> queryPageFor4k(Page page, String sourceFrom){
+        return costLogDao.queryPageFor4k(page, sourceFrom);
+    }
 }

cost-service/src/main/resources/mapper/CostLogMapper.xml

@@ -19,4 +19,14 @@
         order by update_time desc
         limit 1;
     </select>
+
+    <select id="queryPageFor4k" resultType="com.blt.other.database.model.CostLogDomain">
+        select cl.* from cost_log cl
+        left join cost c on c.cost_no = cl.cost_no
+        left join oa_user ou on ou.oa_user_id = c.create_userid
+        where
+        ou.company_id in(18, 27, 32)
+        and c.source_from in(#{sourceFrom})
+        order by id desc
+    </select>
 </mapper>