|
@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.text.DecimalFormat;
|
|
|
+import java.text.NumberFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
@@ -383,17 +384,18 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
|
|
|
String amonutIn = baseMapper.getAmonutIn(pageView);
|
|
|
String amonutout = baseMapper.getAmonutOut(pageView);
|
|
|
String amonutMao = baseMapper.getAmonutMao(pageView);
|
|
|
- DecimalFormat df = new DecimalFormat("#.00");
|
|
|
+ NumberFormat nf = NumberFormat.getNumberInstance();
|
|
|
+ nf.setMaximumFractionDigits(2);
|
|
|
BiViewInfo biViewInfo = new BiViewInfo();
|
|
|
BiViewInfo biViewInfo1 = new BiViewInfo();
|
|
|
BiViewInfo biViewInfo2 = new BiViewInfo();
|
|
|
BiViewInfo biViewInfo3 = new BiViewInfo();
|
|
|
biViewInfo1.setName("毛利润");
|
|
|
- biViewInfo1.setCount(df.format(amonutMao));
|
|
|
+ biViewInfo1.setCount(nf.format(Double.valueOf(amonutMao)));
|
|
|
biViewInfo2.setName("收入");
|
|
|
- biViewInfo2.setCount(df.format(amonutIn));
|
|
|
+ biViewInfo2.setCount(nf.format(Double.valueOf(amonutIn)));
|
|
|
biViewInfo3.setName("支出");
|
|
|
- biViewInfo3.setCount(df.format(amonutout));
|
|
|
+ biViewInfo3.setCount(nf.format(Double.valueOf(amonutout)));
|
|
|
List<BiViewInfo> biViewInfoList = new ArrayList<>();
|
|
|
biViewInfoList.add(biViewInfo1);
|
|
|
biViewInfoList.add(biViewInfo2);
|