master
杨海航 20 hours ago
parent beacd8de46
commit 8ae29232a2
  1. 2
      src/main/java/digital/laboratory/platform/imr/controller/DrugHandingOverStatisticController.java
  2. 6
      src/main/java/digital/laboratory/platform/imr/service/impl/DrugHandingOverStatisticServiceImpl.java

@ -5,6 +5,7 @@ import digital.laboratory.platform.common.core.util.R;
import digital.laboratory.platform.imr.query.DrugStatisticQuery; import digital.laboratory.platform.imr.query.DrugStatisticQuery;
import digital.laboratory.platform.imr.service.DrugHandingOverStatisticService; import digital.laboratory.platform.imr.service.DrugHandingOverStatisticService;
import digital.laboratory.platform.imr.vo.DrugStatisticVO; import digital.laboratory.platform.imr.vo.DrugStatisticVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -15,6 +16,7 @@ import javax.annotation.Resource;
@RestController @RestController
@RequestMapping("/drugStatistic") @RequestMapping("/drugStatistic")
@Api(value = "DrugHandingOverStatisticController", tags = "毒品库送缴量统计相关接口")
public class DrugHandingOverStatisticController { public class DrugHandingOverStatisticController {
@Resource @Resource

@ -52,10 +52,8 @@ public class DrugHandingOverStatisticServiceImpl implements DrugHandingOverStati
@Override @Override
public DrugStatisticVO statistic(DrugStatisticQuery query) { public DrugStatisticVO statistic(DrugStatisticQuery query) {
DrugStatisticVO drugStatisticVO = new DrugStatisticVO(); DrugStatisticVO drugStatisticVO = new DrugStatisticVO();
List<List<Object>> lineChartData = buildLineChartData(query, drugStatisticVO); buildLineChartData(query, drugStatisticVO);
List<List<Object>> barChartData = buildBarChartData(query, drugStatisticVO); buildBarChartData(query, drugStatisticVO);
drugStatisticVO.setBarChartDataList(barChartData);
drugStatisticVO.setLineChartDataList(lineChartData);
return drugStatisticVO; return drugStatisticVO;
} }

Loading…
Cancel
Save