Commit 6ef3f09b authored by chenhao's avatar chenhao

提交删除时的错误提示信息

parent 4704a8c3
...@@ -146,7 +146,7 @@ public class DutyCarController extends BaseController { ...@@ -146,7 +146,7 @@ public class DutyCarController extends BaseController {
} }
List<Map<String, Object>> list = iDutyCarService.list(null, startTime, DateUtils.getDateNowShortStr()); List<Map<String, Object>> list = iDutyCarService.list(null, startTime, DateUtils.getDateNowShortStr());
if(list!=null && list.size()>0 ) { if(list!=null && list.size()>0 ) {
throw new BadRequest("班次已有值班数据,无法删除"); return ResponseHelper.buildResponse(0);
} }
// BUG 2807 删除逻辑缺陷,现在前端后端传入 删除月份 2021-09-10 by kongfm // BUG 2807 删除逻辑缺陷,现在前端后端传入 删除月份 2021-09-10 by kongfm
return ResponseHelper.buildResponse(iDutyCarService.deleteDutyData(instanceId, startTime, endTime)); return ResponseHelper.buildResponse(iDutyCarService.deleteDutyData(instanceId, startTime, endTime));
......
...@@ -154,7 +154,7 @@ public class DutyFireFightingController extends BaseController{ ...@@ -154,7 +154,7 @@ public class DutyFireFightingController extends BaseController{
} }
List<Map<String, Object>> list = iDutyFireFightingService.list(null, startTime, DateUtils.getDateNowShortStr()); List<Map<String, Object>> list = iDutyFireFightingService.list(null, startTime, DateUtils.getDateNowShortStr());
if(list!=null && list.size()>0 ) { if(list!=null && list.size()>0 ) {
throw new BadRequest("班次已有值班数据,无法删除"); return ResponseHelper.buildResponse(0);
} }
return ResponseHelper.buildResponse(iDutyFireFightingService.deleteDutyData(instanceId, startTime, endTime)); return ResponseHelper.buildResponse(iDutyFireFightingService.deleteDutyData(instanceId, startTime, endTime));
} }
......
...@@ -147,7 +147,7 @@ public class DutyFirstAidController extends BaseController{ ...@@ -147,7 +147,7 @@ public class DutyFirstAidController extends BaseController{
} }
List<Map<String, Object>> list = iDutyFirstAidService.list(null, startTime, DateUtils.getDateNowShortStr()); List<Map<String, Object>> list = iDutyFirstAidService.list(null, startTime, DateUtils.getDateNowShortStr());
if(list!=null && list.size()>0 ) { if(list!=null && list.size()>0 ) {
throw new BadRequest("班次已有值班数据,无法删除"); return ResponseHelper.buildResponse(0);
} }
return ResponseHelper.buildResponse(iDutyFirstAidService.deleteDutyData(instanceId, startTime, endTime)); return ResponseHelper.buildResponse(iDutyFirstAidService.deleteDutyData(instanceId, startTime, endTime));
} }
......
...@@ -144,7 +144,8 @@ public class DutyPersonController extends BaseController { ...@@ -144,7 +144,8 @@ public class DutyPersonController extends BaseController {
} }
List<Map<String, Object>> list = iDutyPersonService.list(null, startTime, DateUtils.getDateNowShortStr()); List<Map<String, Object>> list = iDutyPersonService.list(null, startTime, DateUtils.getDateNowShortStr());
if(list!=null && list.size()>0 ) { if(list!=null && list.size()>0 ) {
throw new BadRequest("班次已有值班数据,无法删除"); // throw new BadRequest("班次已有值班数据,无法删除");
return ResponseHelper.buildResponse(0);
} }
// BUG 2807 删除逻辑缺陷,现在前端后端传入 删除月份 2021-09-10 by kongfm // BUG 2807 删除逻辑缺陷,现在前端后端传入 删除月份 2021-09-10 by kongfm
return ResponseHelper.buildResponse(iDutyPersonService.deleteDutyData(instanceId, startTime, endTime)); return ResponseHelper.buildResponse(iDutyPersonService.deleteDutyData(instanceId, startTime, endTime));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment