Commit 9d598e22 authored by maliang's avatar maliang

上传bug修复

parent 38121716
...@@ -9,6 +9,7 @@ import com.boot.security.server.utils.UserUtil; ...@@ -9,6 +9,7 @@ import com.boot.security.server.utils.UserUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -141,6 +142,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -141,6 +142,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
baseSettlement.setCountSettlement(Double.valueOf(df.format(count5))); baseSettlement.setCountSettlement(Double.valueOf(df.format(count5)));
} }
return PageTableHandler.getJSONObject(baseSettlements,count); return PageTableHandler.getJSONObject(baseSettlements,count);
} }
...@@ -333,7 +335,6 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -333,7 +335,6 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount()))); baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
} }
Map<Integer, List<BaseSettlement>> collect = baseSettlements.stream().collect(Collectors.groupingBy(BaseSettlement::getCopyrightId)); Map<Integer, List<BaseSettlement>> collect = baseSettlements.stream().collect(Collectors.groupingBy(BaseSettlement::getCopyrightId));
return collect; return collect;
} }
...@@ -530,6 +531,11 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -530,6 +531,11 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
return PageTableHandler.getJSONObject(baseSettlements,count); return PageTableHandler.getJSONObject(baseSettlements,count);
} }
public static Double getDecimal(Double f){
BigDecimal bg = new BigDecimal(f);
Double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
return f1;
}
@Override @Override
public String getAllCopyright() { public String getAllCopyright() {
List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId()); List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
......
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