Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff

 src/main/java/org/springblade/modules/task/controller/TaskController.java

@@ -121,10 +121,10 @@
      return R.status(taskService.deleteLogic(Func.toLongList(ids)));
   }

   @PostMapping("/countNumber")
   @GetMapping("/countNumber")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "统计用户标签报事数量")
   public R countNumber(@RequestParam(value = "houseCode",required = false) String houseCode, @RequestParam(value = "status",required = false) Integer status) {
   public R countNumber(@RequestParam(value = "houseCode", required = false) String houseCode, @RequestParam(value = "status", required = false) Integer status) {
      return R.data(taskService.countNumber(houseCode, status));
   }

@@ -132,17 +132,9 @@
   @GetMapping("/countTypeNumber")
   @ApiOperationSupport(order = 9)
   @ApiOperation(value = "统计类型数量")
   public R countTypeNumber() {
      return R.data(taskService.countTypeNumber());
   public R countTypeNumber(@RequestParam(value = "neiCode", required = false) String neiCode, @RequestParam(value = "roleType", defaultValue = "0") Integer roleType) {
      return R.data(taskService.countTypeNumber(roleType, neiCode));
   }


//   @GetMapping("/countFrequencyNumber")
//   @ApiOperationSupport(order = 10)
//   @ApiOperation(value = "统计周期类型数量")
//   public R countFrequencyNumber() {
//      return R.data(taskService.countFrequencyNumber());
//   }


}