增加搜索待我审批接口

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

@@ -9,6 +9,7 @@ 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.module.cost.dao.CostDao;
+import com.blt.other.module.cost.dto.request.AllCheckCostListReq;
 import com.blt.other.module.cost.dto.request.CheckCostListReq;
 import com.blt.other.module.cost.dto.request.CostQueryPageReq;
 import com.blt.other.module.cost.dto.response.GetAllLendCostResp;
@@ -208,6 +209,14 @@ public class CostController {
         return CostResult.success(page);
     }
 
+    @ApiOperation("待审核费用单列表")
+    @GetMapping("/checkCostAllList")
+    public CostResult<IPage<CostDto>> checkCostAllList(AllCheckCostListReq req) {
+        costService = CostServiceFactory.getCostService();
+        IPage<CostDto> page = costService.checkCostAllList(req);
+        return CostResult.success(page);
+    }
+
     @ApiOperation("审核费用单列表")
     @GetMapping("/checkCostCount")
     public CostResult<Long> checkCostCount(CheckCostListReq req) {

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

@@ -4,10 +4,7 @@ import com.bailuntec.cost.api.request.ManageCostListReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.blt.other.module.cost.dto.request.AppCheckCostListReq;
-import com.blt.other.module.cost.dto.request.AppCostListReq;
-import com.blt.other.module.cost.dto.request.CheckCostListReq;
-import com.blt.other.module.cost.dto.request.CostQueryPageReq;
+import com.blt.other.module.cost.dto.request.*;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.vo.CostExportVo;
 import org.apache.ibatis.annotations.Param;
@@ -66,6 +63,10 @@ public interface CostDao extends BaseMapper<CostDomain> {
     IPage<CostDomain> generalManagerCheckCostList(@Param("page") IPage<CostDomain> page,
                                       @Param("req") CheckCostListReq req);
 
+    //管理后台 所有需要我审核的费用单列表
+    IPage<CostDomain> allCheckCostList(@Param("page") IPage<CostDomain> page,
+                                                  @Param("req") AllCheckCostListReq req);
+
     //小程序审核列表查询
     Page<CostDomain> appCheckCostList(@Param("page") IPage<CostDomain> page,
                                       @Param("req") AppCheckCostListReq req);

cost-service/src/main/java/com/blt/other/module/cost/dto/request/AllCheckCostListReq.java

+package com.blt.other.module.cost.dto.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+@Data
+public class AllCheckCostListReq extends CheckCostListReq{
+    @ApiModelProperty("状态列表")
+    private List<Integer> costStatusList;
+    @ApiModelProperty(value = "状态列表",hidden = true)
+    private String costStatusStr;
+}

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

@@ -4,6 +4,7 @@ import com.bailuntec.cost.api.dto.CostDto;
 import com.bailuntec.cost.api.dto.CostListPrintDto;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.blt.other.module.cost.dto.request.AllCheckCostListReq;
 import com.blt.other.module.cost.dto.request.CheckCostListReq;
 import com.blt.other.module.cost.dto.request.CostQueryPageReq;
 import com.blt.other.module.cost.dto.response.CostPageResult;
@@ -97,6 +98,8 @@ public interface CostService {
      */
     IPage<CostDto> checkCostList(CheckCostListReq req);
 
+    IPage<CostDto> checkCostAllList(AllCheckCostListReq req);
+
     /**
      * <p>
      * 审核成功通知财务系统付款

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

@@ -24,6 +24,7 @@ import com.blt.other.module.auth.dao.OaUserMapper;
 import com.blt.other.module.auth.model.OaDepartment;
 import com.blt.other.module.auth.model.OaUser;
 import com.blt.other.module.cost.dao.*;
+import com.blt.other.module.cost.dto.request.AllCheckCostListReq;
 import com.blt.other.module.cost.dto.request.CheckCostListReq;
 import com.blt.other.module.cost.dto.request.CostQueryPageReq;
 import com.blt.other.module.cost.dto.response.CostTypeResult;
@@ -39,6 +40,7 @@ import com.blt.other.module.netsuite.dto.NetsuiCostinfoDto;
 import com.blt.other.module.netsuite.dto.NetsuiteDataDto;
 import com.blt.other.module.netsuite.model.NetsuiteLogDomain;
 import com.blt.other.module.sys.service.UserService;
+import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -312,6 +314,21 @@ public abstract class AbstractCostService implements CostService {
         throw new BizRuntimeException("invalid param");
     }
 
+    @Override
+    public IPage<CostDto> checkCostAllList(AllCheckCostListReq req){
+        if(req.getCostForm().equals(3)){
+            req.setIsLend(1);
+        }
+        if(req.getCostForm().equals(4)){
+            req.setIsLend(2);
+        }
+        if(req.getCostStatusList()!=null && !req.getCostStatusList().isEmpty()){
+            req.setCostStatusStr(StringUtils.join(req.getCostStatusList(),','));
+        }
+        IPage<CostDomain> page = new Page<>(req.getPageNum(), req.getPageSize());
+        return costDao.allCheckCostList(page,req).convert(CostDomain::castToDto);
+    }
+
     @Resource
     CostApplycallbackService costApplycallbackService;
 

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

@@ -279,6 +279,22 @@
         <include refid="checkCostListSearch"/>
     </select>
 
+    <select id="allCheckCostList" resultType="com.blt.other.module.cost.model.CostDomain">
+        select c.* from cost c
+        left join cost_current_reviewer ccr on ccr.cost_no = c.cost_no
+        where ccr.oa_user_id = #{req.userid}
+        <if test="req.costNo !=null and req.costNo !=''">and c.cost_no like concat('%',#{req.costNo},'%')</if>
+        <if test="req.companyNo!=null and req.companyNo!='' ">and c.company_no = #{req.companyNo}</if>
+        <if test="req.costForm!=null">and c.cost_form = #{req.costForm}</if>
+        <if test="req.isLend!=null">and c.is_lend = #{req.isLend}</if>
+        <if test="req.typeNo!=null and req.typeNo!='' ">c.type_no = #{req.typeNo}</if>
+        <if test="req.costStatusStr!=null ">and t1.cost_status in (#{req.costStatusStr})</if>
+        <if test="req.createUserId!=null ">and c.create_userid = #{req.createUserId}</if>
+        <if test=" req.beginTime != null">AND c.create_time <![CDATA[>=]]> #{req.beginTime}</if>
+        <if test=" req.endTime != null">AND c.create_time <![CDATA[<=]]>#{req.endTime}</if>
+        <if test="req.bankCardUser !=null and req.bankCardUser !='' ">and c.bank_card_user like concat('%',#{req.bankCardUser},'%')</if>
+    </select>
+
     <select id="selectByStatus" resultType="com.blt.other.module.cost.model.CostDomain">
         select *
         from cost