Skip to content

T
traffic-front
Commit 0d9c635a authored by neo's avatar neo
Browse files
Options

[bugfix] fixed index of get vlaue from code

parent b5725e69
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 14 deletions
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/VoucherServiceImpl.java
View file @ 0d9c635a
...@@ -9,13 +9,22 @@ import pwc.taxtech.atms.constant.enums.VoucherLevelEnum; ...@@ -9,13 +9,22 @@ import pwc.taxtech.atms.constant.enums.VoucherLevelEnum;
import pwc.taxtech.atms.constant.enums.VoucherSearchEnum; import pwc.taxtech.atms.constant.enums.VoucherSearchEnum;
import pwc.taxtech.atms.dto.OperationResultDto; import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.PagingDto; import pwc.taxtech.atms.dto.PagingDto;
import pwc.taxtech.atms.dto.vatdto.*; import pwc.taxtech.atms.dto.vatdto.QueryConditionDto;
import pwc.taxtech.atms.vat.entity.VatEnterpriseAccountExample; import pwc.taxtech.atms.dto.vatdto.QueryVoucherDto;
import pwc.taxtech.atms.dto.vatdto.QueryVoucherMainDto;
import pwc.taxtech.atms.dto.vatdto.VIDCountDto;
import pwc.taxtech.atms.dto.vatdto.VoucherDto;
import pwc.taxtech.atms.dto.vatdto.VoucherMainDto;
import pwc.taxtech.atms.dto.vatdto.VoucherTmplDto;
import pwc.taxtech.atms.vat.service.VoucherService; import pwc.taxtech.atms.vat.service.VoucherService;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -602,77 +611,77 @@ public class VoucherServiceImpl extends VatAbstractService implements VoucherSer ...@@ -602,77 +611,77 @@ public class VoucherServiceImpl extends VatAbstractService implements VoucherSer
switch (queryConditionDto.getConditionName()) { switch (queryConditionDto.getConditionName()) {
case VoucherSelect.S_CorpAcctCoding: case VoucherSelect.S_CorpAcctCoding:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "`AcctCode`" , "`AcctCode`"
, mainRelation , mainRelation
, null)); , null));
break; break;
case VoucherSelect.S_CorpAcctName: case VoucherSelect.S_CorpAcctName:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "EnterpriseAccount.`Name`" , "EnterpriseAccount.`Name`"
, mainRelation , mainRelation
, null)); , null));
break; break;
case VoucherSelect.S_VoucherType: case VoucherSelect.S_VoucherType:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "`Group`" , "`Group`"
, mainRelation , mainRelation
, null)); , null));
break; break;
case VoucherSelect.S_VoucherVID: case VoucherSelect.S_VoucherVID:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "`VID`" , "`VID`"
, mainRelation , mainRelation
, null)); , null));
break; break;
case VoucherSelect.S_VoucherSummary: case VoucherSelect.S_VoucherSummary:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "`Summary`" , "`Summary`"
, mainRelation , mainRelation
, null)); , null));
break; break;
case VoucherSelect.S_Period: case VoucherSelect.S_Period:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "`Period`" , "`Period`"
, mainRelation , mainRelation
, null)); , null));
break; break;
case VoucherSelect.S_Debit: case VoucherSelect.S_Debit:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "`Debit`" , "`Debit`"
, mainRelation , mainRelation
, null)); , null));
break; break;
case VoucherSelect.S_Credit: case VoucherSelect.S_Credit:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "`Credit`" , "`Credit`"
, mainRelation , mainRelation
, null)); , null));
break; break;
case VoucherSelect.S_Date: case VoucherSelect.S_Date:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "`Date`" , "`Date`"
, mainRelation , mainRelation
, null)); , null));
break; break;
case VoucherSelect.S_CustomerCode: case VoucherSelect.S_CustomerCode:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "Voucher.CustomerCode" , "Voucher.CustomerCode"
, mainRelation , mainRelation
, null)); , null));
break; break;
case VoucherSelect.S_CustomerName: case VoucherSelect.S_CustomerName:
tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" ")) tmpls.add(createQueryScriptByTmplList(Arrays.asList(queryConditionDto.getSearchValue().split(" "))
, VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord()] , VoucherSearchEnum.values()[queryConditionDto.getSearchKeyWord() - 1]
, "Voucher.CustomerName" , "Voucher.CustomerName"
, mainRelation , mainRelation
, null)); , null));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment