Merge branch 'master' into pim_meet

buhuazhen

8 天以前 47768d890fbfc1a5f3e93ca26137847361415e9e

 src/main/java/com/ruoyi/account/service/AccountExpenseService.java

@@ -4,12 +4,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.dto.AccountDto;
import com.ruoyi.account.dto.AccountDto2;
import com.ruoyi.account.dto.AccountDto3;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.dto.DateQueryDto;

import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

public interface AccountExpenseService extends IService<AccountExpense> {

@@ -19,5 +22,9 @@

    AccountDto report(DateQueryDto dateQueryDto);

    AccountDto3 reportExpense();
    List<AccountDto3> reportExpense();

    Map<String,List<String>> analysis();

    AccountExpense getByInvoiceNumber(String purchaseContractNumber);
}