|
@@ -447,7 +447,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
String projectId = projectInfo.getProjectId();
|
|
|
List<KuaiShouOperateProjectVo> projectYearOnYearInfo = materialStareMapper.getKuaiShouOperateProjectInfo(lastTimeStart,lastTimeEnd,projectId,operatorUserIds);
|
|
|
//环比 = (当前 - 上阶段 ) / 上阶段
|
|
|
- String yearOnYear = null;
|
|
|
+ String yearOnYear = "0";
|
|
|
if (!Check.isNull(projectYearOnYearInfo)){
|
|
|
Double yearOnYearD = (projectInfo.getTotalCost() - projectYearOnYearInfo.get(0).getTotalCost()) / projectYearOnYearInfo.get(0).getTotalCost();
|
|
|
yearOnYear = decimalFormat.format(yearOnYearD);
|
|
@@ -521,7 +521,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
long accountId = accountInfo.getAccountId();
|
|
|
List<KuaiShouOperateAccountVo> accountYearOnYearInfo = materialStareMapper.getKuaiShouOperateAccountInfo(lastTimeStart,lastTimeEnd,projectId,accountId,operatorUserIds);
|
|
|
//环比 = (当前 - 上阶段 ) / 上阶段
|
|
|
- String yearOnYear = null;
|
|
|
+ String yearOnYear = "0";
|
|
|
if (!Check.isNull(accountYearOnYearInfo)){
|
|
|
Double yearOnYearD = (accountInfo.getTotalCost() - accountYearOnYearInfo.get(0).getTotalCost()) / accountYearOnYearInfo.get(0).getTotalCost();
|
|
|
yearOnYear = decimalFormat.format(yearOnYearD);
|