Commit 63cf5fa6 by kangxiaoshan

修复不含税收入

parent b659d615
...@@ -1321,6 +1321,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -1321,6 +1321,7 @@ public class ContractServiceImpl implements ContractService {
for (Contract c : contractList) { for (Contract c : contractList) {
c.setMyBodyName(bodyMap.get(c.getMyBodyCode())); c.setMyBodyName(bodyMap.get(c.getMyBodyCode()));
c.setTradeName(tradeTypeMap.get(c.getTradeType() + "")); c.setTradeName(tradeTypeMap.get(c.getTradeType() + ""));
c.setDs(new DateTime(c.getCreateTime()).toString("yyyy-MM-dd"));
if ((c.getExtraFlow() != null && c.getExtraFlow() > 0) || if ((c.getExtraFlow() != null && c.getExtraFlow() > 0) ||
(c.getDiscountTimeLong() != null && c.getDiscountTimeLong() > 0)) { (c.getDiscountTimeLong() != null && c.getDiscountTimeLong() > 0)) {
...@@ -1340,6 +1341,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -1340,6 +1341,7 @@ public class ContractServiceImpl implements ContractService {
} }
// if (c.getType().equals(ContractTypeEnum.MAIN.getKey()) && platform.contains("io")) { // if (c.getType().equals(ContractTypeEnum.MAIN.getKey()) && platform.contains("io")) {
// //
// } else if (c.getType().equals(ContractTypeEnum.MAIN.getKey())) { // } else if (c.getType().equals(ContractTypeEnum.MAIN.getKey())) {
......
...@@ -126,7 +126,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService { ...@@ -126,7 +126,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
int contractAllDay = getDayRange(contractPart[0], contractPart[1]) + 1;//合同总天数 int contractAllDay = getDayRange(contractPart[0], contractPart[1]) + 1;//合同总天数
//处理精度 //处理精度
Long dayShareIncome = new BigDecimal(excludTax / contractAllDay) Long dayShareIncome = new BigDecimal(excludTax * 1.0 / contractAllDay)
.setScale(0, BigDecimal.ROUND_HALF_UP).longValue();//每日分摊收入(值扩大100倍) .setScale(0, BigDecimal.ROUND_HALF_UP).longValue();//每日分摊收入(值扩大100倍)
//作废合同处理 //作废合同处理
......
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