用户统计与商家入驻统计优化

src/main/java/com/chelvc/cloud/admin/controller/UserController.java

@@ -5,14 +5,14 @@ import com.chelvc.cloud.admin.vo.PersonalVO;
 import com.chelvc.cloud.uc.api.dto.UserDTO;
 import com.chelvc.cloud.uc.api.param.UserPagingParam;
 import com.chelvc.cloud.uc.api.service.UserService;
-import com.chelvc.cloud.vehicle.api.dto.HelpCategoryDTO;
-import com.chelvc.cloud.vehicle.api.param.HelpCategoryPagingParam;
+import com.chelvc.cloud.vehicle.api.param.ReportModifyParam;
 import com.chelvc.cloud.vehicle.api.service.MerchantService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -65,10 +65,10 @@ public class UserController {
      * @return 用户统计
      */
     @GetMapping("/user/getRegisterReport")
-    public Map<String,Object> getUserRegisterReport(Integer year,Integer month) {
+    public Map<String,Object> getUserRegisterReport(@RequestBody @Valid ReportModifyParam param) {
         Map<String, Object> map = new HashMap<>();
-        map.put("user",this.userService.getUserRegisterReport(year, month));
-        map.put("merchant",this.merchantService.getMerchantReport(year, month));
+        map.put("user",this.userService.getUserRegisterReport(param.getYear(),param.getMonth(),param.getType()));
+        map.put("merchant",this.merchantService.getMerchantReport(param));
         return map;
     }