吴洪双 il y a 6 ans
Parent
commit
444d0d29fe

+ 0 - 2
src/main/java/com/shawn/model/dto/TAdminDTO.java

@@ -19,6 +19,4 @@ public class TAdminDTO extends TAdmin {
 
 	@ApiModelProperty(value="设备列表")
 	private List<TEquipmentDTO> equipmentList;
-
-	private boolean ifShow = false;
 }

+ 6 - 1
src/main/java/com/shawn/service/impl/TOrderServiceImpl.java

@@ -42,21 +42,26 @@ public class TOrderServiceImpl extends BaseService<TOrder,TOrderExample,TOrderPa
 	public ChartColumn getStatistics(StatisticsParam param){
 
 		List<ChartBean> list = new ArrayList<>();
+		String msg = "";
 		if(ChartType.day.toString().equals(param.getChartType())){
 			list = tOrderMapper.getDayStatistics(param);
+			msg = "日统计";
 		}
 		if(ChartType.week.toString().equals(param.getChartType())){
 			list = tOrderMapper.getWeekStatistics(param);
+			msg = "周统计";
 		}
 		if(ChartType.month.toString().equals(param.getChartType())){
 			list = tOrderMapper.getMonthStatistics(param);
+			msg = "月统计";
 		}
 		if(ChartType.year.toString().equals(param.getChartType())){
 			list = tOrderMapper.getYearStatistics(param);
+			msg = "年统计";
 		}
 
 		if(CollectionUtils.isEmpty(list)){
-			throw new MyException("获取数据为空");
+			throw new MyException("获取"+msg+"数据为空");
 		}
 		ChartColumn chartColumn = new ChartColumn(list);
 		return chartColumn;

+ 0 - 1
src/main/java/com/shawn/web/controller/TEquipmentController.java

@@ -108,7 +108,6 @@ public class TEquipmentController extends BaseController<TEquipment,TEquipmentEx
 			dto.setEquipmentList(equipmentDTOList);
 			resultList.add(dto);
 		}
-		resultList.get(0).setIfShow(true);
 
 		return ResponseEntity.status(HttpStatus.OK)
 				.body(new ResultMessage().setCode(true).setData(resultList).setMessage("SUCCESS"));