bug 5569

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/enums/RuleTypeEnum.java

@@ -13,7 +13,8 @@ public enum RuleTypeEnum {
 	计划提交("计划提交", "addPlan","auditPage", RuleConstant.WEB, RuleConstant.TASK),
 	计划审核("计划审核", "planAudit", "auditPage", RuleConstant.APP_WEB, RuleConstant.NOTIFY),
 	计划审核完成("计划审核完成", "planAuditAll", "formulatePage", RuleConstant.APP_WEB, RuleConstant.TASK),
-	计划生成("计划生成", "addPlanTask", null, RuleConstant.APP, RuleConstant.NOTIFY),
+	消息型计划生成("计划生成", "addPlanTask", null, RuleConstant.APP, RuleConstant.NOTIFY),
+	任务型计划生成("计划生成", "addPlanTask", null, RuleConstant.APP, RuleConstant.TASK),
 	计划完成("计划完成", "planCompleted", null, RuleConstant.APP_WEB, RuleConstant.NOTIFY),
 
 	// 隐患

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPlanTaskService.java

@@ -16,6 +16,7 @@ import org.springframework.data.domain.Page;
 import com.yeejoin.amos.supervision.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.supervision.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.supervision.core.common.response.AppPointCheckRespone;
+import com.yeejoin.amos.supervision.dao.entity.Plan;
 import com.yeejoin.amos.supervision.dao.entity.PlanTask;
 
 public interface IPlanTaskService {
@@ -171,4 +172,6 @@ public interface IPlanTaskService {
     List<Map<String, Object>> queryPlanTaskTimeAxis(Long userId, Integer createDate);
 
     List<Map<String, Object>> queryTimeAxis(Long userId, Integer createDate);
+
+	void taskExecutionImportPlan(List<Plan> planList);
 }