Merge remote-tracking branch 'origin/master' into master

@@ -10,7 +10,6 @@ import com.skua.core.api.vo.Result;
 import com.skua.core.aspect.annotation.AutoLog;
 import com.skua.core.context.BaseContextHandler;
 import com.skua.core.query.QueryGenerator;
-import com.skua.core.service.ISequenceService;
 import com.skua.core.util.ConvertUtils;
 import com.skua.modules.ajh.entity.AjhPlanScheduleConfig;
 import com.skua.modules.ajh.service.IAjhPlanScheduleConfigService;
@@ -18,7 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.modules.common.vo.TreeNodeVO;
-import com.skua.test.AjhPlanScheduleConfigXls;
+import com.skua.modules.ajh.vo.AjhPlanScheduleConfigXls;
 import com.skua.tool.util.TreeBuilder;
 import lombok.extern.slf4j.Slf4j;
 

 package com.skua.modules.ajh.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.skua.modules.ajh.entity.AjhPlanScheduleConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.skua.modules.common.vo.TreeNodeVO;
-import com.skua.test.AjhPlanScheduleConfigXls;
+import com.skua.modules.ajh.vo.AjhPlanScheduleConfigXls;
 
 import java.util.List;
 

@@ -5,9 +5,8 @@ import com.skua.modules.ajh.entity.AjhPlanScheduleConfig;
 import com.skua.modules.ajh.mapper.AjhPlanScheduleConfigMapper;
 import com.skua.modules.ajh.service.IAjhPlanScheduleConfigService;
 import com.skua.modules.common.vo.TreeNodeVO;
-import com.skua.test.AjhPlanScheduleConfigXls;
+import com.skua.modules.ajh.vo.AjhPlanScheduleConfigXls;
 import com.skua.tool.util.TreeBuilder;
-import com.skua.tool.util.UniqIdUtils;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+package com.skua.modules.ajh.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @auther kangwei
+ * @create 2025-02-25-13:34
+ */
+@Data
+public class AjhPlanScheduleConfigXls {
+    @Excel(name = "序号", width = 15)
+    @ApiModelProperty(value = "序号")
+    private String index;
+    @Excel(name = "工作事项", width = 15)
+    @ApiModelProperty(value = "工作事项")
+    private String workName;
+
+    /**配置名称*/
+    @Excel(name = "具体内容", width = 15)
+    @ApiModelProperty(value = "具体内容")
+    private String configName;
+    /**完成时间*/
+    @Excel(name = "完成时间", width = 15)
+    @ApiModelProperty(value = "完成时间")
+    private String completeTime;
+    /**负责人*/
+    @Excel(name = "负责人", width = 15)
+    @ApiModelProperty(value = "负责人")
+    private String responsibler;
+
+    @ApiModelProperty(value = "上级编号")
+    private String parentId;
+}