安全检查次数

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -121,7 +121,7 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
         map.put("workendTime", DateUtil.format(workendTime, "yyyy-MM-dd"));
         map.put("orgId", orgId);
         return workTimeService.getWorkTime(map, SecurityConstants.INNER);
-}
+    }
 
     /**
      * 有周期计划生成任务
@@ -384,15 +384,15 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
             DateHelper dateHelper = new DateHelper(datetime);
             int cy = Math.toIntExact(plan.getPlanCycle());
             Map<String, Date> map = new HashMap<>();
-            if(cy==6){
+            if (cy == 6) {
                 map.put("start", plan.getStartDate());
                 map.put("end", plan.getEndDate());
-            }else{
-                map= DateHelper.getStartAndEnd(dateHelper, cy);
+            } else {
+                map = DateHelper.getStartAndEnd(dateHelper, cy);
             }
 
             //获取当前受检机构当前周期营业中的作息
-            List<SysWorkTime> workTimes = getWorkTime(map.get("start"), map.get("end"),org.getId());
+            List<SysWorkTime> workTimes = getWorkTime(map.get("start"), map.get("end"), org.getId());
             //配合履职次数为short类型
             short coun = Short.parseShort(plan.getCount().toString());
             //划分时间
@@ -413,10 +413,10 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
                 vo.setCount((int) i);
                 vo.setPlanCycle(Math.toIntExact(plan.getPlanCycle()));
                 //任务名称去除为1
-                if (i == 1) {
+                if (coun == 1 && i == 1) {
                     vo.setPlanName(plan.getPlanName());
                 } else {
-                    vo.setPlanName(plan.getPlanName() + "第" + i  + "次");
+                    vo.setPlanName(plan.getPlanName() + "第" + i + "次");
                 }
                 list.add(vo);
             }