Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

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

@@ -382,7 +382,15 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
             DateTime datetime = new DateTime();
             datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             DateHelper dateHelper = new DateHelper(datetime);
-            Map<String, Date> map = DateHelper.getStartAndEnd(dateHelper, Math.toIntExact(plan.getPlanCycle()));
+            int cy = Math.toIntExact(plan.getPlanCycle());
+            Map<String, Date> map = new HashMap<>();
+            if(cy==6){
+                map.put("start", plan.getStartDate());
+                map.put("end", plan.getEndDate());
+            }else{
+                map= DateHelper.getStartAndEnd(dateHelper, cy);
+            }
+
             //获取当前受检机构当前周期营业中的作息
             List<SysWorkTime> workTimes = getWorkTime(map.get("start"), map.get("end"),org.getId());
             //配合履职次数为short类型