Skip to content

M
manager
Commit fcf36274 by lzxry
Options

bugfix

parent e1f45408
Showing with 2 additions and 2 deletions
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
...@@ -379,6 +379,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService { ...@@ -379,6 +379,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
for (int k = 0; k <= i; k++) { for (int k = 0; k <= i; k++) {
codes.add(contractsArray[k].getContractCode()); codes.add(contractsArray[k].getContractCode());
} }
contract.setClickFlow(0.0);
BigDecimal clickNum = tkioFlowRepository.sumFlowByDsAndContractCodes(usePart[0].toString("yyyy-MM-dd"), usePart[1].toString("yyyy-MM-dd"), codes); BigDecimal clickNum = tkioFlowRepository.sumFlowByDsAndContractCodes(usePart[0].toString("yyyy-MM-dd"), usePart[1].toString("yyyy-MM-dd"), codes);
int clickFlow = clickNum == null ? 0 : clickNum.intValue(); int clickFlow = clickNum == null ? 0 : clickNum.intValue();
BigDecimal clickTenThousand = new BigDecimal(0); BigDecimal clickTenThousand = new BigDecimal(0);
...@@ -613,8 +614,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService { ...@@ -613,8 +614,7 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
}else{ }else{
Contract contractMaster = contractsArray[i]; Contract contractMaster = contractsArray[i];
if(contracts.contains(contractMaster)){ if(contracts.contains(contractMaster)){
Contract nextContract = contractsArray[i + 1]; shareIncome4ContractTKIO(contractMaster,start,new DateTime(contractMaster.getNextSignedDate()));//到结束的前一天
shareIncome4ContractTKIO(contractMaster,start,new DateTime(nextContract.getNextSignedDate()));//到结束的前一天
} }
} }
} }
......
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