|
@@ -286,7 +286,7 @@ public class RestaurantServiceImpl implements RestaurantService {
|
|
|
String[] labKey = list.toArray(new String[0]);
|
|
|
//List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
|
|
|
List<Label> labels1 = new ArrayList<>();
|
|
|
- DecimalFormat decimalFormat = new DecimalFormat("#.0");
|
|
|
+ DecimalFormat decimalFormat = new DecimalFormat("#");
|
|
|
for (int i = 0; i < labKey.length; i++) {
|
|
|
Label label = new Label();
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
@@ -299,8 +299,8 @@ public class RestaurantServiceImpl implements RestaurantService {
|
|
|
iocParam1.setTimeRange(iocTimeRange);
|
|
|
Integer totalPerson = cuisineOrderMapper.getTotalPersonByCompanyIdAndDeptId(iocParam1);
|
|
|
ThreadLocalRandom random = ThreadLocalRandom.current();
|
|
|
- Integer add = random.nextInt(10,100);
|
|
|
- Integer passengerFlow = totalPerson+add;
|
|
|
+ double add = random.nextDouble(1, 1.5);
|
|
|
+ Integer passengerFlow = Integer.valueOf(decimalFormat.format( totalPerson*add));
|
|
|
double proportion = 0d;
|
|
|
if(totalPerson>0){
|
|
|
BigDecimal bigDecimal = new BigDecimal(totalPerson);
|