统计 设备

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/DataStatisticsController.java

 package cn.wise.sc.acquisition.business.controller;
 
 import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.constant.Rcode;
 import cn.wise.sc.acquisition.business.service.IDataStatisticsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -39,12 +40,13 @@ public class DataStatisticsController {
 	})
 	@GetMapping("/countByPhoto")
 	public R countByPhoto(Integer type, String TruckID, Integer cycle, String startDate, String endDate) {
+		Rcode.NOT_PARAM.assertNotNull(type);
 		if(type == 1){
 			return dataStatisticsService.countByPhoto(TruckID, cycle, startDate, endDate);
 		}else if(type == 2){
 			return dataStatisticsService.countByTable(TruckID, cycle, startDate, endDate);
 		}else{
-			return R.fail(400, "参数错误");
+			return R.fail(402, "参数错误");
 		}
 	}
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/DataStatisticsMapper.xml

@@ -57,7 +57,6 @@
         <if test="params.startDate == null and params.endDate == null">
             and datediff(week, tw.Rq,getdate())=0
         </if>
-        group by tw.Rq
     </select>