diff --git a/ServiceSite/src/main/java/com/seasky/flowportal/mapper/ReimbursementSyncMapper.java b/ServiceSite/src/main/java/com/seasky/flowportal/mapper/ReimbursementSyncMapper.java index e045f53cd60feab8f3af804ac7c755ab6693fb53..61f5b5c4121ce272419c26116ec6950c48a173c8 100644 --- a/ServiceSite/src/main/java/com/seasky/flowportal/mapper/ReimbursementSyncMapper.java +++ b/ServiceSite/src/main/java/com/seasky/flowportal/mapper/ReimbursementSyncMapper.java @@ -2,8 +2,14 @@ package com.seasky.flowportal.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.seasky.flowportal.domain.po.ReimbursementSync; +import com.seasky.flowportal.dto.reimbursementSync.ReimbursementSyncOut; +import com.seasky.flowportal.dto.reimbursementSync.ReimbursementSyncQuery; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; @Mapper public interface ReimbursementSyncMapper extends BaseMapper<ReimbursementSync> { + List<ReimbursementSyncOut> selectFailedDocument(@Param("qry") ReimbursementSyncQuery qry); } \ No newline at end of file diff --git a/ServiceSite/src/main/java/com/seasky/flowportal/mapper/xml/ReimbursementSyncMapper.xml b/ServiceSite/src/main/java/com/seasky/flowportal/mapper/xml/ReimbursementSyncMapper.xml index 5e0e373fd01db579e7630f8e1cbf397bc6cbf18a..898c0f447dea561404be55763d8ea0c987e53390 100644 --- a/ServiceSite/src/main/java/com/seasky/flowportal/mapper/xml/ReimbursementSyncMapper.xml +++ b/ServiceSite/src/main/java/com/seasky/flowportal/mapper/xml/ReimbursementSyncMapper.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.seasky.flowportal.mapper.ReimbursementSyncMapper"> + + <select id="selectFailedDocument" resultType="com.seasky.flowportal.dto.reimbursementSync.ReimbursementSyncOut" useCache="false"> + select a.* ,b.* from tb_expense_reimbursement as a join tb_reimbursement_sync as b on a.id = b.order_id + <where> + a.available = 'YES' + + <if test="qry.reimbursementCode != null and qry.reimbursementCode != ''"> + and a.reimbursement_code = #{qry.reimbursementCode} + </if> + <if test="qry.reimbursementType != null and qry.reimbursementType != ''"> + and a.reimbursement_type = #{qry.reimbursementType} + </if> + <if test="qry.applicantName != null and qry.applicantName != ''"> + and (a.applicant_no = #{qry.applicantName} or a.applicant_name = #{qry.applicantName}) + </if> + and + b.response_info != '' + </where> + order by a.reimbursement_apply_date desc + limit #{qry.pageIndex},#{qry.pageSize}; + </select> </mapper> \ No newline at end of file diff --git a/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExpenseReimbursementServiceImpl.java b/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExpenseReimbursementServiceImpl.java index aa14c591b84c59e475b1791be66aa8d7440977a6..3c5b5f5141fed46e7aaa1cb5088bcb65dbe66ed1 100644 --- a/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExpenseReimbursementServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/flowportal/service/impl/ExpenseReimbursementServiceImpl.java @@ -1608,8 +1608,22 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ @Override public Pagination<ReimbursementSyncOut> selectFailedDocument(ReimbursementSyncQuery qry) { Page page = new Page<>(qry.getPageIndex(),qry.getPageSize()); - QueryWrapper<ReimbursementSync> queryWrapper = new QueryWrapper<>(); - Page page1 = reimbursementSyncMapper.selectPage(page,queryWrapper.isNotNull("response_info")); + qry.setPageIndex(qry.getPageIndex()-1); + List<ReimbursementSyncOut> reimbursementSyncOuts1 = reimbursementSyncMapper.selectFailedDocument(qry); + //todo 鏍¢獙鏄惁涓虹┖ + if (ObjectUtils.isEmpty(reimbursementSyncOuts1)){ + return new Pagination<>(); + } + for (ReimbursementSyncOut reimbursementSyncOut : reimbursementSyncOuts1) { + reimbursementSyncOut.setBusinessorderStatus(); + } + + + page.setRecords(reimbursementSyncOuts1); + page.setTotal(reimbursementSyncOuts1.size()); + +/* QueryWrapper<ReimbursementSync> queryWrapper = new QueryWrapper<>(); + Page page1 = reimbursementSyncMapper.selectPage(page,queryWrapper.ne("response_info","")); List<ReimbursementSync> reimbursementSyncs = page1.getRecords(); if (ObjectUtils.isEmpty(reimbursementSyncs)){ return new Pagination<ReimbursementSyncOut>(); @@ -1638,8 +1652,8 @@ public class ExpenseReimbursementServiceImpl implements ExpenseReimbursementServ } } page1.setRecords(reimbursementSyncOuts); - page1.setTotal(reimbursementSyncOuts.size()); - return Pagination.fromPage(page1); + page1.setTotal(reimbursementSyncOuts.size());*/ + return Pagination.fromPage(page); } @Override