Commit 02526991 by kangxiaoshan

收款开票金额

parent c2833b12
...@@ -1757,6 +1757,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -1757,6 +1757,7 @@ public class ContractServiceImpl implements ContractService {
// 获取字典数据 // 获取字典数据
this.getDicMapDatas(saleMap, typeMap, null, null, packageBaseMap, platform); this.getDicMapDatas(saleMap, typeMap, null, null, packageBaseMap, platform);
contract.setSaleName(saleMap.containsKey(contract.getSale()) ? saleMap.get(contract.getSale()) : ""); contract.setSaleName(saleMap.containsKey(contract.getSale()) ? saleMap.get(contract.getSale()) : "");
//if ("tkio".equals(platform)) { //if ("tkio".equals(platform)) {
// contract.setPriceLevelName(typeMap.containsKey(contract.getPriceLevel()) ? typeMap.get(contract.getPriceLevel()).getPackageName() : ""); // contract.setPriceLevelName(typeMap.containsKey(contract.getPriceLevel()) ? typeMap.get(contract.getPriceLevel()).getPackageName() : "");
...@@ -1767,6 +1768,18 @@ public class ContractServiceImpl implements ContractService { ...@@ -1767,6 +1768,18 @@ public class ContractServiceImpl implements ContractService {
contract.setCreateName(saleMap.containsKey(contract.getCreateAccount()) ? saleMap.get(contract.getCreateAccount()) : ""); contract.setCreateName(saleMap.containsKey(contract.getCreateAccount()) ? saleMap.get(contract.getCreateAccount()) : "");
//处理收款开票金额
List<Object[]> codeMoneyList = contractMoneyRepository.findGroupCode(platform, Arrays.asList(contract.getId() + ""));
if (codeMoneyList != null && codeMoneyList.size() > 0) {
Object[] value = codeMoneyList.get(0);
contract.setAmountCollected(value[1] + "");
contract.setInvoiceAmount(value[2] + "");
} else {
contract.setAmountCollected("0");
contract.setInvoiceAmount("0");
}
return contract; return contract;
} }
......
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