排班可以删除

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/WorkPersonSchedulingController.java

@@ -540,8 +540,23 @@ public class WorkPersonSchedulingController {
                 throw new Exception("未选择日期!");
             }
 
+            //头部是月份
+            Date queryDate = new SimpleDateFormat("yyyy-MM-dd").parse(queryMonth + "-01");
+            Map<String,Object> returnMap = getDayByMonth(queryDate);
+            //List<Integer> days = (List<Integer>)returnMap.get("days");
+            int year = Integer.parseInt(returnMap.get("year").toString());
+            int month = Integer.parseInt(returnMap.get("month").toString());
+            int changeDay = Integer.parseInt(day);
+
+            //先假删除
+            workPersonSchedulingService.deleteByPersonIdSchedulingDay(year,month,changeDay,personInfo.getId());
+
             if(StringUtils.isEmpty(shiftId)){
-                throw new Exception("未选择班次!");
+                //为空删除
+                //throw new Exception("未选择班次!");
+                msgResult.setResult(true);
+                msgResult.setMessage("操作成功");
+                return msgResult;
             }else{
                 String[] shiftIds =  shiftId.split(",");
                 //String sortShiftIds = Arrays.stream(shiftIds).sorted(Comparator.naturalOrder()).collect(Collectors.joining(","));
@@ -552,17 +567,6 @@ public class WorkPersonSchedulingController {
 
                 shiftId = StringUtils.join(sortShiftIdsList,",");
             }
-
-            //头部是月份
-            Date queryDate = new SimpleDateFormat("yyyy-MM-dd").parse(queryMonth + "-01");
-            Map<String,Object> returnMap = getDayByMonth(queryDate);
-            //List<Integer> days = (List<Integer>)returnMap.get("days");
-            int year = Integer.parseInt(returnMap.get("year").toString());
-            int month = Integer.parseInt(returnMap.get("month").toString());
-            int changeDay = Integer.parseInt(day);
-
-            //先假删除
-            workPersonSchedulingService.deleteByPersonIdSchedulingDay(year,month,changeDay,personInfo.getId());
             WorkPersonScheduling wps = workPersonSchedulingService.findByYearMonthDayPersonId(year,month,changeDay,personInfo.getId());
 
             if(wps == null){
@@ -611,7 +615,7 @@ public class WorkPersonSchedulingController {
             ex.printStackTrace();
             logger.error(ex.getMessage(),ex);
             msgResult.setResult(false);
-            msgResult.setMessage("操作失败");
+            msgResult.setMessage(ex.getMessage());
         }
 
         return msgResult;