|
@@ -136,7 +136,7 @@ public class WorkOrderStatisticsController {
|
|
|
@ApiOperation(value = "分布统计")
|
|
|
public AjaxMessage<Map<String,Object>> distributionStatistics(
|
|
|
@ApiParam(value="统计类型:0-按月统计,1-按年统计,2-自定义统计",required =true) @RequestParam(required = true) int type,
|
|
|
- @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy)", required = true) @RequestParam(required = true) String startDate,
|
|
|
+ @ApiParam(value = "统计时间:月格式(yyyy-MM),年格式(yyyy),自定义统计时间开始日期", required = true) @RequestParam(required = true) String startDate,
|
|
|
@ApiParam(value = "统计时间:年月统计不用传入此参数,自定义统计截至日期", required = false) @RequestParam(required = false) String endDate) {
|
|
|
Map<String,Object> result = new HashMap<>();
|
|
|
//根据用户编号,获取用户的权限
|
|
@@ -148,11 +148,11 @@ public class WorkOrderStatisticsController {
|
|
|
//1是公司,2是公司及以下,3部门,4部门及以下,5自定义
|
|
|
workOrderManageDto.setPermissonType(loginUser.getPermissonType());
|
|
|
if(type == 0){
|
|
|
-
|
|
|
+ startDate = String.format("%s-01",startDate);
|
|
|
workOrderManageDto.setStartDate(startDate);
|
|
|
}
|
|
|
else if(type == 1){
|
|
|
-
|
|
|
+ startDate = String.format("%s-01-01",startDate);
|
|
|
workOrderManageDto.setStartDate(startDate);
|
|
|
}
|
|
|
else if(type == 2){
|