diff --git a/src/main/java/com/xdap/self_development/controller/ActivitiProcessController.java b/src/main/java/com/xdap/self_development/controller/ActivitiProcessController.java
index adfd9d5..3f4e116 100644
--- a/src/main/java/com/xdap/self_development/controller/ActivitiProcessController.java
+++ b/src/main/java/com/xdap/self_development/controller/ActivitiProcessController.java
@@ -2,15 +2,14 @@ package com.xdap.self_development.controller;
 
 
 import com.definesys.mpaas.common.http.Response;
-import com.xdap.self_development.controller.form.ApprovalUserNodeDTO;
 import com.xdap.self_development.controller.form.HandleApprovalRequest;
 import com.xdap.self_development.controller.form.HandleReturnNodeForm;
 import com.xdap.self_development.controller.form.UpdateNodeForm;
 import com.xdap.self_development.controller.request.ApprovalNodeRequest;
 import com.xdap.self_development.controller.request.EngineReviewListRequest;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.EngineReviewListPojo;
-import com.xdap.self_development.pojo.dto.*;
+import com.xdap.self_development.domain.pojo.EngineReviewListPojo;
+import com.xdap.self_development.domain.dto.*;
 import com.xdap.self_development.service.ActivitiProcessService;
 import com.xdap.self_development.service.EngineReviewListService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,7 +79,7 @@ public class ActivitiProcessController {
     public Response initiateApproval(@RequestParam(value = "modelID") String modelID , @RequestParam(value = "userID") String userID) {
         List<ActivitiDataDTO> msg =  activitiProcessService.initiateApproval(modelID,userID);
         return Response.ok().data(msg);
-    };
+    }
 //    //平台发起审批时生成本地审批流
 //    @PostMapping(value = "/startActivitiByPlatform")
 //    public Response startActivitiByPlatform(@RequestBody ApprovalByPlatformRequest request) {
@@ -106,19 +105,22 @@ public class ActivitiProcessController {
     public Response handleApproval(@RequestBody HandleApprovalDTO handleApprovalDTO) {
         String msg =  activitiProcessService.handleApproval(handleApprovalDTO);
         return Response.ok().data(msg);
-    };
+    }
+
     //查看审批
     @PostMapping(value = "/showEngReview")
     public Response showEngReview(@RequestBody EngineReviewListRequest engineReviewListRequest) {
         PageResultDTO<EngineReviewListPojo> msg =  engineReviewListService.selectEngineReviewListByUserId(engineReviewListRequest);
         return Response.ok().data(msg);
-    };
+    }
+
     //申请人退回审批
     @GetMapping(value = "/returnApproval")
     public Response returnApproval(@RequestParam(value = "approvalId") String approvalId) {
         String msg =  engineReviewListService.returnApproval(approvalId);
         return Response.ok().data(msg);
-    };
+    }
+
     // 获取是否直送
     @GetMapping("/getIsDirect")
     public Response getIsDirect(
diff --git a/src/main/java/com/xdap/self_development/controller/AnalysisCommonController.java b/src/main/java/com/xdap/self_development/controller/AnalysisCommonController.java
index 524203d..227d3bd 100644
--- a/src/main/java/com/xdap/self_development/controller/AnalysisCommonController.java
+++ b/src/main/java/com/xdap/self_development/controller/AnalysisCommonController.java
@@ -3,9 +3,9 @@ package com.xdap.self_development.controller;
 import com.definesys.mpaas.common.http.Response;
 import com.xdap.self_development.controller.request.AnalysisRequest;
 import com.xdap.self_development.controller.request.ReportRequest;
-import com.xdap.self_development.pojo.DataEntryEngineModelPojo;
-import com.xdap.self_development.pojo.view.AnalysisModelParamterView;
-import com.xdap.self_development.pojo.view.AnalysisModelParamterViewAndParam;
+import com.xdap.self_development.domain.pojo.DataEntryEngineModelPojo;
+import com.xdap.self_development.domain.view.AnalysisModelParamterView;
+import com.xdap.self_development.domain.view.AnalysisModelParamterViewAndParam;
 import com.xdap.self_development.service.AnalysisCommonParametersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java b/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java
index ce62304..da8b9f9 100644
--- a/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java
+++ b/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java
@@ -4,10 +4,10 @@ import com.definesys.mpaas.common.http.Response;
 import com.definesys.mpaas.query.db.PageQueryResult;
 import com.xdap.self_development.controller.form.*;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.BenchmarkingReport;
-import com.xdap.self_development.pojo.dto.ApprovalNodesDTO;
-import com.xdap.self_development.pojo.view.ApprovalFlowNodeView;
-import com.xdap.self_development.pojo.view.TodoAndReportView;
+import com.xdap.self_development.domain.pojo.BenchmarkingReportPojo;
+import com.xdap.self_development.domain.dto.ApprovalNodesDTO;
+import com.xdap.self_development.domain.view.ApprovalFlowNodeView;
+import com.xdap.self_development.domain.view.TodoAndReportView;
 import com.xdap.self_development.service.BenchmarkingReportService;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -17,7 +17,6 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 @RestController
 @RequestMapping("/custom/benchmark")
@@ -204,7 +203,7 @@ public class BenchmarkingReportController {
     public Response getReportDetail(
             @NotBlank String reportId
     ) {
-        BenchmarkingReport report = benchmarkingReportService
+        BenchmarkingReportPojo report = benchmarkingReportService
                 .getReportDetail(reportId);
         return Response.ok().data(report);
     }
diff --git a/src/main/java/com/xdap/self_development/controller/CommonParameterController.java b/src/main/java/com/xdap/self_development/controller/CommonParameterController.java
index 6c919ec..2abebfd 100644
--- a/src/main/java/com/xdap/self_development/controller/CommonParameterController.java
+++ b/src/main/java/com/xdap/self_development/controller/CommonParameterController.java
@@ -3,7 +3,7 @@ package com.xdap.self_development.controller;
 import com.definesys.mpaas.common.http.Response;
 import com.xdap.self_development.controller.form.*;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.AnalysisCommonParameters;
+import com.xdap.self_development.domain.pojo.AnalysisCommonParametersPojo;
 import com.xdap.self_development.service.CommonParameterService;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -70,7 +70,7 @@ public class CommonParameterController {
     public Response getAnalysisCommonParameter(
             @NotBlank @RequestParam String userId
     ) {
-        List<AnalysisCommonParameters> list = commonParameterService.getAnalysisCommonParameter(userId);
+        List<AnalysisCommonParametersPojo> list = commonParameterService.getAnalysisCommonParameter(userId);
         return Response.ok().data(list);
     }
 
diff --git a/src/main/java/com/xdap/self_development/controller/DataEntryController.java b/src/main/java/com/xdap/self_development/controller/DataEntryController.java
index 0ecd3b8..e344887 100644
--- a/src/main/java/com/xdap/self_development/controller/DataEntryController.java
+++ b/src/main/java/com/xdap/self_development/controller/DataEntryController.java
@@ -7,8 +7,8 @@ import com.xdap.runtime.service.RuntimeDatasourceService;
 import com.xdap.runtime.service.RuntimeUserService;
 import com.xdap.self_development.controller.form.OptionForm;
 import com.xdap.self_development.controller.form.TemplateForm;
-import com.xdap.self_development.pojo.Parameter;
-import com.xdap.self_development.pojo.Template;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
+import com.xdap.self_development.domain.pojo.TemplatePojo;
 import com.xdap.self_development.service.DataEntryService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -56,14 +56,14 @@ public class DataEntryController {
     // 筛选条件 模板的模糊搜索
     @GetMapping("/getTemplateByCondition")
     public Response getTemplateByCondition(@RequestParam("templateName") String templateName) {
-        List<Template> templates = dataEntryService.getTemplateByCondition(templateName);
+        List<TemplatePojo> templates = dataEntryService.getTemplateByCondition(templateName);
         return Response.ok().data(templates);
     }
 
     // 筛选条件 参数的模糊搜索
     @GetMapping("/getParameterByCondition")
     public Response getParameterByCondition(OptionForm form) {
-        List<Parameter> parameters = dataEntryService.getParameterByCondition(form);
+        List<ParameterPojo> parameters = dataEntryService.getParameterByCondition(form);
         return Response.ok().data(parameters);
     }
 
diff --git a/src/main/java/com/xdap/self_development/controller/DataEntryEngineModelController.java b/src/main/java/com/xdap/self_development/controller/DataEntryEngineModelController.java
index 2f30656..ec39a3d 100644
--- a/src/main/java/com/xdap/self_development/controller/DataEntryEngineModelController.java
+++ b/src/main/java/com/xdap/self_development/controller/DataEntryEngineModelController.java
@@ -3,8 +3,8 @@ package com.xdap.self_development.controller;
 
 import com.definesys.mpaas.common.http.Response;
 import com.xdap.self_development.controller.request.DataEntryEngineModelPageRequest;
-import com.xdap.self_development.pojo.dto.DataEntryEngineModelDto;
-import com.xdap.self_development.pojo.dto.PageResultDTO;
+import com.xdap.self_development.domain.dto.DataEntryEngineModelDto;
+import com.xdap.self_development.domain.dto.PageResultDTO;
 import com.xdap.self_development.service.DataEntryEngineModelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java b/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java
index cd92885..d5a7b7b 100644
--- a/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java
+++ b/src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java
@@ -4,8 +4,8 @@ package com.xdap.self_development.controller;
 import com.definesys.mpaas.common.http.Response;
 import com.xdap.api.moudle.user.pojo.XdapUsers;
 import com.xdap.self_development.controller.request.EngineParamDetailRequest;
-import com.xdap.self_development.pojo.EngineParamDetailPojo;
-import com.xdap.self_development.pojo.dto.EngineParamDetailDTO;
+import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
+import com.xdap.self_development.domain.dto.EngineParamDetailDTO;
 import com.xdap.self_development.service.EngineParamDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -98,11 +98,7 @@ public class EngineParamDetailController {
     //修改
     @PostMapping(value = "/updateParamValue")
     public Response updateParamValue(@RequestBody List<EngineParamDetailPojo> engineParamDetailPojos,@RequestParam("userID") String currentUserId) {
-        try {
-            engineParamDetailService.updateParamValue(engineParamDetailPojos, currentUserId);
-        } catch (Exception e) {
-            throw e;
-        }
+        engineParamDetailService.updateParamValue(engineParamDetailPojos, currentUserId);
         return Response.ok().data("修改成功,保存草稿,准备进入审批");
     }
 
@@ -110,11 +106,7 @@ public class EngineParamDetailController {
     @PostMapping(value = "/updateToInsertFiledBy")
     public Response updateToInsertFiledBy(@RequestBody List<EngineParamDetailPojo> engineParamDetailPojos,
                                           @RequestParam(value = "userID") String userID) {
-        try {
-            engineParamDetailService.updateToInsertFiledBy(engineParamDetailPojos, userID);
-        } catch (Exception e) {
-            throw e;
-        }
+        engineParamDetailService.updateToInsertFiledBy(engineParamDetailPojos, userID);
         return Response.ok().data("修改成功");
     }
 
diff --git a/src/main/java/com/xdap/self_development/controller/ParameterController.java b/src/main/java/com/xdap/self_development/controller/ParameterController.java
index 839be74..fc82352 100644
--- a/src/main/java/com/xdap/self_development/controller/ParameterController.java
+++ b/src/main/java/com/xdap/self_development/controller/ParameterController.java
@@ -5,8 +5,8 @@ import com.xdap.self_development.common.MyPageResult;
 import com.xdap.self_development.controller.form.ParameterPageForm;
 import com.xdap.self_development.controller.form.UpdateParameterForm;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.Parameter;
-import com.xdap.self_development.pojo.view.TemplateInfoView;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
+import com.xdap.self_development.domain.view.TemplateInfoView;
 import com.xdap.self_development.service.ParameterService;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +31,7 @@ public class ParameterController {
 				throw new CommonException(error.getDefaultMessage());
 			});
 		}
-		MyPageResult<Parameter> list = parameterService.getParameterByCondition(form);
+		MyPageResult<ParameterPojo> list = parameterService.getParameterByCondition(form);
         return Response.ok().data(list);
     }
 
diff --git a/src/main/java/com/xdap/self_development/controller/PermissionController.java b/src/main/java/com/xdap/self_development/controller/PermissionController.java
index 5bb6fca..80d5a1c 100644
--- a/src/main/java/com/xdap/self_development/controller/PermissionController.java
+++ b/src/main/java/com/xdap/self_development/controller/PermissionController.java
@@ -5,26 +5,20 @@ import com.definesys.mpaas.common.http.Response;
 import com.xdap.self_development.controller.request.ModelRolesRequest;
 import com.xdap.self_development.controller.request.RolePerJoinRequest;
 import com.xdap.self_development.controller.request.UserRoleBindingRequest;
-import com.xdap.self_development.pojo.ModelRolesPojo;
-import com.xdap.self_development.pojo.dto.PageResultDTO;
-import com.xdap.self_development.pojo.view.MenuListView;
-import com.xdap.self_development.pojo.view.MenuParamView;
-import com.xdap.self_development.pojo.view.ParametersView;
+import com.xdap.self_development.domain.pojo.ModelRolesPojo;
+import com.xdap.self_development.domain.view.MenuListView;
+import com.xdap.self_development.domain.view.MenuParamView;
 import com.xdap.self_development.service.ModelMenuPermissionService;
 import com.xdap.self_development.service.ModelRoleService;
 import com.xdap.self_development.service.ParameterService;
-import com.xdap.self_development.service.TemplateService;
 import org.apache.commons.lang3.ObjectUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/custom/permission")
diff --git a/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java b/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java
index ea224b0..52b67a1 100644
--- a/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java
+++ b/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java
@@ -8,8 +8,8 @@ import com.xdap.runtime.service.RuntimeDatasourceService;
 import com.xdap.self_development.common.MyResponse;
 import com.xdap.self_development.controller.form.*;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.ResponsiblePerson;
-import com.xdap.self_development.pojo.view.DepartmentUserView;
+import com.xdap.self_development.domain.pojo.ResponsiblePersonPojo;
+import com.xdap.self_development.domain.view.DepartmentUserView;
 import com.xdap.self_development.service.ResponsiblePersonService;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -80,7 +80,7 @@ public class ResponsiblePersonController {
                 throw new CommonException(error.getDefaultMessage());
             });
         }
-        PageQueryResult<ResponsiblePerson> deptResponsible =
+        PageQueryResult<ResponsiblePersonPojo> deptResponsible =
                 responsiblePersonService.getDeptResponsible(form);
         return Response.ok().data(deptResponsible);
     }
@@ -96,7 +96,7 @@ public class ResponsiblePersonController {
                 throw new CommonException(error.getDefaultMessage());
             });
         }
-        PageQueryResult<ResponsiblePerson> deptResponsible =
+        PageQueryResult<ResponsiblePersonPojo> deptResponsible =
                 responsiblePersonService.getDeptFilled(form);
         return Response.ok().data(deptResponsible);
     }
diff --git a/src/main/java/com/xdap/self_development/controller/TcDataQueryController.java b/src/main/java/com/xdap/self_development/controller/TcDataQueryController.java
index fd1a440..6076d1c 100644
--- a/src/main/java/com/xdap/self_development/controller/TcDataQueryController.java
+++ b/src/main/java/com/xdap/self_development/controller/TcDataQueryController.java
@@ -6,7 +6,7 @@ import com.xdap.self_development.controller.request.AnalysisRequest;
 import com.xdap.self_development.controller.request.AnalysisVerRequest;
 import com.xdap.self_development.controller.request.ModelComparisonExportRequest;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.EngineParamDetailPojo;
+import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
 import com.xdap.self_development.service.TcDataQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
diff --git a/src/main/java/com/xdap/self_development/controller/TemplateApprovalController.java b/src/main/java/com/xdap/self_development/controller/TemplateApprovalController.java
index d5727ac..c1d0aa7 100644
--- a/src/main/java/com/xdap/self_development/controller/TemplateApprovalController.java
+++ b/src/main/java/com/xdap/self_development/controller/TemplateApprovalController.java
@@ -5,11 +5,10 @@ import com.definesys.mpaas.query.db.PageQueryResult;
 import com.xdap.runtime.service.RuntimeDatasourceService;
 import com.xdap.self_development.controller.form.*;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
-import com.xdap.self_development.pojo.dto.ApprovalNodesDTO;
-import com.xdap.self_development.pojo.view.ApprovalFlowNodeView;
-import com.xdap.self_development.pojo.view.DepartmentUserView;
-import com.xdap.self_development.pojo.view.TemplateChangeView;
+import com.xdap.self_development.domain.dto.ApprovalNodesDTO;
+import com.xdap.self_development.domain.view.ApprovalFlowNodeView;
+import com.xdap.self_development.domain.view.DepartmentUserView;
+import com.xdap.self_development.domain.view.TemplateChangeView;
 import com.xdap.self_development.service.TemplateApprovalService;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/xdap/self_development/controller/TemplateController.java b/src/main/java/com/xdap/self_development/controller/TemplateController.java
index 1d8a346..3c350e1 100644
--- a/src/main/java/com/xdap/self_development/controller/TemplateController.java
+++ b/src/main/java/com/xdap/self_development/controller/TemplateController.java
@@ -5,7 +5,7 @@ import com.definesys.mpaas.query.db.PageQueryResult;
 import com.xdap.self_development.common.MyResponse;
 import com.xdap.self_development.controller.form.*;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.Template;
+import com.xdap.self_development.domain.pojo.TemplatePojo;
 import com.xdap.self_development.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
@@ -45,7 +45,7 @@ public class TemplateController {
             });
         }
 
-        PageQueryResult<Template> page = templateService.getTemplateByCondition(form);
+        PageQueryResult<TemplatePojo> page = templateService.getTemplateByCondition(form);
         return Response.ok().data(page);
     }
 
@@ -54,7 +54,7 @@ public class TemplateController {
     public Response getTemplateById(
             @NotBlank String templateId
     ) {
-        Template template = templateService.getTemplateById(templateId);
+        TemplatePojo template = templateService.getTemplateById(templateId);
         return Response.ok().data(template);
     }
 
@@ -70,7 +70,7 @@ public class TemplateController {
                 throw new CommonException(error.getDefaultMessage());
             });
         }
-        List<Template> list = templateService.getTemplateVersion(form);
+        List<TemplatePojo> list = templateService.getTemplateVersion(form);
         return Response.ok().data(list);
     }
 
diff --git a/src/main/java/com/xdap/self_development/controller/TodoTaskController.java b/src/main/java/com/xdap/self_development/controller/TodoTaskController.java
index d99cc9f..8d8c14c 100644
--- a/src/main/java/com/xdap/self_development/controller/TodoTaskController.java
+++ b/src/main/java/com/xdap/self_development/controller/TodoTaskController.java
@@ -4,11 +4,11 @@ package com.xdap.self_development.controller;
 import com.definesys.mpaas.common.http.Response;
 import com.xdap.self_development.controller.request.TodoReturnRequest;
 import com.xdap.self_development.controller.request.TodoTaskRequest;
-import com.xdap.self_development.pojo.CompletedTaskPojo;
-import com.xdap.self_development.pojo.InitiatedTaskPojo;
-import com.xdap.self_development.pojo.TodoTaskPojo;
-import com.xdap.self_development.pojo.dto.EngineParamDetailDTO;
-import com.xdap.self_development.pojo.dto.PageResultDTO;
+import com.xdap.self_development.domain.pojo.CompletedTaskPojo;
+import com.xdap.self_development.domain.pojo.InitiatedTaskPojo;
+import com.xdap.self_development.domain.pojo.TodoTaskPojo;
+import com.xdap.self_development.domain.dto.EngineParamDetailDTO;
+import com.xdap.self_development.domain.dto.PageResultDTO;
 import com.xdap.self_development.service.TodoTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/xdap/self_development/controller/YcTaskResultController.java b/src/main/java/com/xdap/self_development/controller/YcTaskResultController.java
index 029ff2e..81f1df3 100644
--- a/src/main/java/com/xdap/self_development/controller/YcTaskResultController.java
+++ b/src/main/java/com/xdap/self_development/controller/YcTaskResultController.java
@@ -3,9 +3,9 @@ package com.xdap.self_development.controller;
 
 import com.definesys.mpaas.common.http.Response;
 import com.xdap.self_development.controller.request.YcGetTodoTaskRequest;
-import com.xdap.self_development.pojo.dto.PageResultDTO;
-import com.xdap.self_development.pojo.dto.YcTodoTaskCommonResultDTO;
-import com.xdap.self_development.pojo.dto.YcTodoTaskResultDTO;
+import com.xdap.self_development.domain.dto.PageResultDTO;
+import com.xdap.self_development.domain.dto.YcTodoTaskCommonResultDTO;
+import com.xdap.self_development.domain.dto.YcTodoTaskResultDTO;
 import com.xdap.self_development.service.TodoTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/src/main/java/com/xdap/self_development/controller/form/ApprovalPersonForm.java b/src/main/java/com/xdap/self_development/controller/form/ApprovalPersonForm.java
index e517dd2..55f070c 100644
--- a/src/main/java/com/xdap/self_development/controller/form/ApprovalPersonForm.java
+++ b/src/main/java/com/xdap/self_development/controller/form/ApprovalPersonForm.java
@@ -1,11 +1,8 @@
 package com.xdap.self_development.controller.form;
 
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
 
 @Data
 public class ApprovalPersonForm {
diff --git a/src/main/java/com/xdap/self_development/controller/form/ApprovalUserNodeDTO.java b/src/main/java/com/xdap/self_development/controller/form/ApprovalUserNodeDTO.java
index ddc3483..8b5976b 100644
--- a/src/main/java/com/xdap/self_development/controller/form/ApprovalUserNodeDTO.java
+++ b/src/main/java/com/xdap/self_development/controller/form/ApprovalUserNodeDTO.java
@@ -1,7 +1,6 @@
 package com.xdap.self_development.controller.form;
 
 import com.xdap.api.moudle.user.pojo.XdapUsers;
-import com.xdap.self_development.pojo.view.XdapUserView;
 import lombok.Data;
 
 import java.util.List;
diff --git a/src/main/java/com/xdap/self_development/controller/form/ModelCommonItem.java b/src/main/java/com/xdap/self_development/controller/form/ModelCommonItem.java
index 041ed8a..e2abbc3 100644
--- a/src/main/java/com/xdap/self_development/controller/form/ModelCommonItem.java
+++ b/src/main/java/com/xdap/self_development/controller/form/ModelCommonItem.java
@@ -1,6 +1,6 @@
 package com.xdap.self_development.controller.form;
 
-import com.xdap.self_development.pojo.view.ParametersView;
+import com.xdap.self_development.domain.view.ParametersView;
 import lombok.Data;
 
 import java.util.List;
diff --git a/src/main/java/com/xdap/self_development/controller/form/ModelCommonParameterInsertForm.java b/src/main/java/com/xdap/self_development/controller/form/ModelCommonParameterInsertForm.java
index 578a28d..b12f4c4 100644
--- a/src/main/java/com/xdap/self_development/controller/form/ModelCommonParameterInsertForm.java
+++ b/src/main/java/com/xdap/self_development/controller/form/ModelCommonParameterInsertForm.java
@@ -1,11 +1,10 @@
 package com.xdap.self_development.controller.form;
 
-import com.xdap.self_development.pojo.view.ParameterItem;
+import com.xdap.self_development.domain.view.ParameterItem;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
diff --git a/src/main/java/com/xdap/self_development/controller/form/ModelCommonParameterUpdateForm.java b/src/main/java/com/xdap/self_development/controller/form/ModelCommonParameterUpdateForm.java
index c6cd732..a38119f 100644
--- a/src/main/java/com/xdap/self_development/controller/form/ModelCommonParameterUpdateForm.java
+++ b/src/main/java/com/xdap/self_development/controller/form/ModelCommonParameterUpdateForm.java
@@ -1,11 +1,10 @@
 package com.xdap.self_development.controller.form;
 
-import com.xdap.self_development.pojo.view.ParameterItem;
+import com.xdap.self_development.domain.view.ParameterItem;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
diff --git a/src/main/java/com/xdap/self_development/controller/form/RestartReportApprovalForm.java b/src/main/java/com/xdap/self_development/controller/form/RestartReportApprovalForm.java
index 227302b..4baff53 100644
--- a/src/main/java/com/xdap/self_development/controller/form/RestartReportApprovalForm.java
+++ b/src/main/java/com/xdap/self_development/controller/form/RestartReportApprovalForm.java
@@ -1,6 +1,6 @@
 package com.xdap.self_development.controller.form;
 
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
+import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java b/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java
index 603bdb7..c821314 100644
--- a/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java
+++ b/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java
@@ -1,6 +1,6 @@
 package com.xdap.self_development.controller.form;
 
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
+import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/src/main/java/com/xdap/self_development/controller/form/StartApprovalRequest.java b/src/main/java/com/xdap/self_development/controller/form/StartApprovalRequest.java
index f933a87..39ce75d 100644
--- a/src/main/java/com/xdap/self_development/controller/form/StartApprovalRequest.java
+++ b/src/main/java/com/xdap/self_development/controller/form/StartApprovalRequest.java
@@ -1,6 +1,6 @@
 package com.xdap.self_development.controller.form;
 
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
+import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/src/main/java/com/xdap/self_development/controller/form/UpdateBenchmarkingReportForm.java b/src/main/java/com/xdap/self_development/controller/form/UpdateBenchmarkingReportForm.java
index 51d40ff..300696e 100644
--- a/src/main/java/com/xdap/self_development/controller/form/UpdateBenchmarkingReportForm.java
+++ b/src/main/java/com/xdap/self_development/controller/form/UpdateBenchmarkingReportForm.java
@@ -1,11 +1,8 @@
 package com.xdap.self_development.controller.form;
 
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
 
 @Data
 public class UpdateBenchmarkingReportForm {
diff --git a/src/main/java/com/xdap/self_development/controller/form/UpdateNodeForm.java b/src/main/java/com/xdap/self_development/controller/form/UpdateNodeForm.java
index 3a73227..24b45f1 100644
--- a/src/main/java/com/xdap/self_development/controller/form/UpdateNodeForm.java
+++ b/src/main/java/com/xdap/self_development/controller/form/UpdateNodeForm.java
@@ -1,6 +1,6 @@
 package com.xdap.self_development.controller.form;
 
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
+import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
diff --git a/src/main/java/com/xdap/self_development/controller/request/ApprovalNodeRequest.java b/src/main/java/com/xdap/self_development/controller/request/ApprovalNodeRequest.java
index ac82a07..06625a5 100644
--- a/src/main/java/com/xdap/self_development/controller/request/ApprovalNodeRequest.java
+++ b/src/main/java/com/xdap/self_development/controller/request/ApprovalNodeRequest.java
@@ -1,7 +1,7 @@
 package com.xdap.self_development.controller.request;
 
-import com.xdap.self_development.pojo.EngineParamDetailPojo;
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
+import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
+import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
 import lombok.Data;
 
 import java.util.List;
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataAndRecordDTO.java b/src/main/java/com/xdap/self_development/domain/dto/ActivitiDataAndRecordDTO.java
similarity index 85%
rename from src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataAndRecordDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/ActivitiDataAndRecordDTO.java
index c633b4d..f9864ce 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataAndRecordDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/ActivitiDataAndRecordDTO.java
@@ -1,7 +1,7 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xdap.self_development.pojo.view.FlowNode;
+import com.xdap.self_development.domain.view.FlowNode;
 import lombok.Data;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataDTO.java b/src/main/java/com/xdap/self_development/domain/dto/ActivitiDataDTO.java
similarity index 92%
rename from src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/ActivitiDataDTO.java
index 9ec6d44..2e2379c 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/ActivitiDataDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/ActivitiDataDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/feign/dto/AppTokenDTO.java b/src/main/java/com/xdap/self_development/domain/dto/AppTokenDTO.java
similarity index 85%
rename from src/main/java/com/xdap/self_development/feign/dto/AppTokenDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/AppTokenDTO.java
index 1c16921..5f9d241 100644
--- a/src/main/java/com/xdap/self_development/feign/dto/AppTokenDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/AppTokenDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.feign.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/ApprovalNodeDTO.java b/src/main/java/com/xdap/self_development/domain/dto/ApprovalNodeDTO.java
similarity index 79%
rename from src/main/java/com/xdap/self_development/pojo/dto/ApprovalNodeDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/ApprovalNodeDTO.java
index 89e7736..8832370 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/ApprovalNodeDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/ApprovalNodeDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/ApprovalNodesDTO.java b/src/main/java/com/xdap/self_development/domain/dto/ApprovalNodesDTO.java
similarity index 86%
rename from src/main/java/com/xdap/self_development/pojo/dto/ApprovalNodesDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/ApprovalNodesDTO.java
index 7754ea9..469965f 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/ApprovalNodesDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/ApprovalNodesDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import com.xdap.self_development.controller.form.ApprovalUserNodeDTO;
 import lombok.Data;
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java b/src/main/java/com/xdap/self_development/domain/dto/DataEntryEngineModelDto.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java
rename to src/main/java/com/xdap/self_development/domain/dto/DataEntryEngineModelDto.java
index 96abd23..8a28e92 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/DataEntryEngineModelDto.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
@@ -6,6 +6,7 @@ import com.definesys.mpaas.query.annotation.SQL;
 import com.definesys.mpaas.query.annotation.SQLQuery;
 import com.definesys.mpaas.query.model.MpaasBasePojo;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -17,6 +18,7 @@ import java.util.Date;
  * @author Lys111
  * @since 2025-11-12
  */
+@EqualsAndHashCode(callSuper = true)
 @SQLQuery(value = {
         @SQL(view = "selectVersionByConditionPage",
                 sql = "WITH ranked_models AS ( SELECT deem.*, epd.major_version AS parameterVersion, ROW_NUMBER() OVER (PARTITION BY deem.id, epd.major_version ORDER BY deem.id) AS rn FROM data_entry_engine_model deem JOIN engine_param_detail epd ON deem.id = epd.engine_model_id ) SELECT * FROM ranked_models WHERE rn = 1 ORDER BY model_name, parameterVersion")
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/EngineParamDetailDTO.java b/src/main/java/com/xdap/self_development/domain/dto/EngineParamDetailDTO.java
similarity index 96%
rename from src/main/java/com/xdap/self_development/pojo/dto/EngineParamDetailDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/EngineParamDetailDTO.java
index 9a648eb..58321d9 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/EngineParamDetailDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/EngineParamDetailDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import com.xdap.api.moudle.user.pojo.XdapUsers;
 import lombok.Data;
diff --git a/src/main/java/com/xdap/self_development/feign/dto/FileDataDTO.java b/src/main/java/com/xdap/self_development/domain/dto/FileDataDTO.java
similarity index 87%
rename from src/main/java/com/xdap/self_development/feign/dto/FileDataDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/FileDataDTO.java
index 294efbf..2978dcc 100644
--- a/src/main/java/com/xdap/self_development/feign/dto/FileDataDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/FileDataDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.feign.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/feign/dto/FileUploadDTO.java b/src/main/java/com/xdap/self_development/domain/dto/FileUploadDTO.java
similarity index 75%
rename from src/main/java/com/xdap/self_development/feign/dto/FileUploadDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/FileUploadDTO.java
index b03ffbf..540469e 100644
--- a/src/main/java/com/xdap/self_development/feign/dto/FileUploadDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/FileUploadDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.feign.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/HandleApprovalDTO.java b/src/main/java/com/xdap/self_development/domain/dto/HandleApprovalDTO.java
similarity index 79%
rename from src/main/java/com/xdap/self_development/pojo/dto/HandleApprovalDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/HandleApprovalDTO.java
index 14b300a..63e7476 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/HandleApprovalDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/HandleApprovalDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/PageResultDTO.java b/src/main/java/com/xdap/self_development/domain/dto/PageResultDTO.java
similarity index 79%
rename from src/main/java/com/xdap/self_development/pojo/dto/PageResultDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/PageResultDTO.java
index cab9a90..c2cfc20 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/PageResultDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/PageResultDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/ShowActivitiDTO.java b/src/main/java/com/xdap/self_development/domain/dto/ShowActivitiDTO.java
similarity index 72%
rename from src/main/java/com/xdap/self_development/pojo/dto/ShowActivitiDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/ShowActivitiDTO.java
index 8e5c5ec..73464d7 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/ShowActivitiDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/ShowActivitiDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/feign/dto/UserTokenDT0.java b/src/main/java/com/xdap/self_development/domain/dto/UserTokenDT0.java
similarity index 66%
rename from src/main/java/com/xdap/self_development/feign/dto/UserTokenDT0.java
rename to src/main/java/com/xdap/self_development/domain/dto/UserTokenDT0.java
index 04f69a1..4bff476 100644
--- a/src/main/java/com/xdap/self_development/feign/dto/UserTokenDT0.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/UserTokenDT0.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.feign.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskCommonResultDTO.java b/src/main/java/com/xdap/self_development/domain/dto/YcTodoTaskCommonResultDTO.java
similarity index 96%
rename from src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskCommonResultDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/YcTodoTaskCommonResultDTO.java
index 8a3a0a9..ea2cbc0 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskCommonResultDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/YcTodoTaskCommonResultDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskResultDTO.java b/src/main/java/com/xdap/self_development/domain/dto/YcTodoTaskResultDTO.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskResultDTO.java
rename to src/main/java/com/xdap/self_development/domain/dto/YcTodoTaskResultDTO.java
index 21c6712..cfbb83c 100644
--- a/src/main/java/com/xdap/self_development/pojo/dto/YcTodoTaskResultDTO.java
+++ b/src/main/java/com/xdap/self_development/domain/dto/YcTodoTaskResultDTO.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.dto;
+package com.xdap.self_development.domain.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/xdap/self_development/enums/ApprovalOrderEnum.java b/src/main/java/com/xdap/self_development/domain/enums/ApprovalOrderEnum.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/enums/ApprovalOrderEnum.java
rename to src/main/java/com/xdap/self_development/domain/enums/ApprovalOrderEnum.java
index bb2c033..ea599e4 100644
--- a/src/main/java/com/xdap/self_development/enums/ApprovalOrderEnum.java
+++ b/src/main/java/com/xdap/self_development/domain/enums/ApprovalOrderEnum.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.enums;
+package com.xdap.self_development.domain.enums;
 
 import lombok.Getter;
 
diff --git a/src/main/java/com/xdap/self_development/enums/CurrentNodeEnum.java b/src/main/java/com/xdap/self_development/domain/enums/CurrentNodeEnum.java
similarity index 69%
rename from src/main/java/com/xdap/self_development/enums/CurrentNodeEnum.java
rename to src/main/java/com/xdap/self_development/domain/enums/CurrentNodeEnum.java
index e9b945a..cf3d729 100644
--- a/src/main/java/com/xdap/self_development/enums/CurrentNodeEnum.java
+++ b/src/main/java/com/xdap/self_development/domain/enums/CurrentNodeEnum.java
@@ -1,5 +1,8 @@
-package com.xdap.self_development.enums;
+package com.xdap.self_development.domain.enums;
 
+import lombok.Getter;
+
+@Getter
 public enum CurrentNodeEnum {
 
     REPAIR("数据维护"),
@@ -11,7 +14,4 @@ public enum CurrentNodeEnum {
         this.desc = desc;
     }
 
-    public String getDesc() {
-        return desc;
-    }
 }
diff --git a/src/main/java/com/xdap/self_development/enums/DistributeStatusEnum.java b/src/main/java/com/xdap/self_development/domain/enums/DistributeStatusEnum.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/enums/DistributeStatusEnum.java
rename to src/main/java/com/xdap/self_development/domain/enums/DistributeStatusEnum.java
index c391bc2..096bd41 100644
--- a/src/main/java/com/xdap/self_development/enums/DistributeStatusEnum.java
+++ b/src/main/java/com/xdap/self_development/domain/enums/DistributeStatusEnum.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.enums;
+package com.xdap.self_development.domain.enums;
 
 import lombok.Getter;
 
diff --git a/src/main/java/com/xdap/self_development/domain/enums/ParamOperationEnum.java b/src/main/java/com/xdap/self_development/domain/enums/ParamOperationEnum.java
new file mode 100644
index 0000000..1c4e9c1
--- /dev/null
+++ b/src/main/java/com/xdap/self_development/domain/enums/ParamOperationEnum.java
@@ -0,0 +1,10 @@
+package com.xdap.self_development.domain.enums;
+
+public enum ParamOperationEnum {
+    //新增
+    INSERT,
+    //修改
+    UPDATE,
+    //删除
+    DELETE
+}
diff --git a/src/main/java/com/xdap/self_development/enums/ParamPermissionEnum.java b/src/main/java/com/xdap/self_development/domain/enums/ParamPermissionEnum.java
similarity index 94%
rename from src/main/java/com/xdap/self_development/enums/ParamPermissionEnum.java
rename to src/main/java/com/xdap/self_development/domain/enums/ParamPermissionEnum.java
index ef6f7ad..b3b1047 100644
--- a/src/main/java/com/xdap/self_development/enums/ParamPermissionEnum.java
+++ b/src/main/java/com/xdap/self_development/domain/enums/ParamPermissionEnum.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.enums;
+package com.xdap.self_development.domain.enums;
 
 import lombok.Getter;
 
diff --git a/src/main/java/com/xdap/self_development/enums/ParamValueVersionEnum.java b/src/main/java/com/xdap/self_development/domain/enums/ParamValueVersionEnum.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/enums/ParamValueVersionEnum.java
rename to src/main/java/com/xdap/self_development/domain/enums/ParamValueVersionEnum.java
index c1d2acc..bf88785 100644
--- a/src/main/java/com/xdap/self_development/enums/ParamValueVersionEnum.java
+++ b/src/main/java/com/xdap/self_development/domain/enums/ParamValueVersionEnum.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.enums;
+package com.xdap.self_development.domain.enums;
 
 import lombok.Getter;
 
diff --git a/src/main/java/com/xdap/self_development/utils/ParameterOperation.java b/src/main/java/com/xdap/self_development/domain/enums/ParameterOperationEnum.java
similarity index 70%
rename from src/main/java/com/xdap/self_development/utils/ParameterOperation.java
rename to src/main/java/com/xdap/self_development/domain/enums/ParameterOperationEnum.java
index 4bb0daf..e179fdd 100644
--- a/src/main/java/com/xdap/self_development/utils/ParameterOperation.java
+++ b/src/main/java/com/xdap/self_development/domain/enums/ParameterOperationEnum.java
@@ -1,11 +1,11 @@
-package com.xdap.self_development.utils;
+package com.xdap.self_development.domain.enums;
 
 import lombok.Getter;
 
 import java.util.Arrays;
 
 @Getter
-public enum ParameterOperation {
+public enum ParameterOperationEnum {
     INSERT("insert", "新增"),
     UPDATE("update", "更新"), 
     DELETE("delete", "删除"),
@@ -14,12 +14,12 @@ public enum ParameterOperation {
     private final String code;
     private final String description;
 
-    ParameterOperation(String code, String description) {
+    ParameterOperationEnum(String code, String description) {
         this.code = code;
         this.description = description;
     }
 
-    public static ParameterOperation fromCode(String code) {
+    public static ParameterOperationEnum fromCode(String code) {
         return Arrays.stream(values())
                 .filter(operation -> operation.code.equals(code))
                 .findFirst()
diff --git a/src/main/java/com/xdap/self_development/pojo/AnalysisCommonParameters.java b/src/main/java/com/xdap/self_development/domain/pojo/AnalysisCommonParametersPojo.java
similarity index 90%
rename from src/main/java/com/xdap/self_development/pojo/AnalysisCommonParameters.java
rename to src/main/java/com/xdap/self_development/domain/pojo/AnalysisCommonParametersPojo.java
index 32aad85..aabdee5 100644
--- a/src/main/java/com/xdap/self_development/pojo/AnalysisCommonParameters.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/AnalysisCommonParametersPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.*;
 import com.definesys.mpaas.query.model.MpaasBasePojo;
@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Table("yfsjglpt_analysis_common_parameters")
-public class AnalysisCommonParameters  extends MpaasBasePojo {
+public class AnalysisCommonParametersPojo extends MpaasBasePojo {
     @RowID(sequence = "analysis_common_parameters_s", type = RowIDType.UUID)
     private String id;
 
diff --git a/src/main/java/com/xdap/self_development/pojo/ApprovalConfigPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/ApprovalConfigPojo.java
similarity index 96%
rename from src/main/java/com/xdap/self_development/pojo/ApprovalConfigPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ApprovalConfigPojo.java
index 5c4532e..bbfc353 100644
--- a/src/main/java/com/xdap/self_development/pojo/ApprovalConfigPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ApprovalConfigPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 
 import com.definesys.mpaas.query.annotation.RowID;
diff --git a/src/main/java/com/xdap/self_development/pojo/ApprovalFlow.java b/src/main/java/com/xdap/self_development/domain/pojo/ApprovalFlowPojo.java
similarity index 91%
rename from src/main/java/com/xdap/self_development/pojo/ApprovalFlow.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ApprovalFlowPojo.java
index d0240a0..6926552 100644
--- a/src/main/java/com/xdap/self_development/pojo/ApprovalFlow.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ApprovalFlowPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
@@ -13,7 +13,7 @@ import java.sql.Timestamp;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Table("yfsjglpt_model_approval_flow")
-public class ApprovalFlow extends MpaasBasePojo {
+public class ApprovalFlowPojo extends MpaasBasePojo {
     @RowID(sequence = "approval_flow_s", type = RowIDType.UUID)
     private String id;
     private String processTitle;
diff --git a/src/main/java/com/xdap/self_development/pojo/ApprovalRecord.java b/src/main/java/com/xdap/self_development/domain/pojo/ApprovalRecordPojo.java
similarity index 80%
rename from src/main/java/com/xdap/self_development/pojo/ApprovalRecord.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ApprovalRecordPojo.java
index b03a341..1257284 100644
--- a/src/main/java/com/xdap/self_development/pojo/ApprovalRecord.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ApprovalRecordPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
@@ -13,7 +13,7 @@ import java.sql.Timestamp;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Table("yfsjglpt_model_approval_record")
-public class ApprovalRecord extends MpaasBasePojo {
+public class ApprovalRecordPojo extends MpaasBasePojo {
     @RowID(sequence = "approval_record_s", type = RowIDType.UUID)
     private String id;
     private String flowId;
@@ -26,7 +26,7 @@ public class ApprovalRecord extends MpaasBasePojo {
     private Timestamp approvalTime;
     private Integer approvalLevel;
 
-    public ApprovalRecord(String flowId, String node, String userId, String opinion, String result, Timestamp approvalTime, Integer approvalLevel) {
+    public ApprovalRecordPojo(String flowId, String node, String userId, String opinion, String result, Timestamp approvalTime, Integer approvalLevel) {
         this.flowId = flowId;
         this.node = node;
         this.userId = userId;
diff --git a/src/main/java/com/xdap/self_development/pojo/ApprovalXdapUsers.java b/src/main/java/com/xdap/self_development/domain/pojo/ApprovalXdapUsersPojo.java
similarity index 72%
rename from src/main/java/com/xdap/self_development/pojo/ApprovalXdapUsers.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ApprovalXdapUsersPojo.java
index a1b7189..e2d5917 100644
--- a/src/main/java/com/xdap/self_development/pojo/ApprovalXdapUsers.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ApprovalXdapUsersPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.Table;
 import com.xdap.api.moudle.base.entity.NoTenBasePojo;
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Table("xdap_users")
 @Data
-public class ApprovalXdapUsers extends NoTenBasePojo {
+public class ApprovalXdapUsersPojo extends NoTenBasePojo {
     private String id;
     private String username;
 }
diff --git a/src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java b/src/main/java/com/xdap/self_development/domain/pojo/BenchmarkingReportPojo.java
similarity index 94%
rename from src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java
rename to src/main/java/com/xdap/self_development/domain/pojo/BenchmarkingReportPojo.java
index 37d0db9..085300a 100644
--- a/src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/BenchmarkingReportPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.*;
 import com.definesys.mpaas.query.model.MpaasBasePojo;
@@ -17,7 +17,7 @@ import java.sql.Timestamp;
 @Data
 @Table("yfsjglpt_model_benchmarking_report")
 @NoArgsConstructor
-public class BenchmarkingReport extends MpaasBasePojo {
+public class BenchmarkingReportPojo extends MpaasBasePojo {
     @RowID(sequence = "benchmarking_report_s", type = RowIDType.UUID)
     private String id;
 
diff --git a/src/main/java/com/xdap/self_development/pojo/ClassificationAttribute.java b/src/main/java/com/xdap/self_development/domain/pojo/ClassificationAttributePojo.java
similarity index 82%
rename from src/main/java/com/xdap/self_development/pojo/ClassificationAttribute.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ClassificationAttributePojo.java
index 7517dd8..3f20404 100644
--- a/src/main/java/com/xdap/self_development/pojo/ClassificationAttribute.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ClassificationAttributePojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.definesys.mpaas.query.annotation.Table;
@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Table("ads_prd_f_tc_flsxb")
-public class ClassificationAttribute extends MpaasBasePojo {
+public class ClassificationAttributePojo extends MpaasBasePojo {
     //图号
     @ExcelProperty("PITEM_ID")
     private String pitemId;
diff --git a/src/main/java/com/xdap/self_development/pojo/CommonParameter.java b/src/main/java/com/xdap/self_development/domain/pojo/CommonParameterPojo.java
similarity index 83%
rename from src/main/java/com/xdap/self_development/pojo/CommonParameter.java
rename to src/main/java/com/xdap/self_development/domain/pojo/CommonParameterPojo.java
index 2296b66..c85a42f 100644
--- a/src/main/java/com/xdap/self_development/pojo/CommonParameter.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/CommonParameterPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Table("yfsjglpt_common_parameter")
-public class CommonParameter extends MpaasBasePojo {
+public class CommonParameterPojo extends MpaasBasePojo {
     @RowID(sequence = "common_parameters_s", type = RowIDType.UUID)
     private String id;
     private String commonName;
diff --git a/src/main/java/com/xdap/self_development/pojo/CompletedTaskPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/CompletedTaskPojo.java
similarity index 97%
rename from src/main/java/com/xdap/self_development/pojo/CompletedTaskPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/CompletedTaskPojo.java
index c1a0e8e..e6364a9 100644
--- a/src/main/java/com/xdap/self_development/pojo/CompletedTaskPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/CompletedTaskPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 
 import com.definesys.mpaas.query.annotation.RowID;
diff --git a/src/main/java/com/xdap/self_development/pojo/DataChangeCommentPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/DataChangeCommentPojo.java
similarity index 96%
rename from src/main/java/com/xdap/self_development/pojo/DataChangeCommentPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/DataChangeCommentPojo.java
index a54d566..38b367e 100644
--- a/src/main/java/com/xdap/self_development/pojo/DataChangeCommentPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/DataChangeCommentPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
diff --git a/src/main/java/com/xdap/self_development/pojo/DataEntryEngineModelPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/DataEntryEngineModelPojo.java
similarity index 98%
rename from src/main/java/com/xdap/self_development/pojo/DataEntryEngineModelPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/DataEntryEngineModelPojo.java
index 8a743c0..321590f 100644
--- a/src/main/java/com/xdap/self_development/pojo/DataEntryEngineModelPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/DataEntryEngineModelPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
diff --git a/src/main/java/com/xdap/self_development/pojo/EngineParamDetailPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/EngineParamDetailPojo.java
similarity index 97%
rename from src/main/java/com/xdap/self_development/pojo/EngineParamDetailPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/EngineParamDetailPojo.java
index 1c0f1b0..25e7b53 100644
--- a/src/main/java/com/xdap/self_development/pojo/EngineParamDetailPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/EngineParamDetailPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 
 import com.definesys.mpaas.query.annotation.RowID;
diff --git a/src/main/java/com/xdap/self_development/pojo/EnginePartsCollection.java b/src/main/java/com/xdap/self_development/domain/pojo/EnginePartsCollectionPojo.java
similarity index 82%
rename from src/main/java/com/xdap/self_development/pojo/EnginePartsCollection.java
rename to src/main/java/com/xdap/self_development/domain/pojo/EnginePartsCollectionPojo.java
index 3a1e94b..1ef4543 100644
--- a/src/main/java/com/xdap/self_development/pojo/EnginePartsCollection.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/EnginePartsCollectionPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.definesys.mpaas.query.annotation.Table;
@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Table("ads_prd_f_yfsjglpt_fdjlbjcjb")
-public class EnginePartsCollection extends MpaasBasePojo {
+public class EnginePartsCollectionPojo extends MpaasBasePojo {
     // 状态机 -> 状态代号
     @ExcelProperty("ztj")
     private String ztj;
diff --git a/src/main/java/com/xdap/self_development/pojo/EngineReviewListPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/EngineReviewListPojo.java
similarity index 97%
rename from src/main/java/com/xdap/self_development/pojo/EngineReviewListPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/EngineReviewListPojo.java
index 329e0f2..f2e6c61 100644
--- a/src/main/java/com/xdap/self_development/pojo/EngineReviewListPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/EngineReviewListPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.definesys.mpaas.query.annotation.RowID;
diff --git a/src/main/java/com/xdap/self_development/pojo/GlobalParameter.java b/src/main/java/com/xdap/self_development/domain/pojo/GlobalParameterPojo.java
similarity index 88%
rename from src/main/java/com/xdap/self_development/pojo/GlobalParameter.java
rename to src/main/java/com/xdap/self_development/domain/pojo/GlobalParameterPojo.java
index 7b08e71..837d47e 100644
--- a/src/main/java/com/xdap/self_development/pojo/GlobalParameter.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/GlobalParameterPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.definesys.mpaas.query.annotation.RowID;
@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @Data
 @Table("yfsjglpt_model_global_parameter")
 @NoArgsConstructor
-public class GlobalParameter extends MpaasBasePojo {
+public class GlobalParameterPojo extends MpaasBasePojo {
     @RowID(sequence = "global_parameter_s", type = RowIDType.UUID)
     private String id;
     @ExcelProperty("子系统")
diff --git a/src/main/java/com/xdap/self_development/pojo/InitiatedTaskPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/InitiatedTaskPojo.java
similarity index 97%
rename from src/main/java/com/xdap/self_development/pojo/InitiatedTaskPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/InitiatedTaskPojo.java
index 5c0a3ed..6afd3ca 100644
--- a/src/main/java/com/xdap/self_development/pojo/InitiatedTaskPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/InitiatedTaskPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 
 import com.definesys.mpaas.query.annotation.RowID;
diff --git a/src/main/java/com/xdap/self_development/pojo/ModelCommonParameters.java b/src/main/java/com/xdap/self_development/domain/pojo/ModelCommonParametersPojo.java
similarity index 94%
rename from src/main/java/com/xdap/self_development/pojo/ModelCommonParameters.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ModelCommonParametersPojo.java
index 2bd58fd..e9d78a0 100644
--- a/src/main/java/com/xdap/self_development/pojo/ModelCommonParameters.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ModelCommonParametersPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.*;
 import com.definesys.mpaas.query.model.MpaasBasePojo;
@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Table("yfsjglpt_model_common_parameters")
-public class ModelCommonParameters extends MpaasBasePojo {
+public class ModelCommonParametersPojo extends MpaasBasePojo {
     @RowID(sequence = "model_common_parameters_s", type = RowIDType.UUID)
     private String id;
     private String parameterId;
diff --git a/src/main/java/com/xdap/self_development/pojo/ModelDepUserRolePojo.java b/src/main/java/com/xdap/self_development/domain/pojo/ModelDepUserRolePojo.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/pojo/ModelDepUserRolePojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ModelDepUserRolePojo.java
index 3fb1208..b428bd5 100644
--- a/src/main/java/com/xdap/self_development/pojo/ModelDepUserRolePojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ModelDepUserRolePojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
diff --git a/src/main/java/com/xdap/self_development/pojo/ModelMenuDictionaryPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/ModelMenuDictionaryPojo.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/pojo/ModelMenuDictionaryPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ModelMenuDictionaryPojo.java
index f5b0c07..3ba5e82 100644
--- a/src/main/java/com/xdap/self_development/pojo/ModelMenuDictionaryPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ModelMenuDictionaryPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
diff --git a/src/main/java/com/xdap/self_development/pojo/ModelMenuParameterPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/ModelMenuParameterPojo.java
similarity index 96%
rename from src/main/java/com/xdap/self_development/pojo/ModelMenuParameterPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ModelMenuParameterPojo.java
index 186b2c1..1353a06 100644
--- a/src/main/java/com/xdap/self_development/pojo/ModelMenuParameterPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ModelMenuParameterPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
diff --git a/src/main/java/com/xdap/self_development/pojo/ModelRolePermissionPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/ModelRolePermissionPojo.java
similarity index 93%
rename from src/main/java/com/xdap/self_development/pojo/ModelRolePermissionPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ModelRolePermissionPojo.java
index 6b21458..81aedb4 100644
--- a/src/main/java/com/xdap/self_development/pojo/ModelRolePermissionPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ModelRolePermissionPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
@@ -14,7 +14,7 @@ import java.util.Date;
 public class ModelRolePermissionPojo {
 
     @RowID(sequence = "yfsjglpt_model_role_permission_s", type = RowIDType.UUID)
-    /** ID,; */
+    /* ID,; */
     private String id ;
     /** 角色ID,; */
     private String roleId ;
diff --git a/src/main/java/com/xdap/self_development/pojo/ModelRolesPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/ModelRolesPojo.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/pojo/ModelRolesPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ModelRolesPojo.java
index bf6ffed..ad56c7c 100644
--- a/src/main/java/com/xdap/self_development/pojo/ModelRolesPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ModelRolesPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
diff --git a/src/main/java/com/xdap/self_development/pojo/ParamApprovalRecordPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/ParamApprovalRecordPojo.java
similarity index 97%
rename from src/main/java/com/xdap/self_development/pojo/ParamApprovalRecordPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ParamApprovalRecordPojo.java
index 79fc6c5..c509409 100644
--- a/src/main/java/com/xdap/self_development/pojo/ParamApprovalRecordPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ParamApprovalRecordPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 
 import com.definesys.mpaas.query.annotation.RowID;
diff --git a/src/main/java/com/xdap/self_development/pojo/Parameter.java b/src/main/java/com/xdap/self_development/domain/pojo/ParameterPojo.java
similarity index 92%
rename from src/main/java/com/xdap/self_development/pojo/Parameter.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ParameterPojo.java
index 05b949c..afc1383 100644
--- a/src/main/java/com/xdap/self_development/pojo/Parameter.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ParameterPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -30,7 +30,7 @@ import lombok.NoArgsConstructor;
 @Data
 @Table("yfsjglpt_model_parameter")
 @NoArgsConstructor
-public class Parameter extends MpaasBasePojo {
+public class ParameterPojo extends MpaasBasePojo {
     @RowID(sequence = "parameter_s", type = RowIDType.UUID)
     private String id;
     @ExcelProperty("序号")
@@ -65,9 +65,9 @@ public class Parameter extends MpaasBasePojo {
     @Column(value = "max_number",type=ColumnType.CALCULATE)
     private Integer maxNumber;
 
-    public Parameter(Integer parameterNumber, String subsystemName, String parameterType,
-                     String partsName, String parameterName, String unit, String parameterSource,
-                     String numberOrFormula, String department, String remarks) {
+    public ParameterPojo(Integer parameterNumber, String subsystemName, String parameterType,
+                         String partsName, String parameterName, String unit, String parameterSource,
+                         String numberOrFormula, String department, String remarks) {
         this.parameterNumber = parameterNumber;
         this.subsystemName = subsystemName;
         this.parameterType = parameterType;
diff --git a/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java b/src/main/java/com/xdap/self_development/domain/pojo/ResponsiblePersonPojo.java
similarity index 91%
rename from src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java
rename to src/main/java/com/xdap/self_development/domain/pojo/ResponsiblePersonPojo.java
index 1185340..3271240 100644
--- a/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/ResponsiblePersonPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.definesys.mpaas.query.annotation.*;
@@ -15,7 +15,7 @@ import java.sql.Timestamp;
         @SQL(view = "getResponsibleAndName",
                 sql = "SELECT ymrp.*, xu.username, xu.user_number as userAccount FROM yfsjglpt_model_responsible_person ymrp JOIN xdap_users xu ON ymrp.user_id = xu.id where ymrp.person_level = #level order by creation_date desc")
 })
-public class ResponsiblePerson extends MpaasBasePojo {
+public class ResponsiblePersonPojo extends MpaasBasePojo {
     @RowID(sequence = "responsible_person_s", type = RowIDType.UUID)
     private String id;
     private String departmentId;
diff --git a/src/main/java/com/xdap/self_development/pojo/RevisionRecord.java b/src/main/java/com/xdap/self_development/domain/pojo/RevisionRecordPojo.java
similarity index 74%
rename from src/main/java/com/xdap/self_development/pojo/RevisionRecord.java
rename to src/main/java/com/xdap/self_development/domain/pojo/RevisionRecordPojo.java
index f22ebdb..23d75d7 100644
--- a/src/main/java/com/xdap/self_development/pojo/RevisionRecord.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/RevisionRecordPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
@@ -15,7 +15,7 @@ import java.sql.Timestamp;
 @Data
 @NoArgsConstructor
 @Table("yfsjglpt_model_revision_record")
-public class RevisionRecord extends MpaasBasePojo {
+public class RevisionRecordPojo extends MpaasBasePojo {
     @RowID(sequence = "revision_record_s", type = RowIDType.UUID)
     private String id;
     private String templateName;
@@ -30,11 +30,11 @@ public class RevisionRecord extends MpaasBasePojo {
 
     private Integer returnNum;
 
-    public RevisionRecord(String templateName, Integer version,
-                          Integer parameterNumber, String modifyDetails,
-                          String templateId, String preTemplateId,
-                          Timestamp createTime, String parameterId,
-                          Integer returnNum) {
+    public RevisionRecordPojo(String templateName, Integer version,
+                              Integer parameterNumber, String modifyDetails,
+                              String templateId, String preTemplateId,
+                              Timestamp createTime, String parameterId,
+                              Integer returnNum) {
         this.templateName = templateName;
         this.version = version;
         this.parameterNumber = parameterNumber;
diff --git a/src/main/java/com/xdap/self_development/pojo/TemplateAndParameter.java b/src/main/java/com/xdap/self_development/domain/pojo/TemplateAndParameterPojo.java
similarity index 82%
rename from src/main/java/com/xdap/self_development/pojo/TemplateAndParameter.java
rename to src/main/java/com/xdap/self_development/domain/pojo/TemplateAndParameterPojo.java
index 44a3ac4..120bf6c 100644
--- a/src/main/java/com/xdap/self_development/pojo/TemplateAndParameter.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/TemplateAndParameterPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.RowID;
 import com.definesys.mpaas.query.annotation.RowIDType;
@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Table("yfsjglpt_model_parameter_and_template")
-public class TemplateAndParameter extends MpaasBasePojo {
+public class TemplateAndParameterPojo extends MpaasBasePojo {
     @RowID(sequence = "template_and_parameter_s", type = RowIDType.UUID)
     private String id;
     private String templateId;
diff --git a/src/main/java/com/xdap/self_development/pojo/Template.java b/src/main/java/com/xdap/self_development/domain/pojo/TemplatePojo.java
similarity index 93%
rename from src/main/java/com/xdap/self_development/pojo/Template.java
rename to src/main/java/com/xdap/self_development/domain/pojo/TemplatePojo.java
index 24f6e1c..15156ee 100644
--- a/src/main/java/com/xdap/self_development/pojo/Template.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/TemplatePojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 import com.definesys.mpaas.query.annotation.*;
 import com.definesys.mpaas.query.model.MpaasBasePojo;
@@ -26,7 +26,7 @@ import java.sql.Timestamp;
 @Data
 @Table("yfsjglpt_model_template")
 @NoArgsConstructor
-public class Template extends MpaasBasePojo {
+public class TemplatePojo extends MpaasBasePojo {
     @RowID(sequence = "template_s", type = RowIDType.UUID)
     private String id;
     private String templateName;
@@ -44,9 +44,9 @@ public class Template extends MpaasBasePojo {
     @Column(type = ColumnType.CALCULATE)
     private Integer maxOrder;
 
-    public Template(String templateName, Integer version, String status,
-                    Timestamp createdTime, Timestamp publishedTime,
-                    String createBy, Long orderNum, Integer returnNum) {
+    public TemplatePojo(String templateName, Integer version, String status,
+                        Timestamp createdTime, Timestamp publishedTime,
+                        String createBy, Long orderNum, Integer returnNum) {
         this.templateName = templateName;
         this.version = version;
         this.status = status;
diff --git a/src/main/java/com/xdap/self_development/pojo/TodoTaskPojo.java b/src/main/java/com/xdap/self_development/domain/pojo/TodoTaskPojo.java
similarity index 97%
rename from src/main/java/com/xdap/self_development/pojo/TodoTaskPojo.java
rename to src/main/java/com/xdap/self_development/domain/pojo/TodoTaskPojo.java
index deee187..68a5f38 100644
--- a/src/main/java/com/xdap/self_development/pojo/TodoTaskPojo.java
+++ b/src/main/java/com/xdap/self_development/domain/pojo/TodoTaskPojo.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo;
+package com.xdap.self_development.domain.pojo;
 
 
 import com.definesys.mpaas.query.annotation.RowID;
diff --git a/src/main/java/com/xdap/self_development/pojo/view/AnalysisModelParamterView.java b/src/main/java/com/xdap/self_development/domain/view/AnalysisModelParamterView.java
similarity index 79%
rename from src/main/java/com/xdap/self_development/pojo/view/AnalysisModelParamterView.java
rename to src/main/java/com/xdap/self_development/domain/view/AnalysisModelParamterView.java
index 1d16cb6..b58c540 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/AnalysisModelParamterView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/AnalysisModelParamterView.java
@@ -1,6 +1,6 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
-import com.xdap.self_development.pojo.EngineParamDetailPojo;
+import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
 import lombok.Data;
 
 import java.util.List;
diff --git a/src/main/java/com/xdap/self_development/pojo/view/AnalysisModelParamterViewAndParam.java b/src/main/java/com/xdap/self_development/domain/view/AnalysisModelParamterViewAndParam.java
similarity index 62%
rename from src/main/java/com/xdap/self_development/pojo/view/AnalysisModelParamterViewAndParam.java
rename to src/main/java/com/xdap/self_development/domain/view/AnalysisModelParamterViewAndParam.java
index f95a858..b8bb9a3 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/AnalysisModelParamterViewAndParam.java
+++ b/src/main/java/com/xdap/self_development/domain/view/AnalysisModelParamterViewAndParam.java
@@ -1,6 +1,5 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
-import com.xdap.self_development.pojo.EngineParamDetailPojo;
 import lombok.Data;
 
 import java.util.List;
diff --git a/src/main/java/com/xdap/self_development/pojo/view/ApprovalFlowNodeView.java b/src/main/java/com/xdap/self_development/domain/view/ApprovalFlowNodeView.java
similarity index 92%
rename from src/main/java/com/xdap/self_development/pojo/view/ApprovalFlowNodeView.java
rename to src/main/java/com/xdap/self_development/domain/view/ApprovalFlowNodeView.java
index b3e177f..2783a82 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/ApprovalFlowNodeView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/ApprovalFlowNodeView.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/src/main/java/com/xdap/self_development/pojo/view/CalculationParameterView.java b/src/main/java/com/xdap/self_development/domain/view/CalculationParameterView.java
similarity index 96%
rename from src/main/java/com/xdap/self_development/pojo/view/CalculationParameterView.java
rename to src/main/java/com/xdap/self_development/domain/view/CalculationParameterView.java
index 22c993b..d03d36f 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/CalculationParameterView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/CalculationParameterView.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import com.definesys.mpaas.query.annotation.SQL;
 import com.definesys.mpaas.query.annotation.SQLQuery;
diff --git a/src/main/java/com/xdap/self_development/pojo/view/DepartmentUserView.java b/src/main/java/com/xdap/self_development/domain/view/DepartmentUserView.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/pojo/view/DepartmentUserView.java
rename to src/main/java/com/xdap/self_development/domain/view/DepartmentUserView.java
index 71b976b..d2797c3 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/DepartmentUserView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/DepartmentUserView.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import com.definesys.mpaas.query.annotation.SQL;
 import com.definesys.mpaas.query.annotation.SQLQuery;
diff --git a/src/main/java/com/xdap/self_development/pojo/view/FlowNode.java b/src/main/java/com/xdap/self_development/domain/view/FlowNode.java
similarity index 92%
rename from src/main/java/com/xdap/self_development/pojo/view/FlowNode.java
rename to src/main/java/com/xdap/self_development/domain/view/FlowNode.java
index bd572cb..ad40c99 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/FlowNode.java
+++ b/src/main/java/com/xdap/self_development/domain/view/FlowNode.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
diff --git a/src/main/java/com/xdap/self_development/domain/view/MenuListView.java b/src/main/java/com/xdap/self_development/domain/view/MenuListView.java
new file mode 100644
index 0000000..2933d30
--- /dev/null
+++ b/src/main/java/com/xdap/self_development/domain/view/MenuListView.java
@@ -0,0 +1,16 @@
+package com.xdap.self_development.domain.view;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+
+
+@Data
+public class MenuListView {
+    private String id;
+    private String parent_id;
+    private String menu;
+    private String menuDesc;
+    ArrayList<MenuListView> listViews;
+
+}
diff --git a/src/main/java/com/xdap/self_development/pojo/view/MenuParamView.java b/src/main/java/com/xdap/self_development/domain/view/MenuParamView.java
similarity index 86%
rename from src/main/java/com/xdap/self_development/pojo/view/MenuParamView.java
rename to src/main/java/com/xdap/self_development/domain/view/MenuParamView.java
index b8da38b..724ef63 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/MenuParamView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/MenuParamView.java
@@ -1,11 +1,9 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
-
 
 @Data
 @AllArgsConstructor
diff --git a/src/main/java/com/xdap/self_development/pojo/view/ParameterItem.java b/src/main/java/com/xdap/self_development/domain/view/ParameterItem.java
similarity index 72%
rename from src/main/java/com/xdap/self_development/pojo/view/ParameterItem.java
rename to src/main/java/com/xdap/self_development/domain/view/ParameterItem.java
index 2537bd6..593e9f7 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/ParameterItem.java
+++ b/src/main/java/com/xdap/self_development/domain/view/ParameterItem.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/pojo/view/ParametersView.java b/src/main/java/com/xdap/self_development/domain/view/ParametersView.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/pojo/view/ParametersView.java
rename to src/main/java/com/xdap/self_development/domain/view/ParametersView.java
index 73e7e60..627a051 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/ParametersView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/ParametersView.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import com.definesys.mpaas.query.annotation.SQL;
 import com.definesys.mpaas.query.annotation.SQLQuery;
diff --git a/src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java b/src/main/java/com/xdap/self_development/domain/view/TemplateChangeView.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java
rename to src/main/java/com/xdap/self_development/domain/view/TemplateChangeView.java
index 8ac90f9..7e68783 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/TemplateChangeView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/TemplateChangeView.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import com.definesys.mpaas.query.annotation.SQL;
 import com.definesys.mpaas.query.annotation.SQLQuery;
diff --git a/src/main/java/com/xdap/self_development/pojo/view/TemplateInfoView.java b/src/main/java/com/xdap/self_development/domain/view/TemplateInfoView.java
similarity index 76%
rename from src/main/java/com/xdap/self_development/pojo/view/TemplateInfoView.java
rename to src/main/java/com/xdap/self_development/domain/view/TemplateInfoView.java
index 5a6489d..c5a7a3a 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/TemplateInfoView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/TemplateInfoView.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/xdap/self_development/pojo/view/TodoAndReportListView.java b/src/main/java/com/xdap/self_development/domain/view/TodoAndReportListView.java
similarity index 91%
rename from src/main/java/com/xdap/self_development/pojo/view/TodoAndReportListView.java
rename to src/main/java/com/xdap/self_development/domain/view/TodoAndReportListView.java
index 2c0bd94..2dce51f 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/TodoAndReportListView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/TodoAndReportListView.java
@@ -1,9 +1,9 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import com.definesys.mpaas.query.annotation.SQL;
 import com.definesys.mpaas.query.annotation.SQLQuery;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xdap.self_development.pojo.ApprovalXdapUsers;
+import com.xdap.self_development.domain.pojo.ApprovalXdapUsersPojo;
 import lombok.Data;
 
 import java.sql.Timestamp;
@@ -24,7 +24,7 @@ public class TodoAndReportListView {
     private String createBy;
     private String currentUsers;
     private String username;
-    private List<ApprovalXdapUsers> currentApprovers;
+    private List<ApprovalXdapUsersPojo> currentApprovers;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp createdTime;
 }
diff --git a/src/main/java/com/xdap/self_development/pojo/view/TodoAndReportView.java b/src/main/java/com/xdap/self_development/domain/view/TodoAndReportView.java
similarity index 97%
rename from src/main/java/com/xdap/self_development/pojo/view/TodoAndReportView.java
rename to src/main/java/com/xdap/self_development/domain/view/TodoAndReportView.java
index 2e859ba..05ae4bb 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/TodoAndReportView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/TodoAndReportView.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import com.definesys.mpaas.query.annotation.SQL;
 import com.definesys.mpaas.query.annotation.SQLQuery;
diff --git a/src/main/java/com/xdap/self_development/pojo/view/TodoAndTemplateView.java b/src/main/java/com/xdap/self_development/domain/view/TodoAndTemplateView.java
similarity index 95%
rename from src/main/java/com/xdap/self_development/pojo/view/TodoAndTemplateView.java
rename to src/main/java/com/xdap/self_development/domain/view/TodoAndTemplateView.java
index 7cc9a66..aefc50c 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/TodoAndTemplateView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/TodoAndTemplateView.java
@@ -1,10 +1,9 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import com.definesys.mpaas.query.annotation.SQL;
 import com.definesys.mpaas.query.annotation.SQLQuery;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xdap.self_development.pojo.ApprovalXdapUsers;
-import lombok.AllArgsConstructor;
+import com.xdap.self_development.domain.pojo.ApprovalXdapUsersPojo;
 import lombok.Data;
 
 import java.sql.Timestamp;
@@ -29,7 +28,7 @@ public class TodoAndTemplateView {
     private String createBy;
     private String currentUsers;
     private String username;
-    private List<ApprovalXdapUsers> currentApprovers;
+    private List<ApprovalXdapUsersPojo> currentApprovers;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp createdTime;
 }
diff --git a/src/main/java/com/xdap/self_development/pojo/view/XdapUserView.java b/src/main/java/com/xdap/self_development/domain/view/XdapUserView.java
similarity index 92%
rename from src/main/java/com/xdap/self_development/pojo/view/XdapUserView.java
rename to src/main/java/com/xdap/self_development/domain/view/XdapUserView.java
index 64dbe23..3cb4c89 100644
--- a/src/main/java/com/xdap/self_development/pojo/view/XdapUserView.java
+++ b/src/main/java/com/xdap/self_development/domain/view/XdapUserView.java
@@ -1,4 +1,4 @@
-package com.xdap.self_development.pojo.view;
+package com.xdap.self_development.domain.view;
 
 import com.definesys.mpaas.query.annotation.SQL;
 import com.definesys.mpaas.query.annotation.SQLQuery;
diff --git a/src/main/java/com/xdap/self_development/enums/IsDeleteEnum.java b/src/main/java/com/xdap/self_development/enums/IsDeleteEnum.java
deleted file mode 100644
index 05ad942..0000000
--- a/src/main/java/com/xdap/self_development/enums/IsDeleteEnum.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.xdap.self_development.enums;
-
-public enum IsDeleteEnum {
-
-    /**
-     * 已删除
-     */
-    DELETED,
-
-    /**
-     * 未删除
-     */
-    NOT_DELETED,
-}
diff --git a/src/main/java/com/xdap/self_development/enums/ParamOperation.java b/src/main/java/com/xdap/self_development/enums/ParamOperation.java
deleted file mode 100644
index c367446..0000000
--- a/src/main/java/com/xdap/self_development/enums/ParamOperation.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.xdap.self_development.enums;
-
-public enum ParamOperation {
-    //新增
-    INSERT,
-    //修改
-    UPDATE,
-    //删除
-    DELETE;
-}
diff --git a/src/main/java/com/xdap/self_development/feign/ApaasMyTokenFeign.java b/src/main/java/com/xdap/self_development/feign/ApaasMyTokenFeign.java
index 781c1da..62e1cd7 100644
--- a/src/main/java/com/xdap/self_development/feign/ApaasMyTokenFeign.java
+++ b/src/main/java/com/xdap/self_development/feign/ApaasMyTokenFeign.java
@@ -1,15 +1,14 @@
 package com.xdap.self_development.feign;
 
 import com.xdap.common.config.FeignConfig;
-import com.xdap.self_development.feign.dto.*;
+import com.xdap.self_development.domain.dto.AppTokenDTO;
+import com.xdap.self_development.domain.dto.FileUploadDTO;
+import com.xdap.self_development.domain.dto.UserTokenDT0;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Map;
-
 @FeignClient(
         name = "apaas-client",
         url = "${apaas.token.url}",
diff --git a/src/main/java/com/xdap/self_development/interceptor/CustomRequestInterceptor.java b/src/main/java/com/xdap/self_development/interceptor/CustomRequestInterceptor.java
deleted file mode 100644
index 45d39be..0000000
--- a/src/main/java/com/xdap/self_development/interceptor/CustomRequestInterceptor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.xdap.self_development.interceptor;
-
-import com.xdap.api.moudle.user.vo.LoginUserVo;
-import com.xdap.runtime.service.RuntimeAppContextService;
-import com.xdap.runtime.service.RuntimeUserService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Slf4j
-//@Component
-public class CustomRequestInterceptor implements HandlerInterceptor {
-//    @Resource
-//    private RuntimeAppContextService runtimeAppContextService;
-//    @Resource
-//    private RuntimeUserService runtimeUserService;
-
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
-                             Object handler) throws Exception {
-        log.info("=== 请求开始 ===");
-        log.info("请求URL: {}", request.getRequestURL());
-        log.info("请求方法: {}", request.getMethod());
-        log.info("客户端IP: {}", request.getRemoteAddr());
-
-
-
-        return true; // 返回true表示继续处理
-    }
-
-    @Override
-    public void postHandle(HttpServletRequest request, HttpServletResponse response,
-                            Object handler, ModelAndView modelAndView) throws Exception {
-        log.info("=== 请求处理完成，准备渲染视图 ===");
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
-                                Object handler, Exception ex) throws Exception {
-        log.info("=== 请求结束 ===");
-        if (ex != null) {
-            log.error("请求处理过程中发生异常: {}", ex.getMessage());
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/xdap/self_development/listener/EngineModelListener.java b/src/main/java/com/xdap/self_development/listener/EngineModelListener.java
index 9aaf1b0..c39b52e 100644
--- a/src/main/java/com/xdap/self_development/listener/EngineModelListener.java
+++ b/src/main/java/com/xdap/self_development/listener/EngineModelListener.java
@@ -7,10 +7,10 @@ import com.alibaba.excel.util.ListUtils;
 import com.definesys.mpaas.query.MpaasQueryFactory;
 import com.xdap.api.moudle.user.pojo.XdapUsers;
 import com.xdap.self_development.controller.request.DataEntryEngineModelExcel;
-import com.xdap.self_development.enums.DistributeStatusEnum;
-import com.xdap.self_development.enums.ParamValueVersionEnum;
+import com.xdap.self_development.domain.enums.DistributeStatusEnum;
+import com.xdap.self_development.domain.enums.ParamValueVersionEnum;
 import com.xdap.self_development.exception.ExcelImportException;
-import com.xdap.self_development.pojo.*;
+import com.xdap.self_development.domain.pojo.*;
 import com.xdap.self_development.service.EngineParamDetailService;
 import com.xdap.self_development.service.ResponsiblePerService;
 import lombok.extern.slf4j.Slf4j;
@@ -121,7 +121,7 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
 
         ArrayList<DataEntryEngineModelPojo> modelPojos = new ArrayList<>();
 
-        List<Parameter> parameters = engineParamDetailService.selectAllByNewVersion();
+        List<ParameterPojo> parameters = engineParamDetailService.selectAllByNewVersion();
         //写入机型
         for (DataEntryEngineModelExcel modelExcel : cachedDataList) {
             DataEntryEngineModelPojo modelPojo = new DataEntryEngineModelPojo();
@@ -150,7 +150,7 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
     }
 
     //为每个机型绑定参数
-    private void saveDataParamDetail(ArrayList<DataEntryEngineModelPojo> modelPojos, List<Parameter> parameters) {
+    private void saveDataParamDetail(ArrayList<DataEntryEngineModelPojo> modelPojos, List<ParameterPojo> parameters) {
         /**
          * 遍历机型
          * 查找参数 将每个机型都把参数，和参数所属的填写部门关联上
@@ -158,7 +158,7 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
          */
         List<EngineParamDetailPojo> engineParamDetailPojos = new ArrayList<>();
         for (DataEntryEngineModelPojo modelPojo : modelPojos) {
-            for (Parameter parameter : parameters) {
+            for (ParameterPojo parameter : parameters) {
 
                 EngineParamDetailPojo engineParamDetailPojo = new EngineParamDetailPojo();
                 engineParamDetailPojo.setEngineModelId(modelPojo.getId());
@@ -177,7 +177,7 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
                 engineParamDetailPojo.setCreationDate(Timestamp.valueOf(LocalDateTime.now()));
                 engineParamDetailPojos.add(engineParamDetailPojo);
                 //为每个参数生成默认责任人
-                List<ResponsiblePerson> personPojos = responsiblePerService.selectByDepName(parameter.getDepartment());
+                List<ResponsiblePersonPojo> personPojos = responsiblePerService.selectByDepName(parameter.getDepartment());
                 if (ObjectUtils.isNotEmpty(personPojos)) {
                     //      不再默认生成责任人         engineParamDetailPojo.setResponsiblePersonId(personPojos.get(0).getId());
                 }
diff --git a/src/main/java/com/xdap/self_development/listener/EngineParamDetailListener.java b/src/main/java/com/xdap/self_development/listener/EngineParamDetailListener.java
index 9fe0495..4eb3b8c 100644
--- a/src/main/java/com/xdap/self_development/listener/EngineParamDetailListener.java
+++ b/src/main/java/com/xdap/self_development/listener/EngineParamDetailListener.java
@@ -6,9 +6,9 @@ import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.excel.util.ListUtils;
 import com.definesys.mpaas.query.MpaasQueryFactory;
 import com.xdap.self_development.controller.request.EngineParamDetailExcel;
-import com.xdap.self_development.enums.ParamOperation;
-import com.xdap.self_development.enums.ParamValueVersionEnum;
-import com.xdap.self_development.pojo.*;
+import com.xdap.self_development.domain.enums.ParamOperationEnum;
+import com.xdap.self_development.domain.enums.ParamValueVersionEnum;
+import com.xdap.self_development.domain.pojo.*;
 import com.xdap.self_development.service.DataEntryEngineModelService;
 import com.xdap.self_development.service.DataEntryService;
 import com.xdap.self_development.service.ResponsiblePerService;
@@ -126,7 +126,7 @@ public class EngineParamDetailListener implements ReadListener<EngineParamDetail
                         .update("minor_version", paramDetailExcel.getParameterValue())
                         .update("version_status",ParamValueVersionEnum.DRAFT.getCode())
                         .update("last_updated_by", userId)
-                        .update("operation",String.valueOf(ParamOperation.UPDATE))
+                        .update("operation",String.valueOf(ParamOperationEnum.UPDATE))
                         .rowid("id", detailPojos.get(0).getId())
                         .doUpdate(EngineParamDetailPojo.class);
             } else if(ObjectUtils.isEmpty(detailPojos)&&ObjectUtils.isNotEmpty(paramDetailExcel.getId())){
@@ -156,7 +156,7 @@ public class EngineParamDetailListener implements ReadListener<EngineParamDetail
 //                //todo通过部门+姓名存入填写人 最好根据工号
 //                engineParamDetailPojo.setFilledBy();
 //                engineParamDetailPojo.setVersionStatus(ParamValueVersionEnum.DRAFT.getCode());
-//                engineParamDetailPojo.setOperation(String.valueOf(ParamOperation.INSERT));
+//                engineParamDetailPojo.setOperation(String.valueOf(ParamOperationEnum.INSERT));
 //                engineParamDetailPojo.setCreatedBy(createdBy);
 //                engineParamDetailPojo.setCreatedDate(createdDate);
 //                engineParamDetailPojo.setLastUpdatedBy(lastModifiedBy);
diff --git a/src/main/java/com/xdap/self_development/listener/PersonReadListener.java b/src/main/java/com/xdap/self_development/listener/PersonReadListener.java
index 56b249a..7053133 100644
--- a/src/main/java/com/xdap/self_development/listener/PersonReadListener.java
+++ b/src/main/java/com/xdap/self_development/listener/PersonReadListener.java
@@ -3,8 +3,8 @@ package com.xdap.self_development.listener;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.xdap.self_development.common.MyResponse;
-import com.xdap.self_development.pojo.ResponsiblePerson;
-import com.xdap.self_development.pojo.view.XdapUserView;
+import com.xdap.self_development.domain.pojo.ResponsiblePersonPojo;
+import com.xdap.self_development.domain.view.XdapUserView;
 import com.xdap.self_development.service.ResponsiblePersonService;
 
 import java.sql.Timestamp;
@@ -12,10 +12,10 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PersonReadListener implements ReadListener<ResponsiblePerson> {
+public class PersonReadListener implements ReadListener<ResponsiblePersonPojo> {
     MyResponse problems;
     private final ResponsiblePersonService responsiblePersonService;
-    private List<ResponsiblePerson> cachedDataList;
+    private List<ResponsiblePersonPojo> cachedDataList;
 
     public PersonReadListener(ResponsiblePersonService responsiblePersonService, MyResponse problems) {
         this.problems = problems;
@@ -24,7 +24,7 @@ public class PersonReadListener implements ReadListener<ResponsiblePerson> {
     }
 
     @Override
-    public void invoke(ResponsiblePerson responsiblePerson, AnalysisContext analysisContext) {
+    public void invoke(ResponsiblePersonPojo responsiblePerson, AnalysisContext analysisContext) {
         if (
                 responsiblePerson.getDepartment() == null ||
                         responsiblePerson.getUsername() == null ||
diff --git a/src/main/java/com/xdap/self_development/listener/SheetDataListener.java b/src/main/java/com/xdap/self_development/listener/SheetDataListener.java
index db780a3..3e36749 100644
--- a/src/main/java/com/xdap/self_development/listener/SheetDataListener.java
+++ b/src/main/java/com/xdap/self_development/listener/SheetDataListener.java
@@ -4,7 +4,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.xdap.self_development.common.MyResponse;
-import com.xdap.self_development.pojo.Parameter;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
 import com.xdap.self_development.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
 
@@ -12,13 +12,13 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
-public class SheetDataListener implements ReadListener<Parameter> {
+public class SheetDataListener implements ReadListener<ParameterPojo> {
 	private static final int BATCH_SIZE = 1000;
 
 	private final TemplateService templateService;
 	private final String templateRowId;
 	private final String createBy;
-	private List<Parameter> cachedDataList;
+	private List<ParameterPojo> cachedDataList;
 	private String currentSheetName;
 	MyResponse problems;
 
@@ -58,7 +58,7 @@ public class SheetDataListener implements ReadListener<Parameter> {
 	}
 
 	@Override
-	public void invoke(Parameter data, AnalysisContext context) {
+	public void invoke(ParameterPojo data, AnalysisContext context) {
 		// 如果sheet无效，直接返回，不处理数据
 //		if (!validSheet) {
 //			return;
diff --git a/src/main/java/com/xdap/self_development/pojo/AnalysisCommonParametersPojo.java b/src/main/java/com/xdap/self_development/pojo/AnalysisCommonParametersPojo.java
deleted file mode 100644
index ec22977..0000000
--- a/src/main/java/com/xdap/self_development/pojo/AnalysisCommonParametersPojo.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.xdap.self_development.pojo;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.definesys.mpaas.query.annotation.RowID;
-import com.definesys.mpaas.query.annotation.RowIDType;
-import com.definesys.mpaas.query.annotation.Table;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Table("analysis_common_parameters")
-public class AnalysisCommonParametersPojo implements Serializable {
-
-    /**
-     * ID
-     */
-    @RowID(sequence = "analysis_common_parameters_s", type = RowIDType.UUID)
-    private String id;
-
-    /**
-     * 参数ID
-     */
-    private String parameterId;
-
-    /**
-     * 用户ID
-     */
-    private String userId;
-
-
-}
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/ActivitiRecordDTO.java b/src/main/java/com/xdap/self_development/pojo/dto/ActivitiRecordDTO.java
deleted file mode 100644
index 8441077..0000000
--- a/src/main/java/com/xdap/self_development/pojo/dto/ActivitiRecordDTO.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.xdap.self_development.pojo.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ActivitiRecordDTO {
-
-    /**
-     * 节点
-     */
-    private String node;
-
-    /**
-     * 所有
-     */
-    private String unapprovedPerson;
-
-    //已审批人
-    private String approverPersons;
-
-    /**
-     * 说明
-     */
-    private String common;
-    /**
-     * 节点顺序
-     */
-    private Integer nodeOrder;
-    /**
-     * 操作时间
-     */
-    private String operate;
-    /**
-     * 操作时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date operateTime;
-}
diff --git a/src/main/java/com/xdap/self_development/pojo/dto/EngineParamDTO.java b/src/main/java/com/xdap/self_development/pojo/dto/EngineParamDTO.java
deleted file mode 100644
index 93cc7ad..0000000
--- a/src/main/java/com/xdap/self_development/pojo/dto/EngineParamDTO.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.xdap.self_development.pojo.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class EngineParamDTO {
-
-    /**
-     * 参数名称
-     */
-    private String parameterName;
-
-    private List<EngineParamDTO>  engineParamDTOList;
-}
diff --git a/src/main/java/com/xdap/self_development/pojo/view/ApprovalNodeView.java b/src/main/java/com/xdap/self_development/pojo/view/ApprovalNodeView.java
deleted file mode 100644
index f10fa97..0000000
--- a/src/main/java/com/xdap/self_development/pojo/view/ApprovalNodeView.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.xdap.self_development.pojo.view;
-
-import com.definesys.mpaas.query.annotation.SQL;
-import com.definesys.mpaas.query.annotation.SQLQuery;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.sql.Timestamp;
-
-@SQLQuery(value = {
-        @SQL(view = "getApprovalNodeInfo",
-                sql = "SELECT * FROM yfsjglpt_model_approval_record WHERE flow_id = #flowId AND node = #node")
-})
-@Data
-public class ApprovalNodeView {
-    private String node;
-    private String userId;
-    private String userName;
-    private String opinion;
-    private String result; // PASS, REJECT
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Timestamp approvalTime;
-}
diff --git a/src/main/java/com/xdap/self_development/pojo/view/MenuListView.java b/src/main/java/com/xdap/self_development/pojo/view/MenuListView.java
deleted file mode 100644
index 98f730b..0000000
--- a/src/main/java/com/xdap/self_development/pojo/view/MenuListView.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xdap.self_development.pojo.view;
-
-import com.definesys.mpaas.query.annotation.SQL;
-import com.definesys.mpaas.query.annotation.SQLQuery;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.sql.Timestamp;
-import java.util.ArrayList;
-
-
-@Data
-public class MenuListView {
-    private String id;
-    private String parent_id;
-    private String menu;
-    private String menuDesc;
-    ArrayList<MenuListView> listViews;
-
-}
diff --git a/src/main/java/com/xdap/self_development/pojo/view/TCParameterValueView.java b/src/main/java/com/xdap/self_development/pojo/view/TCParameterValueView.java
deleted file mode 100644
index aa77ba6..0000000
--- a/src/main/java/com/xdap/self_development/pojo/view/TCParameterValueView.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.xdap.self_development.pojo.view;
-
-
-public class TCParameterValueView {
-}
diff --git a/src/main/java/com/xdap/self_development/pojo/view/TcQueryView.java b/src/main/java/com/xdap/self_development/pojo/view/TcQueryView.java
deleted file mode 100644
index 579443d..0000000
--- a/src/main/java/com/xdap/self_development/pojo/view/TcQueryView.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.xdap.self_development.pojo.view;
-
-import com.definesys.mpaas.query.annotation.SQL;
-import com.definesys.mpaas.query.annotation.SQLQuery;
-import lombok.Data;
-
-@SQLQuery(value = {
-        @SQL(view = "queryTc",
-                sql = "SELECT sap.ztj as productNumber, sap.lbjmc as partsName, tc.idattrtbutehame as parameterName, tc.fieldvalue as parameterValue FROM ads_prd_f_yfsjglpt_fdjlbjcjb sap JOIN ads_prd_f_tc_flsxb tc ON sap.lbjth = tc.pitem_id WHERE (sap.ztj, sap.lbjmc, tc.idattrtbutehame) IN (#queryModels)")
-})
-@Data
-public class TcQueryView {
-    // 状态机
-    private String productNumber;
-    // 参数名
-    private String parameterName;
-    // 参数值
-    private String parameterValue;
-    // 零件名
-    private String partsName;
-}
diff --git a/src/main/java/com/xdap/self_development/pojo/view/UserRoleAndPermissionView.java b/src/main/java/com/xdap/self_development/pojo/view/UserRoleAndPermissionView.java
deleted file mode 100644
index c7b92d1..0000000
--- a/src/main/java/com/xdap/self_development/pojo/view/UserRoleAndPermissionView.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xdap.self_development.pojo.view;
-
-import com.definesys.mpaas.query.annotation.SQL;
-import com.definesys.mpaas.query.annotation.SQLQuery;
-import lombok.Data;
-
-@SQLQuery(value = {
-        @SQL(view = "getAllRoleUserAndPerm",
-                sql = "SELECT r.id as roleId, r.role_name as roleName, GROUP_CONCAT(DISTINCT u.username) AS userNames , GROUP_CONCAT(DISTINCT p.permission_name) AS permissionNames FROM yfsjglpt_model_roles r LEFT JOIN yfsjglpt_model_user_roles ur ON r.id = ur.role_id LEFT JOIN yfsjglpt_model_role_permissions rp ON r.id = rp.role_id LEFT JOIN yfsjglpt_model_permissions p ON rp.permission_id = p.id LEFT JOIN xdap_users u ON u.id = ur.user_id GROUP BY r.id, r.role_name, r.description ORDER BY r.role_name")
-})
-@Data
-public class UserRoleAndPermissionView {
-    private String roleId;
-    private String roleName;
-    private String userNames;
-    private String permissionNames;
-}
diff --git a/src/main/java/com/xdap/self_development/schedule/ParameterValueCalculationTimer.java b/src/main/java/com/xdap/self_development/schedule/ParameterValueCalculationTimer.java
index 0f5c466..2f56b2a 100644
--- a/src/main/java/com/xdap/self_development/schedule/ParameterValueCalculationTimer.java
+++ b/src/main/java/com/xdap/self_development/schedule/ParameterValueCalculationTimer.java
@@ -2,11 +2,10 @@ package com.xdap.self_development.schedule;
 
 import com.xdap.self_development.common.MyResponse;
 import com.xdap.self_development.common.BusinessDatabase;
-import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.ClassificationAttribute;
-import com.xdap.self_development.pojo.EnginePartsCollection;
-import com.xdap.self_development.pojo.view.CalculationParameterView;
-import com.xdap.self_development.utils.FormulaValidator;
+import com.xdap.self_development.domain.pojo.ClassificationAttributePojo;
+import com.xdap.self_development.domain.pojo.EnginePartsCollectionPojo;
+import com.xdap.self_development.domain.view.CalculationParameterView;
+import com.xdap.self_development.utils.FormulaValidatorUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -76,10 +75,10 @@ public class ParameterValueCalculationTimer {
             if (Objects.equals(parameter.getParameterSource(), "TC分类表")) {
                 tcParameters++;
                 try {
-                    EnginePartsCollection enginePartsCollection = bd.getBusinessDatabase()
+                    EnginePartsCollectionPojo enginePartsCollection = bd.getBusinessDatabase()
                             .eq("ztj", parameter.getProductNumber())
                             .eq("lbjmc", parameter.getPartsName())
-                            .doQueryFirst(EnginePartsCollection.class);
+                            .doQueryFirst(EnginePartsCollectionPojo.class);
                     if (enginePartsCollection == null || enginePartsCollection.getLbjth() == null) {
                         log.warn("机型【{}】的参数【{}】在TC分类表中未找到对应零部件，零部件名：{}",
                                 parameter.getProductNumber(), parameter.getParameterName(), parameter.getPartsName());
@@ -87,10 +86,10 @@ public class ParameterValueCalculationTimer {
                         failedToUpdateFromTC++;
                         continue;
                     }
-                    ClassificationAttribute classificationAttribute =  bd.getBusinessDatabase()
+                    ClassificationAttributePojo classificationAttribute =  bd.getBusinessDatabase()
                             .eq("pitemId", enginePartsCollection.getLbjth())
                             .eq("idattrtbutehame", parameter.getParameterName())
-                            .doQueryFirst(ClassificationAttribute.class);
+                            .doQueryFirst(ClassificationAttributePojo.class);
                     if (classificationAttribute != null && classificationAttribute.getFieldvalue() != null) {
                         String originalValue = parameter.getParameterValue();
                         parameter.setParameterValue(classificationAttribute.getFieldvalue());
@@ -200,7 +199,7 @@ public class ParameterValueCalculationTimer {
 
     private String replaceParametersInFormula(String formula, List<String> parameterNames,
                                               Map<String, Map<String, String>> valueMap, String modelId, String currentParameterName) {
-        List<String> formulaParams = FormulaValidator.extractParameters(formula);
+        List<String> formulaParams = FormulaValidatorUtils.extractParameters(formula);
         String result = formula;
         result = result.replace("π", "PI").replace("PI", "Math.PI");
         result = result.replace("e", "Math.E");
diff --git a/src/main/java/com/xdap/self_development/service/ActivitiProcessService.java b/src/main/java/com/xdap/self_development/service/ActivitiProcessService.java
index a788908..4fd339a 100644
--- a/src/main/java/com/xdap/self_development/service/ActivitiProcessService.java
+++ b/src/main/java/com/xdap/self_development/service/ActivitiProcessService.java
@@ -1,15 +1,14 @@
 package com.xdap.self_development.service;
 
 
-import com.xdap.self_development.controller.form.ApprovalUserNodeDTO;
 import com.xdap.self_development.controller.form.HandleApprovalRequest;
 import com.xdap.self_development.controller.form.HandleReturnNodeForm;
 import com.xdap.self_development.controller.form.UpdateNodeForm;
 import com.xdap.self_development.controller.request.ApprovalByPlatformRequest;
 import com.xdap.self_development.controller.request.ApprovalNodeRequest;
-import com.xdap.self_development.enums.ParamValueVersionEnum;
-import com.xdap.self_development.pojo.*;
-import com.xdap.self_development.pojo.dto.*;
+import com.xdap.self_development.domain.enums.ParamValueVersionEnum;
+import com.xdap.self_development.domain.pojo.*;
+import com.xdap.self_development.domain.dto.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
diff --git a/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java b/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java
index 044f957..3fef333 100644
--- a/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java
+++ b/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java
@@ -4,9 +4,9 @@ package com.xdap.self_development.service;
 import com.xdap.self_development.controller.request.AnalysisRequest;
 
 import com.xdap.self_development.controller.request.ReportRequest;
-import com.xdap.self_development.pojo.DataEntryEngineModelPojo;
-import com.xdap.self_development.pojo.view.AnalysisModelParamterView;
-import com.xdap.self_development.pojo.view.AnalysisModelParamterViewAndParam;
+import com.xdap.self_development.domain.pojo.DataEntryEngineModelPojo;
+import com.xdap.self_development.domain.view.AnalysisModelParamterView;
+import com.xdap.self_development.domain.view.AnalysisModelParamterViewAndParam;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/xdap/self_development/service/BenchmarkingReportService.java b/src/main/java/com/xdap/self_development/service/BenchmarkingReportService.java
index 397f5af..835386a 100644
--- a/src/main/java/com/xdap/self_development/service/BenchmarkingReportService.java
+++ b/src/main/java/com/xdap/self_development/service/BenchmarkingReportService.java
@@ -2,19 +2,18 @@ package com.xdap.self_development.service;
 
 import com.definesys.mpaas.query.db.PageQueryResult;
 import com.xdap.self_development.controller.form.*;
-import com.xdap.self_development.pojo.ApprovalConfigPojo;
-import com.xdap.self_development.pojo.ApprovalFlow;
-import com.xdap.self_development.pojo.ApprovalRecord;
-import com.xdap.self_development.pojo.BenchmarkingReport;
-import com.xdap.self_development.pojo.dto.ApprovalNodesDTO;
-import com.xdap.self_development.pojo.view.ApprovalFlowNodeView;
-import com.xdap.self_development.pojo.view.TodoAndReportListView;
-import com.xdap.self_development.pojo.view.TodoAndReportView;
+import com.xdap.self_development.domain.pojo.ApprovalConfigPojo;
+import com.xdap.self_development.domain.pojo.ApprovalFlowPojo;
+import com.xdap.self_development.domain.pojo.ApprovalRecordPojo;
+import com.xdap.self_development.domain.pojo.BenchmarkingReportPojo;
+import com.xdap.self_development.domain.dto.ApprovalNodesDTO;
+import com.xdap.self_development.domain.view.ApprovalFlowNodeView;
+import com.xdap.self_development.domain.view.TodoAndReportListView;
+import com.xdap.self_development.domain.view.TodoAndReportView;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import java.util.List;
 
 public interface BenchmarkingReportService {
     PageQueryResult<TodoAndReportView> getBenchmarkingReportByCondition(
@@ -40,7 +39,7 @@ public interface BenchmarkingReportService {
     
     void handleReportApproval(@Valid HandleApprovalRequest request);
 
-    BenchmarkingReport getReportDetail(@NotBlank String reportId);
+    BenchmarkingReportPojo getReportDetail(@NotBlank String reportId);
 
     ApprovalFlowNodeView getReportProcess(@NotBlank String flowId);
 
@@ -48,15 +47,15 @@ public interface BenchmarkingReportService {
 
     PageQueryResult<TodoAndReportListView> getApprovalList(@Valid ApprovalListForm form);
 
-    void processNextNode(ApprovalFlow flow, ApprovalConfigPojo currentNode, String userId);
+    void processNextNode(ApprovalFlowPojo flow, ApprovalConfigPojo currentNode, String userId);
 
-    void processApprovalLogic(ApprovalFlow flow, HandleApprovalRequest request, ApprovalConfigPojo currentNode, ApprovalRecord lastedRecord);
+    void processApprovalLogic(ApprovalFlowPojo flow, HandleApprovalRequest request, ApprovalConfigPojo currentNode, ApprovalRecordPojo lastedRecord);
 
-    void addNodeTodo(ApprovalFlow flow, ApprovalConfigPojo node, BenchmarkingReport report, String createBy, Integer enableReturn);
+    void addNodeTodo(ApprovalFlowPojo flow, ApprovalConfigPojo node, BenchmarkingReportPojo report, String createBy, Integer enableReturn);
 
-    void cancelProcess(ApprovalFlow flow, ApprovalConfigPojo node, String status, String userId);
+    void cancelProcess(ApprovalFlowPojo flow, ApprovalConfigPojo node, String status, String userId);
 
-    void updateTasks(ApprovalFlow flow, String status, Integer enableReturn, ApprovalConfigPojo currentNode);
+    void updateTasks(ApprovalFlowPojo flow, String status, Integer enableReturn, ApprovalConfigPojo currentNode);
 
     ApprovalNodesDTO getApprovalUsers(@NotBlank String flowId);
 
diff --git a/src/main/java/com/xdap/self_development/service/CommonParameterService.java b/src/main/java/com/xdap/self_development/service/CommonParameterService.java
index a1d7b99..b447cd8 100644
--- a/src/main/java/com/xdap/self_development/service/CommonParameterService.java
+++ b/src/main/java/com/xdap/self_development/service/CommonParameterService.java
@@ -1,7 +1,7 @@
 package com.xdap.self_development.service;
 
 import com.xdap.self_development.controller.form.*;
-import com.xdap.self_development.pojo.AnalysisCommonParameters;
+import com.xdap.self_development.domain.pojo.AnalysisCommonParametersPojo;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
@@ -16,7 +16,7 @@ public interface CommonParameterService {
 
     void updateModelCommonParameter(@Valid ModelCommonParameterUpdateForm form);
 
-    List<AnalysisCommonParameters> getAnalysisCommonParameter(@NotBlank String userId);
+    List<AnalysisCommonParametersPojo> getAnalysisCommonParameter(@NotBlank String userId);
 
     void insertAnalysisCommonParameter(@Valid AnalysisCommonParameterInsertForm form);
 
diff --git a/src/main/java/com/xdap/self_development/service/DataEntryEngineModelService.java b/src/main/java/com/xdap/self_development/service/DataEntryEngineModelService.java
index 82feca3..c8c3405 100644
--- a/src/main/java/com/xdap/self_development/service/DataEntryEngineModelService.java
+++ b/src/main/java/com/xdap/self_development/service/DataEntryEngineModelService.java
@@ -1,9 +1,9 @@
 package com.xdap.self_development.service;
 
 import com.xdap.self_development.controller.request.DataEntryEngineModelPageRequest;
-import com.xdap.self_development.pojo.DataEntryEngineModelPojo;
-import com.xdap.self_development.pojo.dto.DataEntryEngineModelDto;
-import com.xdap.self_development.pojo.dto.PageResultDTO;
+import com.xdap.self_development.domain.pojo.DataEntryEngineModelPojo;
+import com.xdap.self_development.domain.dto.DataEntryEngineModelDto;
+import com.xdap.self_development.domain.dto.PageResultDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -20,18 +20,15 @@ import java.util.List;
 public interface DataEntryEngineModelService {
     /**
      * 查询全部
-     * @return
      */
     List<DataEntryEngineModelPojo> selectAll();
     /**
      * 分页查询
-     * @return
      */
     PageResultDTO<DataEntryEngineModelDto>  selectByConditionPage(DataEntryEngineModelPageRequest request);
 
     /**
      * excel导入
-     * @return
      */
     void excelImport(MultipartFile file, String userId, String ycOrOt);
     /**
diff --git a/src/main/java/com/xdap/self_development/service/DataEntryService.java b/src/main/java/com/xdap/self_development/service/DataEntryService.java
index 0a85663..1d213d1 100644
--- a/src/main/java/com/xdap/self_development/service/DataEntryService.java
+++ b/src/main/java/com/xdap/self_development/service/DataEntryService.java
@@ -2,8 +2,8 @@ package com.xdap.self_development.service;
 
 import com.xdap.self_development.controller.form.OptionForm;
 import com.xdap.self_development.controller.form.TemplateForm;
-import com.xdap.self_development.pojo.Parameter;
-import com.xdap.self_development.pojo.Template;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
+import com.xdap.self_development.domain.pojo.TemplatePojo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -16,8 +16,8 @@ public interface DataEntryService {
 
     void insertParameter(TemplateForm form);
 
-    List<Parameter> getParameterByCondition(OptionForm form);
+    List<ParameterPojo> getParameterByCondition(OptionForm form);
 
-    List<Template> getTemplateByCondition(String templateName);
+    List<TemplatePojo> getTemplateByCondition(String templateName);
 
 }
diff --git a/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java b/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java
index 1d94a2e..cc8ddb2 100644
--- a/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java
+++ b/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java
@@ -2,9 +2,9 @@ package com.xdap.self_development.service;
 
 import com.xdap.api.moudle.user.pojo.XdapUsers;
 import com.xdap.self_development.controller.request.EngineParamDetailRequest;
-import com.xdap.self_development.pojo.EngineParamDetailPojo;
-import com.xdap.self_development.pojo.Parameter;
-import com.xdap.self_development.pojo.dto.EngineParamDetailDTO;
+import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
+import com.xdap.self_development.domain.dto.EngineParamDetailDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -36,9 +36,9 @@ public interface EngineParamDetailService {
     void updateParamValue(List<EngineParamDetailPojo> engineParamDetailPojos,String currentUserId);
     void updateToInsertFiledBy(List<EngineParamDetailPojo> engineParamDetailPojos, String userID);
 
-    List<Parameter> selectAllByNewVersion();
+    List<ParameterPojo> selectAllByNewVersion();
 
-    List<Parameter> selectAllAndTcByNewVersion();
+    List<ParameterPojo> selectAllAndTcByNewVersion();
 /**
  * 根据型号查询最新的引擎参数详情列表
  *
diff --git a/src/main/java/com/xdap/self_development/service/EngineReviewListService.java b/src/main/java/com/xdap/self_development/service/EngineReviewListService.java
index 605345a..81b1df5 100644
--- a/src/main/java/com/xdap/self_development/service/EngineReviewListService.java
+++ b/src/main/java/com/xdap/self_development/service/EngineReviewListService.java
@@ -2,8 +2,8 @@ package com.xdap.self_development.service;
 
 
 import com.xdap.self_development.controller.request.EngineReviewListRequest;
-import com.xdap.self_development.pojo.EngineReviewListPojo;
-import com.xdap.self_development.pojo.dto.PageResultDTO;
+import com.xdap.self_development.domain.pojo.EngineReviewListPojo;
+import com.xdap.self_development.domain.dto.PageResultDTO;
 
 public interface EngineReviewListService {
     //查看机型审批列表
diff --git a/src/main/java/com/xdap/self_development/service/ModelMenuPermissionService.java b/src/main/java/com/xdap/self_development/service/ModelMenuPermissionService.java
index f22873e..526fd5c 100644
--- a/src/main/java/com/xdap/self_development/service/ModelMenuPermissionService.java
+++ b/src/main/java/com/xdap/self_development/service/ModelMenuPermissionService.java
@@ -1,11 +1,10 @@
 package com.xdap.self_development.service;
 
 
-import com.xdap.self_development.pojo.ModelMenuDictionaryPojo;
-import com.xdap.self_development.pojo.view.MenuListView;
+import com.xdap.self_development.domain.pojo.ModelMenuDictionaryPojo;
+import com.xdap.self_development.domain.view.MenuListView;
 
 import java.util.List;
-import java.util.Map;
 
 public interface ModelMenuPermissionService {
 
diff --git a/src/main/java/com/xdap/self_development/service/ModelRoleService.java b/src/main/java/com/xdap/self_development/service/ModelRoleService.java
index 476d96e..743c3c3 100644
--- a/src/main/java/com/xdap/self_development/service/ModelRoleService.java
+++ b/src/main/java/com/xdap/self_development/service/ModelRoleService.java
@@ -4,12 +4,11 @@ package com.xdap.self_development.service;
 import com.xdap.self_development.controller.request.ModelRolesRequest;
 import com.xdap.self_development.controller.request.RolePerJoinRequest;
 import com.xdap.self_development.controller.request.UserRoleBindingRequest;
-import com.xdap.self_development.pojo.ModelRolesPojo;
-import com.xdap.self_development.pojo.dto.PageResultDTO;
-import com.xdap.self_development.pojo.view.MenuParamView;
+import com.xdap.self_development.domain.pojo.ModelRolesPojo;
+import com.xdap.self_development.domain.dto.PageResultDTO;
+import com.xdap.self_development.domain.view.MenuParamView;
 
 import javax.validation.constraints.NotBlank;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
diff --git a/src/main/java/com/xdap/self_development/service/ParameterService.java b/src/main/java/com/xdap/self_development/service/ParameterService.java
index 1f6b0e2..39a1456 100644
--- a/src/main/java/com/xdap/self_development/service/ParameterService.java
+++ b/src/main/java/com/xdap/self_development/service/ParameterService.java
@@ -4,15 +4,15 @@ import com.xdap.self_development.common.MyPageResult;
 import com.xdap.self_development.controller.form.ParameterForm;
 import com.xdap.self_development.controller.form.ParameterPageForm;
 import com.xdap.self_development.controller.form.UpdateParameterForm;
-import com.xdap.self_development.pojo.Parameter;
-import com.xdap.self_development.pojo.Template;
-import com.xdap.self_development.pojo.view.TemplateInfoView;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
+import com.xdap.self_development.domain.pojo.TemplatePojo;
+import com.xdap.self_development.domain.view.TemplateInfoView;
 import com.xdap.self_development.service.impl.ParameterServiceImpl;
 
 import java.util.List;
 
 public interface ParameterService {
-	MyPageResult<Parameter> getParameterByCondition(ParameterPageForm form);
+	MyPageResult<ParameterPojo> getParameterByCondition(ParameterPageForm form);
 
 	TemplateInfoView maintenanceParameters(UpdateParameterForm form);
 
@@ -20,16 +20,16 @@ public interface ParameterService {
 
 	void validateTemplateStatus(ParameterServiceImpl.TemplateBenchmark benchmark);
 
-	Template createOrReuseNewTemplate(ParameterServiceImpl.TemplateBenchmark benchmark, String userId);
+	TemplatePojo createOrReuseNewTemplate(ParameterServiceImpl.TemplateBenchmark benchmark, String userId);
 
 	ParameterServiceImpl.ParameterProcessingResult processParameters(
 			List<ParameterForm> parameterForms,
-			List<Parameter> existingParameters,
-			Template baseTemplate,
-			Template newTemplate,
+			List<ParameterPojo> existingParameters,
+			TemplatePojo baseTemplate,
+			TemplatePojo newTemplate,
 			String userId,
 			boolean isLastComplete
 	);
 
-	void saveAllData(Template originalTemplate, Template newTemplate, ParameterServiceImpl.ParameterProcessingResult result);
+	void saveAllData(TemplatePojo originalTemplate, TemplatePojo newTemplate, ParameterServiceImpl.ParameterProcessingResult result);
 }
diff --git a/src/main/java/com/xdap/self_development/service/ResponsiblePerService.java b/src/main/java/com/xdap/self_development/service/ResponsiblePerService.java
index 7ac9a66..eb643b6 100644
--- a/src/main/java/com/xdap/self_development/service/ResponsiblePerService.java
+++ b/src/main/java/com/xdap/self_development/service/ResponsiblePerService.java
@@ -1,7 +1,7 @@
 package com.xdap.self_development.service;
 
 import com.xdap.api.moudle.user.pojo.XdapUsers;
-import com.xdap.self_development.pojo.ResponsiblePerson;
+import com.xdap.self_development.domain.pojo.ResponsiblePersonPojo;
 
 import java.util.List;
 
@@ -15,16 +15,16 @@ import java.util.List;
  */
 public interface ResponsiblePerService {
 
-    ResponsiblePerson selectByDepAndPer(String department, String resPerson);
-    ResponsiblePerson selectByDep(String departmentId);
-    List<ResponsiblePerson> selectByUserId(List<XdapUsers> userIds);
-    List<ResponsiblePerson> selectByDepName(String departmentName);
+    ResponsiblePersonPojo selectByDepAndPer(String department, String resPerson);
+    ResponsiblePersonPojo selectByDep(String departmentId);
+    List<ResponsiblePersonPojo> selectByUserId(List<XdapUsers> userIds);
+    List<ResponsiblePersonPojo> selectByDepName(String departmentName);
 
-    Object insert(ResponsiblePerson responsiblePerson);
+    Object insert(ResponsiblePersonPojo responsiblePerson);
 
-    List<ResponsiblePerson> seelctAll();
+    List<ResponsiblePersonPojo> seelctAll();
 
-    ResponsiblePerson selectById(String responsiblePersonId);
+    ResponsiblePersonPojo selectById(String responsiblePersonId);
 
-    List<ResponsiblePerson> selectBysubSystemDept(String subSystem, String dept);
+    List<ResponsiblePersonPojo> selectBysubSystemDept(String subSystem, String dept);
 }
diff --git a/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java b/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java
index 5780343..9984bba 100644
--- a/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java
+++ b/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java
@@ -4,8 +4,8 @@ import com.definesys.mpaas.query.db.PageQueryResult;
 import com.xdap.api.moudle.user.pojo.XdapUsers;
 import com.xdap.self_development.common.MyResponse;
 import com.xdap.self_development.controller.form.*;
-import com.xdap.self_development.pojo.ResponsiblePerson;
-import com.xdap.self_development.pojo.view.XdapUserView;
+import com.xdap.self_development.domain.pojo.ResponsiblePersonPojo;
+import com.xdap.self_development.domain.view.XdapUserView;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -26,9 +26,9 @@ public interface ResponsiblePersonService {
 
     void deleteResponsiblePerson(@NotBlank String rowId);
 
-    PageQueryResult<ResponsiblePerson> getDeptResponsible(@Valid DeptResponsiblePageForm form);
+    PageQueryResult<ResponsiblePersonPojo> getDeptResponsible(@Valid DeptResponsiblePageForm form);
 
-    PageQueryResult<ResponsiblePerson> getDeptFilled(@Valid DeptResponsiblePageForm form);
+    PageQueryResult<ResponsiblePersonPojo> getDeptFilled(@Valid DeptResponsiblePageForm form);
 
     Boolean isResponsiblePerson(String userId);
 
@@ -42,7 +42,7 @@ public interface ResponsiblePersonService {
     MyResponse importPerson(MultipartFile file, String userId);
 
 
-    void importAllPerson(List<ResponsiblePerson> cachedDataList, MyResponse problems);
+    void importAllPerson(List<ResponsiblePersonPojo> cachedDataList, MyResponse problems);
 
     XdapUserView getUserByDeptAndName(String department, String userAccount, String username);
 }
diff --git a/src/main/java/com/xdap/self_development/service/TcDataQueryService.java b/src/main/java/com/xdap/self_development/service/TcDataQueryService.java
index 1bd0fe2..1923468 100644
--- a/src/main/java/com/xdap/self_development/service/TcDataQueryService.java
+++ b/src/main/java/com/xdap/self_development/service/TcDataQueryService.java
@@ -3,9 +3,9 @@ package com.xdap.self_development.service;
 import com.xdap.self_development.controller.request.AnalysisRequest;
 import com.xdap.self_development.controller.request.AnalysisVerRequest;
 import com.xdap.self_development.controller.request.ModelComparisonExportRequest;
-import com.xdap.self_development.pojo.ClassificationAttribute;
-import com.xdap.self_development.pojo.DataEntryEngineModelPojo;
-import com.xdap.self_development.pojo.EngineParamDetailPojo;
+import com.xdap.self_development.domain.pojo.ClassificationAttributePojo;
+import com.xdap.self_development.domain.pojo.DataEntryEngineModelPojo;
+import com.xdap.self_development.domain.pojo.EngineParamDetailPojo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -15,7 +15,7 @@ import java.util.Map;
 
 public interface TcDataQueryService {
     //查询TC数据返回格式Map<model,List<parameter>>
-    HashMap<String, List<ClassificationAttribute>> tcDataSelectByC(String productNumber, String partsName, String parameterName);
+    HashMap<String, List<ClassificationAttributePojo>> tcDataSelectByC(String productNumber, String partsName, String parameterName);
 
     ArrayList<EngineParamDetailPojo> tcDataSelectAllByproductNumber(DataEntryEngineModelPojo engineModelPojo);
 
diff --git a/src/main/java/com/xdap/self_development/service/TemplateApprovalService.java b/src/main/java/com/xdap/self_development/service/TemplateApprovalService.java
index 64cb7d0..baf27b1 100644
--- a/src/main/java/com/xdap/self_development/service/TemplateApprovalService.java
+++ b/src/main/java/com/xdap/self_development/service/TemplateApprovalService.java
@@ -2,15 +2,14 @@ package com.xdap.self_development.service;
 
 import com.definesys.mpaas.query.db.PageQueryResult;
 import com.xdap.self_development.controller.form.*;
-import com.xdap.self_development.pojo.ApprovalConfigPojo;
-import com.xdap.self_development.pojo.ApprovalFlow;
-import com.xdap.self_development.pojo.ApprovalRecord;
-import com.xdap.self_development.pojo.Template;
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
-import com.xdap.self_development.pojo.dto.ApprovalNodesDTO;
-import com.xdap.self_development.pojo.view.ApprovalFlowNodeView;
-import com.xdap.self_development.pojo.view.TemplateChangeView;
-import com.xdap.self_development.pojo.view.TodoAndTemplateView;
+import com.xdap.self_development.domain.pojo.ApprovalConfigPojo;
+import com.xdap.self_development.domain.pojo.ApprovalFlowPojo;
+import com.xdap.self_development.domain.pojo.ApprovalRecordPojo;
+import com.xdap.self_development.domain.pojo.TemplatePojo;
+import com.xdap.self_development.domain.dto.ApprovalNodesDTO;
+import com.xdap.self_development.domain.view.ApprovalFlowNodeView;
+import com.xdap.self_development.domain.view.TemplateChangeView;
+import com.xdap.self_development.domain.view.TodoAndTemplateView;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
@@ -36,18 +35,18 @@ public interface TemplateApprovalService {
     void handleReturnToNode(@Valid HandleReturnNodeForm form);
 
     void processApprovalLogic(
-            ApprovalFlow flow, HandleApprovalRequest request, ApprovalConfigPojo currentNode, ApprovalRecord lastedRecord
+            ApprovalFlowPojo flow, HandleApprovalRequest request, ApprovalConfigPojo currentNode, ApprovalRecordPojo lastedRecord
     );
 
-    void cancelProcess(ApprovalFlow flow, ApprovalConfigPojo node, String status, String userId);
+    void cancelProcess(ApprovalFlowPojo flow, ApprovalConfigPojo node, String status, String userId);
 
-    void processNextNode(ApprovalFlow flow, ApprovalConfigPojo currentNode, String userId);
+    void processNextNode(ApprovalFlowPojo flow, ApprovalConfigPojo currentNode, String userId);
 
-    boolean checkNodeComplete(ApprovalFlow flow, ApprovalConfigPojo node);
+    boolean checkNodeComplete(ApprovalFlowPojo flow, ApprovalConfigPojo node);
 
-    void updateTasks(ApprovalFlow flow, String status, Integer enableReturn, ApprovalConfigPojo currentNode);
+    void updateTasks(ApprovalFlowPojo flow, String status, Integer enableReturn, ApprovalConfigPojo currentNode);
 
-    void addNodeTodo(ApprovalFlow flow, ApprovalConfigPojo node, Template template, String createBy, Integer enableReturn);
+    void addNodeTodo(ApprovalFlowPojo flow, ApprovalConfigPojo node, TemplatePojo template, String createBy, Integer enableReturn);
 
     List<String> getReturnNodes(@NotBlank String flowId);
 
diff --git a/src/main/java/com/xdap/self_development/service/TemplateService.java b/src/main/java/com/xdap/self_development/service/TemplateService.java
index 1783ca9..a678b20 100644
--- a/src/main/java/com/xdap/self_development/service/TemplateService.java
+++ b/src/main/java/com/xdap/self_development/service/TemplateService.java
@@ -3,8 +3,8 @@ package com.xdap.self_development.service;
 import com.definesys.mpaas.query.db.PageQueryResult;
 import com.xdap.self_development.common.MyResponse;
 import com.xdap.self_development.controller.form.*;
-import com.xdap.self_development.pojo.Parameter;
-import com.xdap.self_development.pojo.Template;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
+import com.xdap.self_development.domain.pojo.TemplatePojo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -12,12 +12,12 @@ import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 public interface TemplateService {
-    PageQueryResult<Template> getTemplateByCondition(TemplatePageForm form);
+    PageQueryResult<TemplatePojo> getTemplateByCondition(TemplatePageForm form);
 
 	MyResponse importTemplate(MultipartFile file, String templateRowId, String userId);
 
-    void processSheetData(List<Parameter> dataList, String sheetName,
-						  String templateRowId, String createBy, MyResponse problems);
+    void processSheetData(List<ParameterPojo> dataList, String sheetName,
+                          String templateRowId, String createBy, MyResponse problems);
 
 	void insertTemplate(InsertTemplateForm form);
 
@@ -27,9 +27,9 @@ public interface TemplateService {
 
     void exportMultipleTemplates(HttpServletResponse response);
 
-	List<Template> getTemplateVersion(TemplateRowIdForm form);
+	List<TemplatePojo> getTemplateVersion(TemplateRowIdForm form);
 
-    Template getTemplateById(@NotBlank String templateId);
+    TemplatePojo getTemplateById(@NotBlank String templateId);
 
     void deleteTemplate(@NotBlank String templateId);
 }
diff --git a/src/main/java/com/xdap/self_development/service/TodoTaskService.java b/src/main/java/com/xdap/self_development/service/TodoTaskService.java
index 0d7dc65..a8a16a8 100644
--- a/src/main/java/com/xdap/self_development/service/TodoTaskService.java
+++ b/src/main/java/com/xdap/self_development/service/TodoTaskService.java
@@ -3,12 +3,11 @@ package com.xdap.self_development.service;
 import com.xdap.self_development.controller.request.TodoReturnRequest;
 import com.xdap.self_development.controller.request.TodoTaskRequest;
 import com.xdap.self_development.controller.request.YcGetTodoTaskRequest;
-import com.xdap.self_development.pojo.CompletedTaskPojo;
-import com.xdap.self_development.pojo.InitiatedTaskPojo;
-import com.xdap.self_development.pojo.TodoTaskPojo;
-import com.xdap.self_development.pojo.dto.*;
+import com.xdap.self_development.domain.pojo.CompletedTaskPojo;
+import com.xdap.self_development.domain.pojo.InitiatedTaskPojo;
+import com.xdap.self_development.domain.pojo.TodoTaskPojo;
+import com.xdap.self_development.domain.dto.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
index 3822999..0ed9baa 100644
--- a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
@@ -9,16 +9,16 @@ import com.xdap.self_development.controller.form.HandleReturnNodeForm;
 import com.xdap.self_development.controller.form.UpdateNodeForm;
 import com.xdap.self_development.controller.request.ApprovalByPlatformRequest;
 import com.xdap.self_development.controller.request.ApprovalNodeRequest;
-import com.xdap.self_development.enums.ApprovalOrderEnum;
-import com.xdap.self_development.enums.CurrentNodeEnum;
-import com.xdap.self_development.enums.ParamOperation;
-import com.xdap.self_development.enums.ParamValueVersionEnum;
+import com.xdap.self_development.domain.enums.ApprovalOrderEnum;
+import com.xdap.self_development.domain.enums.CurrentNodeEnum;
+import com.xdap.self_development.domain.enums.ParamOperationEnum;
+import com.xdap.self_development.domain.enums.ParamValueVersionEnum;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.*;
-import com.xdap.self_development.pojo.dto.*;
-import com.xdap.self_development.pojo.view.FlowNode;
+import com.xdap.self_development.domain.pojo.*;
+import com.xdap.self_development.domain.dto.*;
+import com.xdap.self_development.domain.view.FlowNode;
 import com.xdap.self_development.service.*;
-import com.xdap.self_development.utils.RedisLockUtil;
+import com.xdap.self_development.utils.RedisLockUtils;
 import groovy.util.logging.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -48,7 +48,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
     @Resource
     private BusinessDatabase bd;
     @Resource
-    private RedisLockUtil redisLockUtil;
+    private RedisLockUtils redisLockUtil;
     @Resource
     private ActivitiProcessService myself;
 
@@ -70,7 +70,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
         List<EngineParamDetailPojo> engineParamDetailPojos;
         try {
             engineParamDetailPojos = engineParamDetailService.selectByModelNewVersion(modelID).stream()
-                    .filter(x -> ParamOperation.UPDATE.toString().equals(x.getOperation())
+                    .filter(x -> ParamOperationEnum.UPDATE.toString().equals(x.getOperation())
                             && userID.equals(x.getLastUpdatedBy() == null ? "" : x.getLastUpdatedBy()))
                     .collect(Collectors.toList());
             if (ObjectUtils.isEmpty(engineParamDetailPojos)) {
@@ -83,16 +83,16 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
         ArrayList<DataChangeCommentPojo> das = new ArrayList<>();
         for (EngineParamDetailPojo engineParamDetailPojo : engineParamDetailPojos) {
             String parameterId = engineParamDetailPojo.getParameterId();
-            List<Parameter> parameters = bd.getBusinessDatabase()
+            List<ParameterPojo> parameters = bd.getBusinessDatabase()
                     .eq("id", parameterId)
-                    .doQuery(Parameter.class);
+                    .doQuery(ParameterPojo.class);
             if (ObjectUtils.isEmpty(parameters)) {
                 throw new RuntimeException("未找到对应参数模板中的参数");
             }
-            Parameter parameter = parameters.get(0);
+            ParameterPojo parameter = parameters.get(0);
             String com = "";
             String operation = engineParamDetailPojo.getOperation();
-            if (ParamOperation.UPDATE.toString().equals(operation)) {
+            if (ParamOperationEnum.UPDATE.toString().equals(operation)) {
                 String parameterValue = StringUtils.isEmpty(engineParamDetailPojo.getParameterValue()) ?
                         "" : engineParamDetailPojo.getParameterValue();
                 if (ObjectUtils.isEmpty(parameterValue)) {
@@ -101,10 +101,10 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
                     com = "修改:" + parameterValue + "改为" + engineParamDetailPojo.getMinorVersion();
                 }
             }
-            if (ParamOperation.INSERT.toString().equals(operation)) {
+            if (ParamOperationEnum.INSERT.toString().equals(operation)) {
                 com = "新增";
             }
-            if (ParamOperation.DELETE.toString().equals(operation)) {
+            if (ParamOperationEnum.DELETE.toString().equals(operation)) {
                 com = "删除";
             }
             DataEntryEngineModelPojo modelPojo = dataEntryEngineModelService.selectBymodelId(engineParamDetailPojo.getEngineModelId());
@@ -159,7 +159,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
         try {
             paramList = engineParamDetailService.selectByModelNewVersion(modelId)
                     .stream()
-                    .filter(x -> ParamOperation.UPDATE.toString()
+                    .filter(x -> ParamOperationEnum.UPDATE.toString()
                             .equals(x.getOperation()) && userId.equals(x.getLastUpdatedBy() == null ? "" : x.getLastUpdatedBy())).collect(Collectors.toList());
             if (ObjectUtils.isEmpty(paramList)) {
                 throw new RuntimeException();
@@ -572,7 +572,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
                         .doQuery(EngineParamDetailPojo.class);
                 List<EngineParamDetailPojo> passDetail = bd.getBusinessDatabase()
                         .eq("approval_id", flow.getId())
-                        .eq("operation", ParamOperation.UPDATE)
+                        .eq("operation", ParamOperationEnum.UPDATE)
                         .doQuery(EngineParamDetailPojo.class);
                 List<String> ids = passDetail.stream()
                         .map(EngineParamDetailPojo::getId)
@@ -737,12 +737,12 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
                 1
         );
 
-        ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+        ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                 .eq("flow_id", reviewListPojo.getId())
                 .orderBy("approval_time", "desc")
-                .doQueryFirst(ApprovalRecord.class);
+                .doQueryFirst(ApprovalRecordPojo.class);
         bd.getBusinessDatabase().doInsert(
-                new ApprovalRecord(
+                new ApprovalRecordPojo(
                         reviewListPojo.getId(),
                         "重新发起",
                         xdapDeptUsersService.selectUserByID(userId).getUsername(),
@@ -1018,7 +1018,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
                     .eq("id", flow.getId())
                     .update("current_node", toNode.getNodeOrder())
                     .update("pre_node", currentNode.getNodeOrder())
-                    .doUpdate(ApprovalFlow.class);
+                    .doUpdate(ApprovalFlowPojo.class);
 
             // 生成新的待办
             myself.addNodeTodo(flow, toNode, form.getCreateUserId(), 0);
diff --git a/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java
index d424518..180fadc 100644
--- a/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java
@@ -3,13 +3,12 @@ package com.xdap.self_development.service.impl;
 
 import java.util.regex.Pattern;
 
-import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.xdap.self_development.common.BusinessDatabase;
 import com.xdap.self_development.controller.request.*;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.*;
-import com.xdap.self_development.pojo.view.AnalysisModelParamterView;
-import com.xdap.self_development.pojo.view.AnalysisModelParamterViewAndParam;
+import com.xdap.self_development.domain.pojo.*;
+import com.xdap.self_development.domain.view.AnalysisModelParamterView;
+import com.xdap.self_development.domain.view.AnalysisModelParamterViewAndParam;
 import com.xdap.self_development.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -48,9 +47,9 @@ public class AnalysisCommonParametersServiceImpl implements AnalysisCommonParame
 //            log.warn("analysisRequest is empty");
 //            return null;
 //        }
-//        List<ModelCommonParameters> commons = businessDatabase.getBusinessDatabase()
+//        List<ModelCommonParametersPojo> commons = businessDatabase.getBusinessDatabase()
 //                .eq("common_id", analysisRequest.getCommonId())
-//                .doQuery(ModelCommonParameters.class);
+//                .doQuery(ModelCommonParametersPojo.class);
 //        List<String> paramIds = commons.stream().map(x -> x.getParameterId()).collect(Collectors.toList());
 //        if (ObjectUtils.isEmpty(paramIds)) {
 //            return null;
@@ -121,11 +120,11 @@ public class AnalysisCommonParametersServiceImpl implements AnalysisCommonParame
 
     @Override
     public List<String> getAvailableParameters() {
-        List<Parameter> modelParams = businessDatabase.getBusinessDatabase()
+        List<ParameterPojo> modelParams = businessDatabase.getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("selectAllParameters")
-                .doQuery(Parameter.class);
-        return modelParams.stream().filter(x -> x.getUnit() != null && !x.getUnit().equals("/")).map(Parameter::getParameterName).distinct().collect(Collectors.toList());
+                .doQuery(ParameterPojo.class);
+        return modelParams.stream().filter(x -> x.getUnit() != null && !x.getUnit().equals("/")).map(ParameterPojo::getParameterName).distinct().collect(Collectors.toList());
     }
 /*
     public AnalysisModelParamterViewAndParam showReport1(List<String> modelIds) {
diff --git a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java
index 5e18e58..4972309 100644
--- a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java
@@ -10,16 +10,16 @@ import com.xdap.self_development.common.BusinessDatabase;
 import com.xdap.self_development.controller.form.*;
 import com.xdap.self_development.exception.CommonException;
 import com.xdap.self_development.feign.ApaasMyTokenFeign;
-import com.xdap.self_development.feign.dto.AppTokenDTO;
-import com.xdap.self_development.feign.dto.FileUploadDTO;
-import com.xdap.self_development.feign.dto.UserTokenDT0;
-import com.xdap.self_development.pojo.*;
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
-import com.xdap.self_development.pojo.dto.ApprovalNodesDTO;
-import com.xdap.self_development.pojo.view.*;
+import com.xdap.self_development.domain.dto.AppTokenDTO;
+import com.xdap.self_development.domain.dto.FileUploadDTO;
+import com.xdap.self_development.domain.dto.UserTokenDT0;
+import com.xdap.self_development.domain.pojo.*;
+import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
+import com.xdap.self_development.domain.dto.ApprovalNodesDTO;
+import com.xdap.self_development.domain.view.*;
 import com.xdap.self_development.service.BenchmarkingReportService;
 import com.xdap.self_development.service.XdapDeptUsersService;
-import com.xdap.self_development.utils.RedisLockUtil;
+import com.xdap.self_development.utils.RedisLockUtils;
 import org.bson.types.ObjectId;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +45,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     @Autowired
     private ApaasMyTokenFeign apaasMyTokenFeign;
     @Resource
-    private RedisLockUtil redisLockUtil;
+    private RedisLockUtils redisLockUtil;
     @Resource
     private XdapDeptUsersService xdapDeptUsersService;
     @Resource
@@ -64,7 +64,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     @Transactional
     public void insertReport(SaveBenchmarkingReportForm form) {
         // 创建报告
-        BenchmarkingReport report = new BenchmarkingReport();
+        BenchmarkingReportPojo report = new BenchmarkingReportPojo();
         BeanUtils.copyProperties(form, report);
         report.setFilePath(form.getFileUrl() == null ? "" : form.getFileUrl());
         report.setUploadTime(Timestamp.valueOf(LocalDateTime.now()));
@@ -77,7 +77,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
         bd.getBusinessDatabase().doInsert(report);
 
         // 新增流程
-        ApprovalFlow flow = new ApprovalFlow();
+        ApprovalFlowPojo flow = new ApprovalFlowPojo();
         flow.setTemplateId(report.getId());
         flow.setCurrentNode(1);
         flow.setFlowStatus("DRAFT");
@@ -106,9 +106,9 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     @Override
     public void updateReport(UpdateBenchmarkingReportForm form) {
         // 验证报告
-        BenchmarkingReport report = bd.getBusinessDatabase()
+        BenchmarkingReportPojo report = bd.getBusinessDatabase()
                 .eq("id", form.getReportId())
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
         if (!"DRAFT".equals(report.getStatus()) && !"REJECTED".equals(report.getStatus())) {
             throw new CommonException("报告非草稿或拒绝状态不可修改");
         }
@@ -128,25 +128,25 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     @Override
     @Transactional
     public void deleteReport(String reportId) {
-        BenchmarkingReport report = bd.getBusinessDatabase()
+        BenchmarkingReportPojo report = bd.getBusinessDatabase()
                 .eq("id", reportId)
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
         if (report == null) {
             throw new CommonException("该报告不存在");
         }
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("template_id", reportId)
                 .ne("pre_node", -1)
                 .eq("flow_status", "APPROVING")
                 .orderBy("created_time", "desc")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (flow != null) {
             throw new CommonException("该报告正在审批中");
         }
         bd.getBusinessDatabase()
                 .eq("id", reportId)
                 .update("is_delete", 1)
-                .doUpdate(BenchmarkingReport.class);
+                .doUpdate(BenchmarkingReportPojo.class);
     }
 
     @Override
@@ -183,25 +183,25 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     @Transactional
     public void startReportApproval(ApprovalPersonForm form) {
         // 验证能否发起审批
-        BenchmarkingReport report = bd.getBusinessDatabase()
+        BenchmarkingReportPojo report = bd.getBusinessDatabase()
                 .eq("id", form.getReportId())
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
         if (report == null) {
             throw new CommonException("该报告不存在");
         }
 
-        ApprovalFlow approvalFlow = bd.getBusinessDatabase()
+        ApprovalFlowPojo approvalFlow = bd.getBusinessDatabase()
                 .eq("id", form.getFlowId())
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (approvalFlow == null || Objects.equals(approvalFlow.getFlowStatus(), "APPROVING")) {
             throw new CommonException("该报告正在审批中");
         }
 
         // 清除拒绝提醒待办
-        ApprovalFlow historyFlow = bd.getBusinessDatabase()
+        ApprovalFlowPojo historyFlow = bd.getBusinessDatabase()
                 .eq("template_id", report.getId())
                 .in("flow_status", "REJECTED", "RETURNED")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (historyFlow != null) {
             bd.getBusinessDatabase()
                     .eq("document_no", historyFlow.getId())
@@ -216,7 +216,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 .update("flow_status", "APPROVING")
                 .update("current_node", 1)
                 .update("pre_node", -1)
-                .doUpdate(ApprovalFlow.class);
+                .doUpdate(ApprovalFlowPojo.class);
 
         // 获取首个节点
         ApprovalConfigPojo firstNode = bd.getBusinessDatabase()
@@ -264,7 +264,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
 
         // 新增发起记录
         bd.getBusinessDatabase().doInsert(
-                new ApprovalRecord(
+                new ApprovalRecordPojo(
                         approvalFlow.getId(),
                         "发起审批",
                         xdapDeptUsersService.selectUserByID(form.getUserId()).getUsername(),
@@ -279,15 +279,15 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
         bd.getBusinessDatabase()
                 .eq("id", report.getId())
                 .update("status", "APPROVING")
-                .doUpdate(BenchmarkingReport.class);
+                .doUpdate(BenchmarkingReportPojo.class);
     }
 
     @Override
     @Transactional
     public void continueApproval(String flowId, String userId) {
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", flowId)
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (flow == null) {
             throw new CommonException("流程不存在");
         }
@@ -314,13 +314,13 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                     .update("flow_status", "APPROVING")
                     .update("current_node", firstNode.getNodeOrder())
                     .update("pre_node", -1)
-                    .doUpdate(ApprovalFlow.class);
+                    .doUpdate(ApprovalFlowPojo.class);
         }
 
         // 获取当前节点和模板
-        BenchmarkingReport report = bd.getBusinessDatabase()
+        BenchmarkingReportPojo report = bd.getBusinessDatabase()
                 .eq("id", flow.getTemplateId())
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
 
         // 添加新待办
         myself.addNodeTodo(
@@ -331,12 +331,12 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 1
         );
 
-        ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+        ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                 .eq("flow_id", flow.getId())
                 .orderBy("approval_time", "desc")
-                .doQueryFirst(ApprovalRecord.class);
+                .doQueryFirst(ApprovalRecordPojo.class);
         bd.getBusinessDatabase().doInsert(
-                new ApprovalRecord(
+                new ApprovalRecordPojo(
                         flow.getId(),
                         "重新发起",
                         xdapDeptUsersService.selectUserByID(userId).getUsername(),
@@ -352,18 +352,18 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     @Transactional
     public void restartReportApproval(RestartReportApprovalForm form) {
         // 获取报告
-        BenchmarkingReport report = bd.getBusinessDatabase()
+        BenchmarkingReportPojo report = bd.getBusinessDatabase()
                 .eq("id", form.getReportId())
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
 
         if (report == null) {
             throw new CommonException("报告不存在");
         }
 
-        ApprovalFlow historyFlow = bd.getBusinessDatabase()
+        ApprovalFlowPojo historyFlow = bd.getBusinessDatabase()
                 .eq("template_id", report.getId())
                 .eq("flow_status", "APPROVING")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (historyFlow != null) {
             throw new CommonException("报告正在审批中");
         }
@@ -378,10 +378,10 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 .doUpdate(report);
 
         // 清除拒绝提醒待办
-        ApprovalFlow approvalFlow = bd.getBusinessDatabase()
+        ApprovalFlowPojo approvalFlow = bd.getBusinessDatabase()
                 .eq("template_id", report.getId())
                 .in("flow_status", "REJECTED", "RETURNED")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         bd.getBusinessDatabase()
                 .eq("document_no", approvalFlow.getId())
                 .eq("data_type", "对标报告拒绝")
@@ -389,7 +389,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 .doUpdate(TodoTaskPojo.class);
 
         // 新增流程
-        ApprovalFlow flow = new ApprovalFlow();
+        ApprovalFlowPojo flow = new ApprovalFlowPojo();
         flow.setTemplateId(report.getId());
         flow.setCurrentNode(1);
         flow.setFlowStatus("APPROVING");
@@ -425,7 +425,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 .update("flow_status", "APPROVING")
                 .update("current_node", 1)
                 .update("pre_node", -1)
-                .doUpdate(ApprovalFlow.class);
+                .doUpdate(ApprovalFlowPojo.class);
 
         // 获取首个节点
         ApprovalConfigPojo firstNode = bd.getBusinessDatabase()
@@ -473,7 +473,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
 
         // 新增发起记录
         bd.getBusinessDatabase().doInsert(
-                new ApprovalRecord(
+                new ApprovalRecordPojo(
                         flow.getId(),
                         "发起审批",
                         xdapDeptUsersService.selectUserByID(newForm.getUserId()).getUsername(),
@@ -488,27 +488,27 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
         bd.getBusinessDatabase()
                 .eq("id", report.getId())
                 .update("status", "APPROVING")
-                .doUpdate(BenchmarkingReport.class);
+                .doUpdate(BenchmarkingReportPojo.class);
     }
 
     @Override
     @Transactional
     public void directSendingApproval(String reportId, String userId) {
         // 获取报告
-        BenchmarkingReport report = bd.getBusinessDatabase()
+        BenchmarkingReportPojo report = bd.getBusinessDatabase()
                 .eq("id", reportId)
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
         if (report == null) {
             throw new CommonException("报告不存在");
         }
 
         // 获取到模板最近一次未完成的流程
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("template_id", reportId)
                 .ne("pre_node", -1)
                 .ne("flow_status", "COMPLETE")
                 .orderBy("created_time", "desc")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (flow == null) {
             throw new CommonException("流程没有直送节点");
         }
@@ -533,10 +533,10 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 .eq("approval_id", flow.getId())
                 .eq("node_order", flow.getPreNode())
                 .doQueryFirst(ApprovalConfigPojo.class);
-        ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+        ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                 .eq("flow_id", flow.getId())
                 .orderBy("approval_time", "desc")
-                .doQueryFirst(ApprovalRecord.class) ;
+                .doQueryFirst(ApprovalRecordPojo.class) ;
         Integer level = Objects.equals(lastedRecord.getResult(), "MSG") ? lastedRecord.getApprovalLevel() : lastedRecord.getApprovalLevel() + 1;
 
         // 重新创建待办继续流程
@@ -553,12 +553,12 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 .update("flow_status", "APPROVING")
                 .update("current_node", flow.getPreNode())
                 .update("pre_node", -1)
-                .doUpdate(ApprovalFlow.class);
+                .doUpdate(ApprovalFlowPojo.class);
 
         bd.getBusinessDatabase()
                 .eq("id", report.getId())
                 .update("status", "APPROVING")
-                .doUpdate(BenchmarkingReport.class);
+                .doUpdate(BenchmarkingReportPojo.class);
 
         // 清除拒绝提醒待办
         bd.getBusinessDatabase()
@@ -568,7 +568,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 .doUpdate(TodoTaskPojo.class);
 
         // 创建直送记录
-        ApprovalRecord record = new ApprovalRecord(
+        ApprovalRecordPojo record = new ApprovalRecordPojo(
                 flow.getId(),
                 "直送至" + preNode.getNodeName(),
                 xdapDeptUsersService.selectUserByID(userId).getUsername(),
@@ -584,18 +584,18 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     @Transactional
     public void handleReturnToNode(HandleReturnNodeForm form) {
         // 查找流程
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", form.getFlowId())
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
 
         if (flow ==  null) {
             throw new CommonException("流程不存在");
         }
 
         // 查找模板
-        BenchmarkingReport report = bd.getBusinessDatabase()
+        BenchmarkingReportPojo report = bd.getBusinessDatabase()
                 .eq("id", flow.getTemplateId())
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
 
         // 查找当前节点
         ApprovalConfigPojo currentNode = bd.getBusinessDatabase()
@@ -636,17 +636,17 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                     .eq("id", flow.getId())
                     .update("current_node", toNode.getNodeOrder())
                     .update("pre_node", flow.getCurrentNode())
-                    .doUpdate(ApprovalFlow.class);
+                    .doUpdate(ApprovalFlowPojo.class);
 
             // 生成新的待办
             myself.addNodeTodo(flow, toNode, report, form.getCreateUserId(), 1);
 
             // 生成处理记录
-            ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+            ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                     .eq("flow_id", flow.getId())
                     .orderBy("approval_time", "desc")
-                    .doQueryFirst(ApprovalRecord.class);
-            ApprovalRecord record = new ApprovalRecord(
+                    .doQueryFirst(ApprovalRecordPojo.class);
+            ApprovalRecordPojo record = new ApprovalRecordPojo(
                     flow.getId(),
                     currentNode.getNodeName(),
                     form.getProcessUserId(),
@@ -656,7 +656,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                     lastedRecord.getApprovalLevel()
             );
             bd.getBusinessDatabase().doInsert(record);
-            ApprovalRecord approvalRecord = new ApprovalRecord(
+            ApprovalRecordPojo approvalRecord = new ApprovalRecordPojo(
                     flow.getId(),
                     "退回至" + toNode.getNodeName(),
                     xdapDeptUsersService.selectUserByID(form.getProcessUserId()).getUsername(),
@@ -674,9 +674,9 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     @Override
     @Transactional
     public void handleReturn(HandleApprovalRequest request) {
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", request.getFlowId())
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (!Objects.equals(flow.getCreateBy(), request.getUserId())) {
             throw new CommonException("不是申请人无法撤回");
         }
@@ -697,12 +697,12 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
         }
         try {
             if ("RETURN".equals(request.getResult())) {
-                ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+                ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                         .eq("flow_id", flow.getId())
                         .orderBy("approval_time", "desc")
-                        .doQueryFirst(ApprovalRecord.class);
+                        .doQueryFirst(ApprovalRecordPojo.class);
 
-                ApprovalRecord approvalRecord = new ApprovalRecord(
+                ApprovalRecordPojo approvalRecord = new ApprovalRecordPojo(
                         flow.getId(),
                         "已撤回",
                         xdapDeptUsersService.selectUserByID(request.getUserId()).getUsername(),
@@ -744,9 +744,9 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 item.setCurrentUsers(null);
             } else {
                 List<String> userIds = JSON.parseArray(item.getCurrentUsers()).toJavaList(String.class);
-                List<ApprovalXdapUsers> approvalXdapUsers = bd.getBusinessDatabase()
+                List<ApprovalXdapUsersPojo> approvalXdapUsers = bd.getBusinessDatabase()
                         .in("id", userIds)
-                        .doQuery(ApprovalXdapUsers.class);
+                        .doQuery(ApprovalXdapUsersPojo.class);
                 item.setCurrentApprovers(approvalXdapUsers);
                 item.setCurrentUsers(null);
             }
@@ -777,9 +777,9 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
 
     private void setCurrentApprovers(PageQueryResult<TodoAndReportView> result) {
         result.getResult().forEach(item -> {
-            ApprovalXdapUsers approvalXdapUser = bd.getBusinessDatabase()
+            ApprovalXdapUsersPojo approvalXdapUser = bd.getBusinessDatabase()
                     .eq("id", item.getCreateBy())
-                    .doQueryFirst(ApprovalXdapUsers.class);
+                    .doQueryFirst(ApprovalXdapUsersPojo.class);
             item.setCreateBy(approvalXdapUser == null ? item.getCreateBy() : approvalXdapUser.getUsername());
         });
     }
@@ -788,10 +788,10 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     @Transactional
     public void handleReportApproval(HandleApprovalRequest request) {
         // 验证流程状态和用户权限
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", request.getFlowId())
                 .eq("flow_type", 2)
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (flow == null || !"APPROVING".equals(flow.getFlowStatus())) {
             throw new CommonException("流程不存在或已结束");
         }
@@ -804,10 +804,10 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
         }
 
         // 获取最新处理记录
-        ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+        ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                 .eq("flow_id", flow.getId())
                 .orderBy("approval_time", "desc")
-                .doQueryFirst(ApprovalRecord.class);
+                .doQueryFirst(ApprovalRecordPojo.class);
 
         String lockKey = FLOW_LOCK_PREFIX + flow.getId() + ":" + currentNode.getNodeName();
         String lockValue = UUID.randomUUID().toString();
@@ -822,7 +822,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                     .eq("flow_id", flow.getId())
                     .eq("node", currentNode.getNodeName())
                     .eq("approval_level", lastedRecord.getApprovalLevel())
-                    .doQuery(ApprovalRecord.class).size();
+                    .doQuery(ApprovalRecordPojo.class).size();
             if (processedCount > 0) {
                 throw new CommonException("此节点已被他人处理");
             }
@@ -839,13 +839,13 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     }
 
     public void processApprovalLogic(
-            ApprovalFlow flow,
+            ApprovalFlowPojo flow,
             HandleApprovalRequest request,
             ApprovalConfigPojo currentNode,
-            ApprovalRecord lastedRecord
+            ApprovalRecordPojo lastedRecord
     ) {
         // 记录审批结果
-        ApprovalRecord record = new ApprovalRecord(
+        ApprovalRecordPojo record = new ApprovalRecordPojo(
                 flow.getId(),
                 currentNode.getNodeName(),
                 request.getUserId(),
@@ -887,11 +887,11 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
         myself.processNextNode(flow, currentNode, request.getUserId());
     }
 
-    public void processNextNode(ApprovalFlow flow, ApprovalConfigPojo currentNode, String userId) {
+    public void processNextNode(ApprovalFlowPojo flow, ApprovalConfigPojo currentNode, String userId) {
         // 查询报告状态
-        BenchmarkingReport report = bd.getBusinessDatabase()
+        BenchmarkingReportPojo report = bd.getBusinessDatabase()
                 .eq("id", flow.getTemplateId())
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
         // 获取下一个节点
         ApprovalConfigPojo nextNode = bd.getBusinessDatabase()
                 .eq("approval_id", flow.getId())
@@ -905,7 +905,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
             bd.getBusinessDatabase()
                     .rowid("id", report.getRowId())
                     .update("status", report.getStatus())
-                    .doUpdate(BenchmarkingReport.class);
+                    .doUpdate(BenchmarkingReportPojo.class);
             // 待办环节修改
             myself.updateTasks(flow, "已完成", 0, null);
         } else {
@@ -917,13 +917,13 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 .rowid("id", flow.getRowId())
                 .update("flow_status", flow.getFlowStatus())
                 .update("current_node", flow.getCurrentNode())
-                .doUpdate(ApprovalFlow.class);
+                .doUpdate(ApprovalFlowPojo.class);
     }
 
     public void addNodeTodo(
-            ApprovalFlow flow,
+            ApprovalFlowPojo flow,
             ApprovalConfigPojo node,
-            BenchmarkingReport report,
+            BenchmarkingReportPojo report,
             String createBy,
             Integer enableReturn
     ) {
@@ -958,7 +958,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     }
 
     public void cancelProcess(
-            ApprovalFlow flow,
+            ApprovalFlowPojo flow,
             ApprovalConfigPojo node,
             String status,
             String userId
@@ -976,17 +976,17 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 .update("flow_status", flow.getFlowStatus())
                 .update("return_num", flow.getReturnNum() + 1)
                 .update("pre_node", node.getNodeOrder())
-                .doUpdate(ApprovalFlow.class);
+                .doUpdate(ApprovalFlowPojo.class);
         // 更新报告状态
-        BenchmarkingReport report = bd.getBusinessDatabase()
+        BenchmarkingReportPojo report = bd.getBusinessDatabase()
                 .eq("id", flow.getTemplateId())
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
         report.setStatus(status);
         bd.getBusinessDatabase()
                 .rowid("id", report.getRowId())
                 .update("status", "DRAFT")
                 .update("return_num", report.getReturnNum() + 1)
-                .doUpdate(BenchmarkingReport.class);
+                .doUpdate(BenchmarkingReportPojo.class);
         // 增加拒绝待办
         if (Objects.equals(status, "REJECTED")) {
             TodoTaskPojo todoTask = new TodoTaskPojo();
@@ -1009,7 +1009,7 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
         myself.updateTasks(flow, Objects.equals(report.getStatus(), "RETURNED") ? "已撤回" : "已拒绝", 0, node);
     }
 
-    public void updateTasks(ApprovalFlow flow, String status, Integer enableReturn, ApprovalConfigPojo currentNode) {
+    public void updateTasks(ApprovalFlowPojo flow, String status, Integer enableReturn, ApprovalConfigPojo currentNode) {
         // 更新已办和发起的节点状态
         bd.getBusinessDatabase()
                 .eq("document_no", flow.getId())
@@ -1032,9 +1032,9 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
         List<ApprovalUserNodeDTO> list = new ArrayList<>();
 
         // 获取到模板最近一次未完成的流程
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", flowId)
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (flow == null) {
             nodes.setNodeList(list);
             return nodes;
@@ -1064,20 +1064,20 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
     }
 
     @Override
-    public BenchmarkingReport getReportDetail(String reportId) {
+    public BenchmarkingReportPojo getReportDetail(String reportId) {
         return bd.getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("getReportById")
                 .setVar("reportId", reportId)
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
     }
 
     @Override
     public ApprovalFlowNodeView getReportProcess(String flowId) {
         ApprovalFlowNodeView flowNodeView = new ApprovalFlowNodeView();
-        ApprovalFlow approvalFlow = bd.getBusinessDatabase()
+        ApprovalFlowPojo approvalFlow = bd.getBusinessDatabase()
                 .eq("id", flowId)
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         // 无流程创建空返回
         if (approvalFlow == null) {
             return flowNodeView;
@@ -1085,14 +1085,14 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
 
         List<FlowNode> flowNodes = new ArrayList<>();
 
-        List<ApprovalRecord> allRecord = bd.getBusinessDatabase()
+        List<ApprovalRecordPojo> allRecord = bd.getBusinessDatabase()
                 .eq("flow_id", approvalFlow.getId())
                 .orderBy("approval_time", "asc")
-                .doQuery(ApprovalRecord.class);
+                .doQuery(ApprovalRecordPojo.class);
 
-        BenchmarkingReport report = bd.getBusinessDatabase()
+        BenchmarkingReportPojo report = bd.getBusinessDatabase()
                 .eq("id", approvalFlow.getTemplateId())
-                .doQueryFirst(BenchmarkingReport.class);
+                .doQueryFirst(BenchmarkingReportPojo.class);
 
         // 获取节点信息
         if (approvalFlow.getCurrentNode() != null) {
@@ -1132,13 +1132,13 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
                 ));
 
         // 获取所有层级
-        Map<Integer, List<ApprovalRecord>> levelMap = allRecord.stream()
+        Map<Integer, List<ApprovalRecordPojo>> levelMap = allRecord.stream()
                 .collect(Collectors.groupingBy(
-                        ApprovalRecord::getApprovalLevel,
+                        ApprovalRecordPojo::getApprovalLevel,
                         Collectors.collectingAndThen(
                                 Collectors.toList(),
                                 list -> list.stream()
-                                        .sorted(Comparator.comparing(ApprovalRecord::getApprovalTime))
+                                        .sorted(Comparator.comparing(ApprovalRecordPojo::getApprovalTime))
                                         .collect(Collectors.toList())
                         )
                 ));
@@ -1146,14 +1146,14 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
         // 获取最大层级
         int maxLevel = levelMap.keySet().stream().max(Integer::compare).orElse(1);
 
-        for (Map.Entry<Integer, List<ApprovalRecord>> entry : levelMap.entrySet()) {
+        for (Map.Entry<Integer, List<ApprovalRecordPojo>> entry : levelMap.entrySet()) {
             // 获取到每一层
             int level = entry.getKey();
             Set<Integer> nodeList = new HashSet<>();
-            List<ApprovalRecord> records = entry.getValue();
-            List<ApprovalRecord> uniqueRecords = new ArrayList<>(records.stream()
+            List<ApprovalRecordPojo> records = entry.getValue();
+            List<ApprovalRecordPojo> uniqueRecords = new ArrayList<>(records.stream()
                     .collect(Collectors.toMap(
-                            ApprovalRecord::getNode,
+                            ApprovalRecordPojo::getNode,
                             Function.identity(),
                             (first, second) -> first
                     ))
@@ -1197,11 +1197,11 @@ public class  BenchmarkingReportServiceImpl implements BenchmarkingReportService
             int level
     ) {
         FlowNode nodeView = new FlowNode();
-        ApprovalRecord record = bd.getBusinessDatabase()
+        ApprovalRecordPojo record = bd.getBusinessDatabase()
                 .eq("flow_id", flowId)
                 .eq("node", node.getNodeName())
                 .eq("approval_level", level)
-                .doQueryFirst(ApprovalRecord.class);
+                .doQueryFirst(ApprovalRecordPojo.class);
         nodeView.setNodeOrder(node.getNodeOrder());
         nodeView.setNode(node.getNodeName());
         if (record != null) {
diff --git a/src/main/java/com/xdap/self_development/service/impl/CommonParameterServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/CommonParameterServiceImpl.java
index f7c756c..f563ee3 100644
--- a/src/main/java/com/xdap/self_development/service/impl/CommonParameterServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/CommonParameterServiceImpl.java
@@ -3,9 +3,9 @@ package com.xdap.self_development.service.impl;
 import com.xdap.self_development.common.BusinessDatabase;
 import com.xdap.self_development.controller.form.*;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.*;
-import com.xdap.self_development.pojo.view.ParameterItem;
-import com.xdap.self_development.pojo.view.ParametersView;
+import com.xdap.self_development.domain.pojo.*;
+import com.xdap.self_development.domain.view.ParameterItem;
+import com.xdap.self_development.domain.view.ParametersView;
 import com.xdap.self_development.service.CommonParameterService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -22,14 +22,14 @@ public class CommonParameterServiceImpl implements CommonParameterService {
 
     @Override
     public List<ModelCommonItem> getSystemAndPara() {
-        List<Parameter> parameters = bd.getBusinessDatabase()
+        List<ParameterPojo> parameters = bd.getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("getAllSubsystemAndPara")
-                .doQuery(Parameter.class);
+                .doQuery(ParameterPojo.class);
 
-        List<GlobalParameter> globalParameters = bd.getBusinessDatabase().doQuery(GlobalParameter.class);
+        List<GlobalParameterPojo> globalParameters = bd.getBusinessDatabase().doQuery(GlobalParameterPojo.class);
         globalParameters.forEach(globalParameter -> {
-            Parameter parameter = new Parameter();
+            ParameterPojo parameter = new ParameterPojo();
             BeanUtils.copyProperties(globalParameter, parameter);
             parameters.add(parameter);
         });
@@ -39,24 +39,24 @@ public class CommonParameterServiceImpl implements CommonParameterService {
 
     @Override
     public List<ModelCommon> getModelCommonParameter(String userId) {
-        List<CommonParameter> commonParameters = bd.getBusinessDatabase()
+        List<CommonParameterPojo> commonParameters = bd.getBusinessDatabase()
                 .eq("create_by", userId)
                 .eq("common_type", 1)
-                .doQuery(CommonParameter.class);
+                .doQuery(CommonParameterPojo.class);
 
-        List<String> ids = commonParameters.stream().map(CommonParameter::getId)
+        List<String> ids = commonParameters.stream().map(CommonParameterPojo::getId)
                 .collect(Collectors.toList());
         if (ids.isEmpty()) {
             return Collections.emptyList();
         }
 
         // 数据处理
-        List<ModelCommonParameters> modelCommonParameters = bd.getBusinessDatabase()
+        List<ModelCommonParametersPojo> modelCommonParameters = bd.getBusinessDatabase()
                 .viewQueryMode(true).view("getCommonAndParameters")
-                .setVar("ids", ids).doQuery(ModelCommonParameters.class);
+                .setVar("ids", ids).doQuery(ModelCommonParametersPojo.class);
         modelCommonParameters.addAll(
                 bd.getBusinessDatabase().viewQueryMode(true).view("getCommonAndGlobalParameters")
-                        .setVar("ids", ids).doQuery(ModelCommonParameters.class)
+                        .setVar("ids", ids).doQuery(ModelCommonParametersPojo.class)
         );
         return convertToModelCommonList(modelCommonParameters, commonParameters);
     }
@@ -65,22 +65,22 @@ public class CommonParameterServiceImpl implements CommonParameterService {
     @Transactional
     public void insertModelCommonParameter(ModelCommonParameterInsertForm form) {
         // 检查名字是否重复
-        List<CommonParameter> modelCommonParameters1 = bd.getBusinessDatabase()
+        List<CommonParameterPojo> modelCommonParameters1 = bd.getBusinessDatabase()
                 .eq("common_name", form.getCommonName())
                 .eq("create_by", form.getUserId())
-                .doQuery(CommonParameter.class);
+                .doQuery(CommonParameterPojo.class);
         if (!modelCommonParameters1.isEmpty()) {
             throw new CommonException("常用名重复，请重新命名");
         }
         // 新增常用
-        CommonParameter commonParameter = new CommonParameter();
+        CommonParameterPojo commonParameter = new CommonParameterPojo();
         commonParameter.setCommonName(form.getCommonName());
         commonParameter.setCommonType(1);
         commonParameter.setCreateBy(form.getUserId());
         bd.getBusinessDatabase().doInsert(commonParameter);
 
         // 关联常用参数
-        List<ModelCommonParameters> modelCommonParameters =
+        List<ModelCommonParametersPojo> modelCommonParameters =
                 convertToModelCommonParameters(form.getParameters(), commonParameter.getId());
         bd.getBusinessDatabase().doBatchInsert(modelCommonParameters);
     }
@@ -88,45 +88,45 @@ public class CommonParameterServiceImpl implements CommonParameterService {
     @Override
     @Transactional
     public void updateModelCommonParameter(ModelCommonParameterUpdateForm form) {
-        CommonParameter commonParameter = bd.getBusinessDatabase()
-                .eq("id", form.getCommonId()).doQueryFirst(CommonParameter.class);
+        CommonParameterPojo commonParameter = bd.getBusinessDatabase()
+                .eq("id", form.getCommonId()).doQueryFirst(CommonParameterPojo.class);
         if (commonParameter == null) {
             throw new CommonException("无该常用");
         }
         bd.getBusinessDatabase().eq("common_id", form.getCommonId())
-                .doDelete(ModelCommonParameters.class);
-        List<ModelCommonParameters> modelCommonParameters =
+                .doDelete(ModelCommonParametersPojo.class);
+        List<ModelCommonParametersPojo> modelCommonParameters =
                 convertToModelCommonParameters(form.getParameters(), form.getCommonId());
         bd.getBusinessDatabase().doBatchInsert(modelCommonParameters);
     }
 
     @Override
-    public List<AnalysisCommonParameters> getAnalysisCommonParameter(String userId) {
+    public List<AnalysisCommonParametersPojo> getAnalysisCommonParameter(String userId) {
         return bd.getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("queryCommon")
                 .setVar("user_id", userId)
-                .doQuery(AnalysisCommonParameters.class);
+                .doQuery(AnalysisCommonParametersPojo.class);
     }
 
     @Override
     @Transactional
     public void insertAnalysisCommonParameter(AnalysisCommonParameterInsertForm form) {
         // 检查名字是否重复
-        List<CommonParameter> modelCommonParameters1 = bd.getBusinessDatabase()
-                .eq("common_name", form.getCommonName()).doQuery(CommonParameter.class);
+        List<CommonParameterPojo> modelCommonParameters1 = bd.getBusinessDatabase()
+                .eq("common_name", form.getCommonName()).doQuery(CommonParameterPojo.class);
         if (!modelCommonParameters1.isEmpty()) {
             throw new CommonException("常用名重复，请重新命名");
         }
         // 新增常用
-        CommonParameter commonParameter = new CommonParameter();
+        CommonParameterPojo commonParameter = new CommonParameterPojo();
         commonParameter.setCommonName(form.getCommonName());
         commonParameter.setCommonType(2);
         commonParameter.setCreateBy(form.getUserId());
         bd.getBusinessDatabase().doInsert(commonParameter);
 
         // 关联常用参数
-        AnalysisCommonParameters analysisCommonParameter = new AnalysisCommonParameters();
+        AnalysisCommonParametersPojo analysisCommonParameter = new AnalysisCommonParametersPojo();
         BeanUtils.copyProperties(form, analysisCommonParameter);
         analysisCommonParameter.setCommonId(commonParameter.getId());
         bd.getBusinessDatabase().doInsert(analysisCommonParameter);
@@ -135,33 +135,33 @@ public class CommonParameterServiceImpl implements CommonParameterService {
     @Override
     @Transactional
     public void updateAnalysisCommonParameter(AnalysisCommonParameterUpdateForm form) {
-        CommonParameter commonParameter = bd.getBusinessDatabase()
-                .eq("id", form.getCommonId()).doQueryFirst(CommonParameter.class);
+        CommonParameterPojo commonParameter = bd.getBusinessDatabase()
+                .eq("id", form.getCommonId()).doQueryFirst(CommonParameterPojo.class);
         if (commonParameter == null) {
             throw new CommonException("无该常用");
         }
-        AnalysisCommonParameters commonParameters = bd.getBusinessDatabase()
+        AnalysisCommonParametersPojo commonParameters = bd.getBusinessDatabase()
                 .eq("common_id", form.getCommonId())
-                .doQueryFirst(AnalysisCommonParameters.class);
+                .doQueryFirst(AnalysisCommonParametersPojo.class);
         BeanUtils.copyProperties(form, commonParameters);
         bd.getBusinessDatabase().rowid("id", commonParameter.getRowId()).doUpdate(commonParameter);
     }
 
     /**
-     * Parameter 列表转换为 ModelCommonItem 列表
+     * ParameterPojo 列表转换为 ModelCommonItem 列表
      */
-    public static List<ModelCommonItem> convertToModelCommonItemList(List<Parameter> parameterList) {
+    public static List<ModelCommonItem> convertToModelCommonItemList(List<ParameterPojo> parameterList) {
         if (parameterList == null || parameterList.isEmpty()) {
             return new ArrayList<>();
         }
-        LinkedHashMap<String, List<Parameter>> groupedBySubsystem = parameterList.stream()
+        LinkedHashMap<String, List<ParameterPojo>> groupedBySubsystem = parameterList.stream()
                 .filter(param -> param.getSubsystemName() != null)  // 过滤掉 subsystemName 为 null 的参数
                 .sorted(Comparator.comparingInt(param -> {
                     Integer orderNum = param.getOrderNum();
                     return orderNum != null ? orderNum : Integer.MAX_VALUE;  // null 值的放到最后
                 }))
                 .collect(Collectors.groupingBy(
-                        Parameter::getSubsystemName,
+                        ParameterPojo::getSubsystemName,
                         LinkedHashMap::new,  // 保持插入顺序
                         Collectors.toList()
                 ));
@@ -193,25 +193,25 @@ public class CommonParameterServiceImpl implements CommonParameterService {
     }
 
     /**
-     * 将 ModelCommonParameters 列表转换为 ModelCommon 列表
+     * 将 ModelCommonParametersPojo 列表转换为 ModelCommon 列表
      */
     private List<ModelCommon> convertToModelCommonList(
-            List<ModelCommonParameters> paramsList, List<CommonParameter> commonParameters
+            List<ModelCommonParametersPojo> paramsList, List<CommonParameterPojo> commonParameters
     ) {
-        Map<String, List<ModelCommonParameters>> groupedByCommonId = new HashMap<>();
+        Map<String, List<ModelCommonParametersPojo>> groupedByCommonId = new HashMap<>();
         if (paramsList != null && !paramsList.isEmpty()) {
             groupedByCommonId = paramsList.stream()
                     .filter(param -> param.getCommonId() != null)  // 过滤掉 commonId 为 null 的参数
-                    .collect(Collectors.groupingBy(ModelCommonParameters::getCommonId));
+                    .collect(Collectors.groupingBy(ModelCommonParametersPojo::getCommonId));
         }
         
         List<ModelCommon> result = new ArrayList<>();
-        for (CommonParameter commonParameter : commonParameters) {
+        for (CommonParameterPojo commonParameter : commonParameters) {
             String commonId = commonParameter.getId();
             if (commonId == null) {
                 continue;
             }
-            List<ModelCommonParameters> commonParams = groupedByCommonId.get(commonId);
+            List<ModelCommonParametersPojo> commonParams = groupedByCommonId.get(commonId);
             
             ModelCommon modelCommon = new ModelCommon();
             modelCommon.setCommonName(commonParameter.getCommonName());
@@ -221,12 +221,12 @@ public class CommonParameterServiceImpl implements CommonParameterService {
                 // 即使没有参数，也返回一个空的子系统列表
                 modelCommon.setSubsystems(new ArrayList<>());
             } else {
-                Map<String, List<ModelCommonParameters>> groupedBySubsystem = commonParams.stream()
+                Map<String, List<ModelCommonParametersPojo>> groupedBySubsystem = commonParams.stream()
                         .filter(param -> param.getSubsystemName() != null)  // 过滤掉 subsystemName 为 null 的参数
-                        .collect(Collectors.groupingBy(ModelCommonParameters::getSubsystemName));
+                        .collect(Collectors.groupingBy(ModelCommonParametersPojo::getSubsystemName));
                 
                 List<ModelCommonItem> items = new ArrayList<>();
-                for (Map.Entry<String, List<ModelCommonParameters>> subsystemEntry : groupedBySubsystem.entrySet()) {
+                for (Map.Entry<String, List<ModelCommonParametersPojo>> subsystemEntry : groupedBySubsystem.entrySet()) {
                     ModelCommonItem item = new ModelCommonItem();
                     item.setSubsystem(subsystemEntry.getKey());
                     List<ParametersView> parameters = subsystemEntry.getValue().stream()
@@ -249,11 +249,11 @@ public class CommonParameterServiceImpl implements CommonParameterService {
     }
 
     /**
-     * 将List 转换为 ModelCommonParameters 列表
+     * 将List 转换为 ModelCommonParametersPojo 列表
      */
-    private List<ModelCommonParameters> convertToModelCommonParameters(
+    private List<ModelCommonParametersPojo> convertToModelCommonParameters(
             List<ParameterItem> parameters, String commonId) {
-        List<ModelCommonParameters> result = new ArrayList<>();
+        List<ModelCommonParametersPojo> result = new ArrayList<>();
 
         if (parameters != null) {
         // 筛选整车参数
@@ -263,7 +263,7 @@ public class CommonParameterServiceImpl implements CommonParameterService {
                 .map(ParameterItem::getParameterId).collect(Collectors.toList());
 
             for (String parameterId : globalParameters) {
-                ModelCommonParameters param = new ModelCommonParameters();
+                ModelCommonParametersPojo param = new ModelCommonParametersPojo();
                 param.setParameterId(parameterId);
                 param.setCommonId(commonId);
                 param.setIsGlobal(1);
@@ -271,7 +271,7 @@ public class CommonParameterServiceImpl implements CommonParameterService {
             }
 
             for (String parameterId : localParameters) {
-                ModelCommonParameters param = new ModelCommonParameters();
+                ModelCommonParametersPojo param = new ModelCommonParametersPojo();
                 param.setParameterId(parameterId);
                 param.setCommonId(commonId);
                 param.setIsGlobal(0);
diff --git a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java
index 7815cb7..2901200 100644
--- a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java
@@ -13,14 +13,14 @@ import com.xdap.api.moudle.user.pojo.XdapUsers;
 import com.xdap.runtime.service.RuntimeDatasourceService;
 import com.xdap.self_development.controller.request.DataEntryEngineModelExcel;
 import com.xdap.self_development.controller.request.DataEntryEngineModelPageRequest;
-import com.xdap.self_development.enums.DistributeStatusEnum;
-import com.xdap.self_development.enums.ParamValueVersionEnum;
+import com.xdap.self_development.domain.enums.DistributeStatusEnum;
+import com.xdap.self_development.domain.enums.ParamValueVersionEnum;
 import com.xdap.self_development.exception.CommonException;
 import com.xdap.self_development.exception.ExcelImportException;
 import com.xdap.self_development.listener.EngineModelListener;
-import com.xdap.self_development.pojo.*;
-import com.xdap.self_development.pojo.dto.DataEntryEngineModelDto;
-import com.xdap.self_development.pojo.dto.PageResultDTO;
+import com.xdap.self_development.domain.pojo.*;
+import com.xdap.self_development.domain.dto.DataEntryEngineModelDto;
+import com.xdap.self_development.domain.dto.PageResultDTO;
 import com.xdap.self_development.service.DataEntryEngineModelService;
 import com.xdap.self_development.service.EngineParamDetailService;
 import com.xdap.self_development.service.ResponsiblePerService;
@@ -87,7 +87,7 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ
     @Override
     public PageResultDTO<DataEntryEngineModelDto> selectByConditionPage(DataEntryEngineModelPageRequest request) {
         //责任人ID
-        ResponsiblePerson responsiblePersonPojo;
+        ResponsiblePersonPojo responsiblePersonPojo;
         List<String> resPerIds = new ArrayList<>();
         List<DataEntryEngineModelDto> dataEntryEngineModelDtos = new ArrayList<>();
         PageResultDTO<DataEntryEngineModelDto> tPageResultDTO = new PageResultDTO<>();
@@ -107,7 +107,7 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ
                 //部门筛选
             } else if (ObjectUtils.isNotEmpty(department) && ObjectUtils.isEmpty(resPerson)) {
                 List<String> strings = responsiblePerService.selectByDepName(department).stream()
-                        .map(x -> x.getId()).collect(Collectors.toList());
+                        .map(ResponsiblePersonPojo::getId).collect(Collectors.toList());
                 if (ObjectUtils.isNotEmpty(strings)) {
                     resPerIds.addAll(strings);
                 } else {
@@ -116,7 +116,7 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ
                 //人员筛选
             } else if (ObjectUtils.isEmpty(department) && ObjectUtils.isNotEmpty(resPerson)) {
                 List<XdapUsers> userByName = xdapDeptUsersService.selectUserByPersonName(resPerson);
-                List<String> strings = responsiblePerService.selectByUserId(userByName).stream().map(x -> x.getId()).collect(Collectors.toList());
+                List<String> strings = responsiblePerService.selectByUserId(userByName).stream().map(ResponsiblePersonPojo::getId).collect(Collectors.toList());
                 if (ObjectUtils.isNotEmpty(strings)) {
                     resPerIds.addAll(strings);
                 } else {
@@ -251,17 +251,17 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ
         }
 
         return 0;*/
-        List<Parameter> parameters = engineParamDetailService.selectAllByNewVersion();
+        List<ParameterPojo> parameters = engineParamDetailService.selectAllByNewVersion();
         DataEntryEngineModelPojo modelPojo = new DataEntryEngineModelPojo();
         BeanUtils.copyProperties(request, modelPojo, "status");
-        List<ResponsiblePerson> personPojos = responsiblePerService.selectByDepName(request.getDepartment());
+        List<ResponsiblePersonPojo> personPojos = responsiblePerService.selectByDepName(request.getDepartment());
         List<DataEntryEngineModelPojo> modelPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .eq("product_number", request.getProductNumber())
 //                    .eq("brand", data.getBrand())
                 .doQuery(DataEntryEngineModelPojo.class);
         if (ObjectUtils.isNotEmpty(modelPojos)) {
             throw new ExcelImportException(
-                    String.format("请检查该型号是否已经存在")
+                    "请检查该型号是否已经存在"
             );
         }
 //     去掉责任人   if (ObjectUtils.isEmpty(personPojos)) {
@@ -302,7 +302,7 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ
     @Override
     @Transactional
     public void updateModelForNewVersion() {
-        List<Parameter> parameters = engineParamDetailService.selectAllByNewVersion();
+        List<ParameterPojo> parameters = engineParamDetailService.selectAllByNewVersion();
         DistributeStatusEnum byDesc = DistributeStatusEnum.getByDesc("未分发");
         Integer distribute_status = byDesc != null ? byDesc.getCode() : null;
         List<DataEntryEngineModelPojo> entryEngineModelPojos = selectAll();
@@ -323,15 +323,15 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ
     }
 
     //为每个机型绑定参数
-    public void saveDataParamDetail(DataEntryEngineModelPojo modelPojo, List<Parameter> parameters, Integer newVersionNum, XdapUsers xdapUsersPojo) {
-        /**
-         * 遍历机型
-         * 查找参数 将每个机型都把参数，和参数所属的填写部门关联上
-         * 参数值暂时放空
+    public void saveDataParamDetail(DataEntryEngineModelPojo modelPojo, List<ParameterPojo> parameters, Integer newVersionNum, XdapUsers xdapUsersPojo) {
+        /*
+          遍历机型
+          查找参数 将每个机型都把参数，和参数所属的填写部门关联上
+          参数值暂时放空
          */
         List<EngineParamDetailPojo> engineParamDetailPojos = new ArrayList<>();
 
-        for (Parameter parameter : parameters) {
+        for (ParameterPojo parameter : parameters) {
             EngineParamDetailPojo engineParamDetailPojo = new EngineParamDetailPojo();
             engineParamDetailPojo.setEngineModelId(modelPojo.getId());
             engineParamDetailPojo.setParameterId(parameter.getId());
@@ -348,7 +348,7 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ
             engineParamDetailPojo.setLastUpdateDate(Timestamp.valueOf(LocalDateTime.now()));
             engineParamDetailPojo.setCreationDate(Timestamp.valueOf(LocalDateTime.now()));
             //为每个参数生成默认责任人
-            List<ResponsiblePerson> personPojos = responsiblePerService.selectByDepName(parameter.getDepartment());
+            List<ResponsiblePersonPojo> personPojos = responsiblePerService.selectByDepName(parameter.getDepartment());
             if (ObjectUtils.isNotEmpty(personPojos)) {
 //      不再默认生成责任人          engineParamDetailPojo.setResponsiblePersonId(personPojos.get(0).getId());
             }
diff --git a/src/main/java/com/xdap/self_development/service/impl/DataEntryServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/DataEntryServiceImpl.java
index 5992303..ae2b0d2 100644
--- a/src/main/java/com/xdap/self_development/service/impl/DataEntryServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/DataEntryServiceImpl.java
@@ -4,8 +4,8 @@ package com.xdap.self_development.service.impl;
 import com.definesys.mpaas.query.MpaasQueryFactory;
 import com.xdap.self_development.controller.form.OptionForm;
 import com.xdap.self_development.controller.form.TemplateForm;
-import com.xdap.self_development.pojo.Parameter;
-import com.xdap.self_development.pojo.Template;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
+import com.xdap.self_development.domain.pojo.TemplatePojo;
 import com.xdap.self_development.service.DataEntryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -38,13 +38,13 @@ public class DataEntryServiceImpl implements DataEntryService {
     }
 
     @Override
-    public List<Parameter> getParameterByCondition(OptionForm form) {
-        List<Parameter> parameters = sw.buildFromDatasource("xdap_app_223770822127386625").doQuery(Parameter.class);
+    public List<ParameterPojo> getParameterByCondition(OptionForm form) {
+        List<ParameterPojo> parameters = sw.buildFromDatasource("xdap_app_223770822127386625").doQuery(ParameterPojo.class);
         return parameters;
     }
 
     @Override
-    public List<Template> getTemplateByCondition(String templateName) {
+    public List<TemplatePojo> getTemplateByCondition(String templateName) {
         return Collections.emptyList();
     }
 
@@ -52,7 +52,7 @@ public class DataEntryServiceImpl implements DataEntryService {
 //    @Override
 //    public void readExcel(MultipartFile file) {
 //        try (InputStream inputStream = file.getInputStream()){
-//            EasyExcel.read(inputStream, Parameter.class, new SheetDataListener(sw)).doReadAll();
+//            EasyExcel.read(inputStream, ParameterPojo.class, new SheetDataListener(sw)).doReadAll();
 //        } catch (IOException e) {
 //            throw new RuntimeException("读取文件失败", e);
 //        }
@@ -72,19 +72,19 @@ public class DataEntryServiceImpl implements DataEntryService {
 //            }
 //
 //            String templateName = form.getTemplateName().trim();
-//            List<Template> templates = sw.buildFromDatasource("template_db2")
+//            List<TemplatePojo> templates = sw.buildFromDatasource("template_db2")
 //                    .eq("template_name", templateName)
-//                    .doQuery(Template.class);
+//                    .doQuery(TemplatePojo.class);
 //            if (templates.size() != 1) {
 //                throw new RuntimeException("查找模板异常");
 //            }
-//            Template template = templates.get(0);
+//            TemplatePojo template = templates.get(0);
 //
 //            Set<String> fieldList = getIncludeColumnFieldNames(form);
-//            List<Parameter> list;
+//            List<ParameterPojo> list;
 //            if (form.getTemplateEmpty()) {
 //                list = new ArrayList<>();
-//                list.add(new Parameter());
+//                list.add(new ParameterPojo());
 //            } else {
 //                list = sw.buildFromDatasource("template_db2")
 //                        .viewQueryMode(true)
@@ -93,9 +93,9 @@ public class DataEntryServiceImpl implements DataEntryService {
 //                        .like("parts_name", form.getPartsName())
 //                        .like("parameter_type", form.getParameterType())
 //                        .like("parameter_name", form.getParameterName())
-//                        .doQuery(Parameter.class);
+//                        .doQuery(ParameterPojo.class);
 //            }
-//            EasyExcel.write(response.getOutputStream(), Parameter.class)
+//            EasyExcel.write(response.getOutputStream(), ParameterPojo.class)
 //                    .includeColumnFieldNames(fieldList)
 //                    .sheet(form.getTemplateName())
 //                    .doWrite(list);
@@ -140,14 +140,14 @@ public class DataEntryServiceImpl implements DataEntryService {
 //    @Transactional
 //    @Override
 //    public void insertParameter(TemplateForm form) {
-//        List<Template> templates = sw.buildFromDatasource("template_db2")
+//        List<TemplatePojo> templates = sw.buildFromDatasource("template_db2")
 //                .eq("template_name", form.getTemplateName())
-//                .doQuery(Template.class);
+//                .doQuery(TemplatePojo.class);
 //        if (templates.size() != 1) {
 //            throw new RuntimeException("查找模板错误");
 //        }
-//        Template template = templates.get(0);
-//        Parameter parameter = new Parameter();
+//        TemplatePojo template = templates.get(0);
+//        ParameterPojo parameter = new ParameterPojo();
 //        parameter.setSubsystemName(form.getSubsystemName() == null ? null:form.getSubsystemName());
 //        parameter.setType(form.getType() == null ? null:form.getType());
 //        parameter.setPartsName(form.getPartsName() == null ? null:form.getPartsName());
@@ -165,7 +165,7 @@ public class DataEntryServiceImpl implements DataEntryService {
 //        parameter.setIsAnnouncementParameters(form.getIsAnnouncementParameters() == null ? null:form.getIsAnnouncementParameters());
 //        sw.buildFromDatasource("template_db2")
 //                .doInsert(parameter);
-//        TemplateAndParameter templateAndParameter = new TemplateAndParameter();
+//        TemplateAndParameterPojo templateAndParameter = new TemplateAndParameterPojo();
 //        templateAndParameter.setParameterId(parameter.getId());
 //        templateAndParameter.setTemplateId(template.getId());
 //        sw.buildFromDatasource("template_db2")
@@ -173,14 +173,14 @@ public class DataEntryServiceImpl implements DataEntryService {
 //    }
 //
 //    @Override
-//    public List<Parameter> getParameterByCondition(OptionForm form) {
-//        List<Template> templates = sw.buildFromDatasource("template_db2")
+//    public List<ParameterPojo> getParameterByCondition(OptionForm form) {
+//        List<TemplatePojo> templates = sw.buildFromDatasource("template_db2")
 //                .eq("template_name", form.getTemplateName())
-//                .doQuery(Template.class);
+//                .doQuery(TemplatePojo.class);
 //        if (templates.size() != 1) {
 //            throw new RuntimeException("查找模板错误");
 //        }
-//        Template template = templates.get(0);
+//        TemplatePojo template = templates.get(0);
 //
 //        return sw.buildFromDatasource("template_db2")
 //                .viewQueryMode(true)
@@ -189,14 +189,14 @@ public class DataEntryServiceImpl implements DataEntryService {
 //                .like("parts_name", form.getPartsName())
 //                .like("parameter_type", form.getParameterType())
 //                .like("parameter_name", form.getParameterName())
-//                .doQuery(Parameter.class);
+//                .doQuery(ParameterPojo.class);
 //    }
 //
 //    @Override
-//    public List<Template> getTemplateByCondition(String templateName) {
+//    public List<TemplatePojo> getTemplateByCondition(String templateName) {
 //        return sw.buildFromDatasource("template_db2")
 //                .like("template_name", templateName)
-//                .doQuery(Template.class);
+//                .doQuery(TemplatePojo.class);
 //    }
 //
 //    private void setupResponse(HttpServletResponse response, String fileName) throws IOException {
diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
index 4adf2dd..8dd2471 100644
--- a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
@@ -10,17 +10,16 @@ import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.alibaba.fastjson.JSON;
 import com.definesys.mpaas.query.MpaasQueryFactory;
 import com.xdap.api.moudle.user.pojo.XdapUsers;
-import com.xdap.runtime.service.RuntimeAppContextService;
 import com.xdap.self_development.controller.request.EngineParamDetailExcel;
 import com.xdap.self_development.controller.request.EngineParamDetailRequest;
-import com.xdap.self_development.enums.CurrentNodeEnum;
-import com.xdap.self_development.enums.ParamOperation;
-import com.xdap.self_development.enums.ParamValueVersionEnum;
+import com.xdap.self_development.domain.enums.CurrentNodeEnum;
+import com.xdap.self_development.domain.enums.ParamOperationEnum;
+import com.xdap.self_development.domain.enums.ParamValueVersionEnum;
 import com.xdap.self_development.exception.CommonException;
 import com.xdap.self_development.exception.ExcelImportException;
 import com.xdap.self_development.listener.EngineParamDetailListener;
-import com.xdap.self_development.pojo.*;
-import com.xdap.self_development.pojo.dto.EngineParamDetailDTO;
+import com.xdap.self_development.domain.pojo.*;
+import com.xdap.self_development.domain.dto.EngineParamDetailDTO;
 import com.xdap.self_development.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -38,6 +37,8 @@ import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -72,48 +73,40 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
     /**
      * 返回参数列表
      *
-     * @param modelID
-     * @return
      */
     @Override
     public HashMap<String, List<String>> selectParamList(String modelID, String tcData) {
-        List<Parameter> parameters = new ArrayList<>();
+        List<ParameterPojo> parameters;
         if (ObjectUtils.isNotEmpty(tcData) && "tc".equals(tcData)) {
             parameters = selectAllAndTcByNewVersion();
         } else {
             parameters = selectAllByNewVersion();
         }
 
-        List<Template> templates =
+        List<TemplatePojo> templates =
                 sw.buildFromDatasource("xdap_app_223770822127386625")
                         .eq("status", "COMPLETE")
-                        .doQuery(Template.class);
+                        .doQuery(TemplatePojo.class);
         if (ObjectUtils.isEmpty(templates)) {
             throw new RuntimeException("未找到未找到已发布的参数模板");
         }
         //查找每个模板最新版本
-        Map<String, Template> latestTemplateMap = templates.stream()
+        // 每组内按版本号降序，取第一个（最新版本）
+        Map<String, TemplatePojo> latestTemplateMap = templates.stream()
                 // 按模板ID分组
-                .collect(Collectors.groupingBy(
-                        Template::getTemplateName,
-                        // 每组内按版本号降序，取第一个（最新版本）
-                        Collectors.collectingAndThen(
-                                Collectors.maxBy(Comparator.comparingInt(Template::getVersion)),
-                                Optional::get
-                        )
-                ));
-        ArrayList<Template> templatesMax = new ArrayList<>(latestTemplateMap.values());
+                .collect(Collectors.toMap(TemplatePojo::getTemplateName, Function.identity(), BinaryOperator.maxBy(Comparator.comparingInt(TemplatePojo::getVersion))));
+        ArrayList<TemplatePojo> templatesMax = new ArrayList<>(latestTemplateMap.values());
         Map<String, Long> systemOrderMap = templatesMax.stream()
                 .collect(Collectors.toMap(
-                        Template::getTemplateName,    // key: 子系统编码
-                        Template::getOrderNum,     // value: 排序号
+                        TemplatePojo::getTemplateName,    // key: 子系统编码
+                        TemplatePojo::getOrderNum,     // value: 排序号
                         (oldValue, newValue) -> oldValue
                 ));
         Map<String, List<String>> collect = parameters.stream()
                 .collect(Collectors.groupingBy(
-                        Parameter::getSubsystemName,
+                        ParameterPojo::getSubsystemName,
                         Collectors.mapping(
-                                Parameter::getPartsName,  // 提取 零部件名称字段
+                                ParameterPojo::getPartsName,  // 提取 零部件名称字段
                                 Collectors.toList()
                         )
                 ));
@@ -160,7 +153,8 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
 
             collect.put("整车参数", strings);
         }
-        HashMap<String, List<String>> sortedCollect2 = collect.entrySet().stream()
+        // 保持顺序
+        return collect.entrySet().stream()
                 .sorted(Comparator.comparing(entry ->
                         systemOrderMap.getOrDefault(entry.getKey(), Long.MAX_VALUE)
                 ))
@@ -170,7 +164,6 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
                         (oldValue, newValue) -> oldValue,
                         LinkedHashMap::new  // 保持顺序
                 ));
-        return sortedCollect2;
     }
 
     @Override
@@ -187,7 +180,6 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
     /**
      * Excel导入
      *
-     * @param file
      */
     @Override
     public void excelImport(MultipartFile file, String modelId, String userId) {
@@ -224,12 +216,12 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
             String userId
     ) {
         // 定义Sheet名称集合
-//        List<Parameter> parameterByCondition = dataEntryService.getParameterByCondition(new OptionForm());
+//        List<ParameterPojo> parameterByCondition = dataEntryService.getParameterByCondition(new OptionForm());
         List<EngineParamDetailPojo> engineParams = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .eq("engine_model_id", modelId)
                 .eq("filled_by", userId)
                 .doQuery(EngineParamDetailPojo.class);
-//        List<Parameter> parameterByCondition = selectAllByNewVersion();
+//        List<ParameterPojo> parameterByCondition = selectAllByNewVersion();
         if (ObjectUtils.isEmpty(engineParams)) {
             log.error("模板参数为空");
             throw new ExcelImportException(
@@ -253,7 +245,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
                 .map(EngineParamDetailPojo::getSubsystemName)
                 .distinct().collect(Collectors.toList());
 
-//        List<Parameter> parameters = selectAllByNewVersion();
+//        List<ParameterPojo> parameters = selectAllByNewVersion();
         try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build()) {
             setupResponse(response, "参数值导入模板" + (formatter.format(LocalDateTime.now())));
             // 循环创建Sheet
@@ -383,7 +375,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
                     .filter(x -> engineParamDetailRequest.getMajorVersion()
                             .equals(x.getMajorVersion())).collect(Collectors.toList());
         } else {
-            EngineParamDetailPojo engineParamDetailPojo = detailPojos.stream().max(Comparator.comparingInt(x -> x.getMajorVersion())).get();
+            EngineParamDetailPojo engineParamDetailPojo = detailPojos.stream().max(Comparator.comparingInt(EngineParamDetailPojo::getMajorVersion)).get();
             detailPojos = detailPojos.stream()
                     .filter(x -> engineParamDetailPojo.getMajorVersion()
                             .equals(x.getMajorVersion())).collect(Collectors.toList());
@@ -403,9 +395,9 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
             BeanUtils.copyProperties(detailPojo, engineParamDetailDTO);
             String unit = "";
             if (ObjectUtils.isNotEmpty(detailPojo.getParameterId())) {
-                List<Parameter> parameters = sw.buildFromDatasource("xdap_app_223770822127386625")
+                List<ParameterPojo> parameters = sw.buildFromDatasource("xdap_app_223770822127386625")
                         .eq("id", detailPojo.getParameterId())
-                        .doQuery(Parameter.class);
+                        .doQuery(ParameterPojo.class);
                 unit = parameters.get(0).getUnit();
             }
             engineParamDetailDTO.setId(detailPojo.getId());
@@ -453,34 +445,34 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
         for (EngineParamDetailPojo engineParamDetailPojo : engineParamDetailPojos) {
             EngineParamDetailPojo engineParamDetailPojo1 = selectById(engineParamDetailPojo.getId());
             //查找参数是否已经在审批中
-            if (ObjectUtils.isNotEmpty(engineParamDetailPojo1) && ParamValueVersionEnum.UNDER.getCode() == (engineParamDetailPojo1.getVersionStatus())) {
+            if (ObjectUtils.isNotEmpty(engineParamDetailPojo1) && Objects.equals(ParamValueVersionEnum.UNDER.getCode(), engineParamDetailPojo1.getVersionStatus())) {
                 throw new RuntimeException("您修改参数中有正在审批中的,请查看审批流审批后再修改,零部件+参数名称:" + engineParamDetailPojo.getPartsName() + "-" + engineParamDetailPojo.getParameterName());
             }
 
             //通过操作状态对应不同操作新增和更新都新增数据为小版本且为草稿状态
-            if (engineParamDetailPojo.getOperation().equals(String.valueOf(ParamOperation.UPDATE))) {
+            if (engineParamDetailPojo.getOperation().equals(String.valueOf(ParamOperationEnum.UPDATE))) {
                 String id = engineParamDetailPojo.getId();
                 EngineParamDetailPojo engineParamDetailPojoById = selectById(id);
                 sw.buildFromDatasource("xdap_app_223770822127386625")
                         .update("minor_version", engineParamDetailPojo.getParameterValue())
                         .update("version_status", ParamValueVersionEnum.DRAFT.getCode())
-                        .update("operation", String.valueOf(ParamOperation.UPDATE))
+                        .update("operation", String.valueOf(ParamOperationEnum.UPDATE))
                         .update("last_updated_by", currentUserId)
                         .update("last_update_date", new Date())
                         .rowid("id", engineParamDetailPojoById.getId())
                         .doUpdate(EngineParamDetailPojo.class);
-            } else if (engineParamDetailPojo.getOperation().equals(String.valueOf(ParamOperation.DELETE))) {
+            } else if (engineParamDetailPojo.getOperation().equals(String.valueOf(ParamOperationEnum.DELETE))) {
                 String id = engineParamDetailPojo.getId();
                 sw.buildFromDatasource("xdap_app_223770822127386625")
                         .update("is_delete", "1")
                         .update("version_status", ParamValueVersionEnum.DRAFT.getCode())
-                        .update("operation", String.valueOf(ParamOperation.DELETE))
+                        .update("operation", String.valueOf(ParamOperationEnum.DELETE))
                         .update("last_updated_by", currentUserId)
                         .update("last_update_date", new Date())
                         .rowid("id", id)
                         .doUpdate(EngineParamDetailPojo.class);
 
-            } else if (engineParamDetailPojo.getOperation().equals(String.valueOf(ParamOperation.INSERT))) {
+            } else if (engineParamDetailPojo.getOperation().equals(String.valueOf(ParamOperationEnum.INSERT))) {
 
             }
         }
@@ -529,7 +521,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
 //
 //                BeanUtils.copyProperties(engineParamDetailPojo, ei,"id","majorVersion");
 //                ei.setMinorVersion(engineParamDetailPojo.getParameterValue());
-//                ei.setOperation(String.valueOf(ParamOperation.INSERT));
+//                ei.setOperation(String.valueOf(ParamOperationEnum.INSERT));
 //                ei.setApprovalId(stringUuid);
 //                ei.setCreatedDate(createdDate);
 //
@@ -630,7 +622,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
             todoTask.setDataType(CurrentNodeEnum.REPAIR.getDesc());
             todoTask.setVersionNumber(modelPojo.getVersionNumber());
             todoTask.setOwnerId(filledBy);
-            todoTask.setCurrentProcessor(JSON.toJSONString(Arrays.asList(filledBy)));
+            todoTask.setCurrentProcessor(JSON.toJSONString(Collections.singletonList(filledBy)));
             todoTask.setIsDelete(0);
             todoTask.setCreatedBy(ObjectUtils.isNotEmpty(XdapUsers) ? XdapUsers.getUsername() : "");
             todoTaskPojos.add(todoTask);
@@ -698,38 +690,38 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
     }
 
     @Override
-    public List<Parameter> selectAllByNewVersion() {
+    public List<ParameterPojo> selectAllByNewVersion() {
         //读取已通过审核的版本 DRAFT(草稿)、APPROVING（审批中）、COMPLETE(已完成)、RETURNED(已撤回)、REJECTED(已拒绝)
-        List<Template> templates =
+        List<TemplatePojo> templates =
                 sw.buildFromDatasource("xdap_app_223770822127386625")
                         .eq("status", "COMPLETE")
-                        .doQuery(Template.class);
+                        .doQuery(TemplatePojo.class);
         if (ObjectUtils.isEmpty(templates)) {
             throw new RuntimeException("未找到未找到已发布的参数模板");
         }
         //查找每个模板最新版本
-        Map<String, Template> latestTemplateMap = templates.stream()
+        Map<String, TemplatePojo> latestTemplateMap = templates.stream()
                 // 按模板ID分组
                 .collect(Collectors.groupingBy(
-                        Template::getTemplateName,
+                        TemplatePojo::getTemplateName,
                         // 每组内按版本号降序，取第一个（最新版本）
                         Collectors.collectingAndThen(
-                                Collectors.maxBy(Comparator.comparingInt(Template::getVersion)),
+                                Collectors.maxBy(Comparator.comparingInt(TemplatePojo::getVersion)),
                                 Optional::get
                         )
                 ));
-        ArrayList<Template> templatesMax = new ArrayList<>(latestTemplateMap.values());
-        List<String> strings = templatesMax.stream().map(x -> x.getId()).collect(Collectors.toList());
+        ArrayList<TemplatePojo> templatesMax = new ArrayList<>(latestTemplateMap.values());
+        List<String> strings = templatesMax.stream().map(TemplatePojo::getId).collect(Collectors.toList());
         //查找最新模板关联的参数
-        List<TemplateAndParameter> templateAndParameters =
+        List<TemplateAndParameterPojo> templateAndParameters =
                 sw.buildFromDatasource("xdap_app_223770822127386625")
                         .in("template_id", strings)
-                        .doQuery(TemplateAndParameter.class);
-        List<String> pIds = templateAndParameters.stream().map(x -> x.getParameterId()).collect(Collectors.toList());
+                        .doQuery(TemplateAndParameterPojo.class);
+        List<String> pIds = templateAndParameters.stream().map(TemplateAndParameterPojo::getParameterId).collect(Collectors.toList());
 
-        List<Parameter> parameterList = sw.buildFromDatasource("xdap_app_223770822127386625")
+        List<ParameterPojo> parameterList = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .in("id", pIds)
-                .doQuery(Parameter.class);
+                .doQuery(ParameterPojo.class);
         //不需要TC数据来源的参数
         parameterList = parameterList.stream().filter(x -> {
             if (ObjectUtils.isEmpty(x.getParameterSource())) {
@@ -746,39 +738,32 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
 
 
     @Override
-    public List<Parameter> selectAllAndTcByNewVersion() {
+    public List<ParameterPojo> selectAllAndTcByNewVersion() {
         //读取已通过审核的版本 DRAFT(草稿)、APPROVING（审批中）、COMPLETE(已完成)、RETURNED(已撤回)、REJECTED(已拒绝)
-        List<Template> templates =
+        List<TemplatePojo> templates =
                 sw.buildFromDatasource("xdap_app_223770822127386625")
                         .eq("status", "COMPLETE")
-                        .doQuery(Template.class);
+                        .doQuery(TemplatePojo.class);
         if (ObjectUtils.isEmpty(templates)) {
             throw new RuntimeException("未找到未找到已发布的参数模板");
         }
         //查找每个模板最新版本
-        Map<String, Template> latestTemplateMap = templates.stream()
+        // 每组内按版本号降序，取第一个（最新版本）
+        Map<String, TemplatePojo> latestTemplateMap = templates.stream()
                 // 按模板ID分组
-                .collect(Collectors.groupingBy(
-                        Template::getTemplateName,
-                        // 每组内按版本号降序，取第一个（最新版本）
-                        Collectors.collectingAndThen(
-                                Collectors.maxBy(Comparator.comparingInt(Template::getVersion)),
-                                Optional::get
-                        )
-                ));
-        ArrayList<Template> templatesMax = new ArrayList<>(latestTemplateMap.values());
-        List<String> strings = templatesMax.stream().map(x -> x.getId()).collect(Collectors.toList());
+                .collect(Collectors.toMap(TemplatePojo::getTemplateName, Function.identity(), BinaryOperator.maxBy(Comparator.comparingInt(TemplatePojo::getVersion))));
+        ArrayList<TemplatePojo> templatesMax = new ArrayList<>(latestTemplateMap.values());
+        List<String> strings = templatesMax.stream().map(TemplatePojo::getId).collect(Collectors.toList());
         //查找最新模板关联的参数
-        List<TemplateAndParameter> templateAndParameters =
+        List<TemplateAndParameterPojo> templateAndParameters =
                 sw.buildFromDatasource("xdap_app_223770822127386625")
                         .in("template_id", strings)
-                        .doQuery(TemplateAndParameter.class);
-        List<String> pIds = templateAndParameters.stream().map(x -> x.getParameterId()).collect(Collectors.toList());
+                        .doQuery(TemplateAndParameterPojo.class);
+        List<String> pIds = templateAndParameters.stream().map(TemplateAndParameterPojo::getParameterId).collect(Collectors.toList());
 
-        List<Parameter> parameterList = sw.buildFromDatasource("xdap_app_223770822127386625")
+        return sw.buildFromDatasource("xdap_app_223770822127386625")
                 .in("id", pIds)
-                .doQuery(Parameter.class);
-        return parameterList;
+                .doQuery(ParameterPojo.class);
     }
 
     @Override
@@ -798,10 +783,9 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
             throw new RuntimeException("机型不存在");
         }
 
-        List<EngineParamDetailPojo> paramDetailPojos = engineParamDetailPojos.stream().filter(
+        return engineParamDetailPojos.stream().filter(
                 x -> x.getMajorVersion() == dataEntryEngineModelPojo.getVersionNumber()
         ).collect(Collectors.toList());
-        return paramDetailPojos;
     }
 
     @Override
@@ -820,10 +804,9 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
                 .sorted(Comparator.comparing(EngineParamDetailPojo::getMajorVersion)
                         .reversed()).collect(Collectors.toList()).get(0);
 
-        List<EngineParamDetailPojo> paramDetailPojos = engineParamDetailPojos.stream().filter(
-                x -> x.getMajorVersion() == engineParamDetailPojoMaxVersion.getMajorVersion()
+        return engineParamDetailPojos.stream().filter(
+                x -> Objects.equals(x.getMajorVersion(), engineParamDetailPojoMaxVersion.getMajorVersion())
         ).collect(Collectors.toList());
-        return paramDetailPojos;
     }
 
     @Override
@@ -839,10 +822,9 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
                 .sorted(Comparator.comparing(EngineParamDetailPojo::getMajorVersion)
                         .reversed()).collect(Collectors.toList()).get(0);
 
-        List<EngineParamDetailPojo> paramDetailPojos = engineParamDetailPojos.stream().filter(
-                x -> x.getMajorVersion() == engineParamDetailPojoMaxVersion.getMajorVersion()
+        return engineParamDetailPojos.stream().filter(
+                x -> Objects.equals(x.getMajorVersion(), engineParamDetailPojoMaxVersion.getMajorVersion())
         ).collect(Collectors.toList());
-        return paramDetailPojos;
     }
 
     @Override
@@ -882,13 +864,13 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
     @Override
     public List<XdapUsers> selectPersonoByType(String subSystem, String dept, Integer type) {
         List<XdapUsers> xdapUsersPojos = new ArrayList<>();
-        List<ResponsiblePerson> personPojos = responsiblePerService.selectBysubSystemDept(subSystem, dept);
+        List<ResponsiblePersonPojo> personPojos = responsiblePerService.selectBysubSystemDept(subSystem, dept);
         if (ObjectUtils.isEmpty(personPojos)) {
             throw new RuntimeException("该子系统和部门没有查找到相关人子系统:" + subSystem + ",部门:" + dept);
         }
         try {
-            List<ResponsiblePerson> collected = personPojos.stream().filter(x -> x.getPersonLevel() == type).collect(Collectors.toList());
-            List<String> userIds = collected.stream().map(x -> x.getUserId()).collect(Collectors.toList());
+            List<ResponsiblePersonPojo> collected = personPojos.stream().filter(x -> Objects.equals(x.getPersonLevel(), type)).collect(Collectors.toList());
+            List<String> userIds = collected.stream().map(ResponsiblePersonPojo::getUserId).collect(Collectors.toList());
             for (String id : new ArrayList<>(userIds)) {
                 xdapUsersPojos.add(xdapDeptUsersService.selectUserByID(id));
             }
diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java
index 495ebc8..67277e8 100644
--- a/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/EngineReviewListServiceImpl.java
@@ -4,12 +4,11 @@ import com.definesys.mpaas.query.MpaasQueryFactory;
 import com.definesys.mpaas.query.db.PageQueryResult;
 import com.xdap.api.moudle.user.pojo.XdapUsers;
 import com.xdap.self_development.controller.request.EngineReviewListRequest;
-import com.xdap.self_development.enums.ParamValueVersionEnum;
-import com.xdap.self_development.pojo.ApprovalConfigPojo;
-import com.xdap.self_development.pojo.EngineReviewListPojo;
-import com.xdap.self_development.pojo.ParamApprovalRecordPojo;
-import com.xdap.self_development.pojo.TodoTaskPojo;
-import com.xdap.self_development.pojo.dto.PageResultDTO;
+import com.xdap.self_development.domain.enums.ParamValueVersionEnum;
+import com.xdap.self_development.domain.pojo.EngineReviewListPojo;
+import com.xdap.self_development.domain.pojo.ParamApprovalRecordPojo;
+import com.xdap.self_development.domain.pojo.TodoTaskPojo;
+import com.xdap.self_development.domain.dto.PageResultDTO;
 import com.xdap.self_development.service.EngineReviewListService;
 import com.xdap.self_development.service.XdapDeptUsersService;
 import lombok.extern.slf4j.Slf4j;
@@ -102,7 +101,6 @@ public class EngineReviewListServiceImpl implements EngineReviewListService {
         if (ObjectUtils.isEmpty(engineReviewListPojos)) {
             throw new RuntimeException("审批流未找到");
         }
-        String nodeName = engineReviewListPojos.get(0).getNodeName();
         // 获取环节
         List<ParamApprovalRecordPojo> paramApprovalRecordPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .eq("approval_id", approvalId)
diff --git a/src/main/java/com/xdap/self_development/service/impl/ModelMenuPermissionServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ModelMenuPermissionServiceImpl.java
index e26ed1c..ed8ecf9 100644
--- a/src/main/java/com/xdap/self_development/service/impl/ModelMenuPermissionServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/ModelMenuPermissionServiceImpl.java
@@ -2,8 +2,8 @@ package com.xdap.self_development.service.impl;
 
 
 import com.xdap.self_development.common.BusinessDatabase;
-import com.xdap.self_development.pojo.ModelMenuDictionaryPojo;
-import com.xdap.self_development.pojo.view.MenuListView;
+import com.xdap.self_development.domain.pojo.ModelMenuDictionaryPojo;
+import com.xdap.self_development.domain.view.MenuListView;
 import com.xdap.self_development.service.ModelMenuPermissionService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
diff --git a/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java
index 07d6ed3..1e171de 100644
--- a/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java
@@ -7,11 +7,10 @@ import com.xdap.self_development.common.BusinessDatabase;
 import com.xdap.self_development.controller.request.ModelRolesRequest;
 import com.xdap.self_development.controller.request.RolePerJoinRequest;
 import com.xdap.self_development.controller.request.UserRoleBindingRequest;
-import com.xdap.self_development.enums.ParamPermissionEnum;
-import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.*;
-import com.xdap.self_development.pojo.dto.PageResultDTO;
-import com.xdap.self_development.pojo.view.MenuParamView;
+import com.xdap.self_development.domain.enums.ParamPermissionEnum;
+import com.xdap.self_development.domain.pojo.*;
+import com.xdap.self_development.domain.dto.PageResultDTO;
+import com.xdap.self_development.domain.view.MenuParamView;
 import com.xdap.self_development.service.ModelMenuPermissionService;
 import com.xdap.self_development.service.ModelRoleService;
 import com.xdap.self_development.service.XdapDeptUsersService;
@@ -103,9 +102,9 @@ public class ModelRoleServiceImpl implements ModelRoleService {
             String id = String.valueOf(UUID.randomUUID());
             if (ObjectUtils.isEmpty(modelMenuParameterPojos)) {
                 //查找参数 组装权限
-//                Parameter parameter = businessDatabase.getBusinessDatabase()
+//                ParameterPojo parameter = businessDatabase.getBusinessDatabase()
 //                        .eq("id", parameterId)
-//                        .doQuery(Parameter.class).get(0);
+//                        .doQuery(ParameterPojo.class).get(0);
                 ModelMenuParameterPojo modelMenuParameterPojo = new ModelMenuParameterPojo();
 //                modelMenuParameterPojo.setMenuId(menuName);
 //                modelMenuParameterPojo.setSubsystem(subsystem);
@@ -200,16 +199,16 @@ public class ModelRoleServiceImpl implements ModelRoleService {
             String parameterId = menuParameter.getParameterId();
 
             //查找参数 组装权限
-            List<Parameter> parameters = businessDatabase.getBusinessDatabase()
+            List<ParameterPojo> parameters = businessDatabase.getBusinessDatabase()
                     .eq("id", parameterId)
-                    .doQuery(Parameter.class);
+                    .doQuery(ParameterPojo.class);
 
             if (ObjectUtils.isEmpty(parameters)) {
                 log.warn("未找到ID为{}的参数", parameterId);
                 continue; // 或者抛出更具体的异常
             }
 
-            Parameter parameter = parameters.get(0);*/
+            ParameterPojo parameter = parameters.get(0);*/
 
                 ParamPermissionEnum byCode = ParamPermissionEnum.getByCode(menuParameter.getParameterPer());
                 if (byCode == null) {
diff --git a/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java
index 51d5801..89ad88f 100644
--- a/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/ParameterServiceImpl.java
@@ -7,14 +7,14 @@ import com.xdap.self_development.controller.form.ParameterForm;
 import com.xdap.self_development.controller.form.ParameterPageForm;
 import com.xdap.self_development.controller.form.UpdateParameterForm;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.Parameter;
-import com.xdap.self_development.pojo.RevisionRecord;
-import com.xdap.self_development.pojo.Template;
-import com.xdap.self_development.pojo.TemplateAndParameter;
-import com.xdap.self_development.pojo.view.TemplateInfoView;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
+import com.xdap.self_development.domain.pojo.RevisionRecordPojo;
+import com.xdap.self_development.domain.pojo.TemplateAndParameterPojo;
+import com.xdap.self_development.domain.pojo.TemplatePojo;
+import com.xdap.self_development.domain.view.TemplateInfoView;
 import com.xdap.self_development.service.ParameterService;
-import com.xdap.self_development.utils.FormulaValidator;
-import com.xdap.self_development.utils.ParameterOperation;
+import com.xdap.self_development.utils.FormulaValidatorUtils;
+import com.xdap.self_development.domain.enums.ParameterOperationEnum;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
@@ -35,10 +35,10 @@ public class ParameterServiceImpl implements ParameterService {
 	private ParameterService myself;
 
 	@Override
-	public MyPageResult<Parameter> getParameterByCondition(ParameterPageForm form) {
-		Template template = bd.getBusinessDatabase()
+	public MyPageResult<ParameterPojo> getParameterByCondition(ParameterPageForm form) {
+		TemplatePojo template = bd.getBusinessDatabase()
 				.rowid("id", form.getTemplateRowId())
-				.doQueryFirst(Template.class);
+				.doQueryFirst(TemplatePojo.class);
 
 		if (template == null) {
 			throw new CommonException("模板未找到");
@@ -51,9 +51,9 @@ public class ParameterServiceImpl implements ParameterService {
 //				.view("selectParametersByTIdAndCreateBy")
 //				.setVar("templateId", template.getId())
 //				.setVar("createdBy", permissionGetter.getCurrentUserId())
-//				.doQuery(Parameter.class).stream().map(Parameter::getId).collect(Collectors.toList()));
+//				.doQuery(ParameterPojo.class).stream().map(ParameterPojo::getId).collect(Collectors.toList()));
 //		List<String> parameterIds = new ArrayList<>(objects);
-		PageQueryResult<Parameter> parameterPageQueryResult = bd.getBusinessDatabase()
+		PageQueryResult<ParameterPojo> parameterPageQueryResult = bd.getBusinessDatabase()
 				.viewQueryMode(true)
 				.view("selectParametersByTId")
 				.setVar("templateId", template.getId())
@@ -61,8 +61,8 @@ public class ParameterServiceImpl implements ParameterService {
 				.like("parameter_name", form.getParameterName())
 				.like("parts_name", form.getPartsName())
 				.like("parameter_type", form.getParameterType())
-				.doPageQuery(form.getPageNumber(), form.getPageSize(), Parameter.class);
-		MyPageResult<Parameter> myPageResult = new MyPageResult<>();
+				.doPageQuery(form.getPageNumber(), form.getPageSize(), ParameterPojo.class);
+		MyPageResult<ParameterPojo> myPageResult = new MyPageResult<>();
 		myPageResult.setCount(parameterPageQueryResult.getCount());
 		myPageResult.setResult(parameterPageQueryResult.getResult());
 		myPageResult.setStatus(template.getStatus());
@@ -75,7 +75,7 @@ public class ParameterServiceImpl implements ParameterService {
 		// 公式格式检查
 		for (ParameterForm parameter : form.getParameterForms()) {
 			if (Objects.equals(parameter.getParameterSource(), "公式计算")) {
-				Map<String, Object> validationResult = FormulaValidator.validateFormulaDetailed(
+				Map<String, Object> validationResult = FormulaValidatorUtils.validateFormulaDetailed(
 						parameter.getNumberOrFormula());
 				if (!(Boolean) validationResult.get("isValid")) {
 					String errorMsg = String.format("参数 '%s' 公式格式错误: %s",
@@ -90,7 +90,7 @@ public class ParameterServiceImpl implements ParameterService {
 		// 校验模板状态
 		myself.validateTemplateStatus(benchmark);
 		// 创建/复用新版本模板
-		Template newVersionTemplate = myself.createOrReuseNewTemplate(benchmark, form.getUserId());
+		TemplatePojo newVersionTemplate = myself.createOrReuseNewTemplate(benchmark, form.getUserId());
 		// 处理参数变更
 		ParameterProcessingResult processingResult = myself.processParameters(
 				form.getParameterForms(),
@@ -127,10 +127,10 @@ public class ParameterServiceImpl implements ParameterService {
 		}
 
 		// 同名模板审核中不可修改
-		List<Template> templates = bd.getBusinessDatabase()
+		List<TemplatePojo> templates = bd.getBusinessDatabase()
 				.eq("template_name", benchmark.getBaseTemplate().getTemplateName())
-				.orderBy("version", "asc").doQuery(Template.class);
-		boolean approving = templates.stream().map(Template::getStatus)
+				.orderBy("version", "asc").doQuery(TemplatePojo.class);
+		boolean approving = templates.stream().map(TemplatePojo::getStatus)
 				.collect(Collectors.toList()).contains("APPROVING");
 		if (approving) {
 			throw new CommonException("同名模板已在审核中,暂时不能修改参数");
@@ -140,13 +140,13 @@ public class ParameterServiceImpl implements ParameterService {
 	/**
 	 * 创建/复用新版本模板
 	 */
-	public Template createOrReuseNewTemplate(TemplateBenchmark benchmark, String userId) {
-		Template baseTemplate = benchmark.getBaseTemplate();
+	public TemplatePojo createOrReuseNewTemplate(TemplateBenchmark benchmark, String userId) {
+		TemplatePojo baseTemplate = benchmark.getBaseTemplate();
 		// 草稿状态复用原模板，已发布创建新版本
 		if ("DRAFT".equals(baseTemplate.getStatus())) {
 			return baseTemplate;
 		} else {
-			Template newTemplate = new Template(
+			TemplatePojo newTemplate = new TemplatePojo(
 					benchmark.getLastTemplate().getTemplateName(),
 					calculateNextVersion(benchmark.getLastTemplate().getVersion()),
 					"DRAFT",
@@ -163,30 +163,30 @@ public class ParameterServiceImpl implements ParameterService {
 
 	public TemplateBenchmark getTemplateBenchmark(String templateRowId) {
 		// 基准模板（用户选择的要比较的版本）
-		Template baseTemplate = bd.getBusinessDatabase()
+		TemplatePojo baseTemplate = bd.getBusinessDatabase()
 				.rowid("id", templateRowId)
-				.doQueryFirst(Template.class);
+				.doQueryFirst(TemplatePojo.class);
 
 		if (baseTemplate == null) {
 			throw new IllegalArgumentException("未找到对应的模板，ID: " + templateRowId);
 		}
 
 		// 最新版本模板
-		Template lastTemplate = bd.getBusinessDatabase()
+		TemplatePojo lastTemplate = bd.getBusinessDatabase()
 				.eq("template_name", baseTemplate.getTemplateName())
 				.orderBy("version", "desc")
-				.doQueryFirst(Template.class);
+				.doQueryFirst(TemplatePojo.class);
 
 		if (lastTemplate == null) {
 			throw new IllegalStateException("未找到模板的最新版本: " + baseTemplate.getTemplateName());
 		}
 
 		// 基准模板的参数
-		List<Parameter> parameters = bd.getBusinessDatabase()
+		List<ParameterPojo> parameters = bd.getBusinessDatabase()
 				.viewQueryMode(true)
 				.view("selectParametersByTId")
 				.setVar("templateId", baseTemplate.getId())
-				.doQuery(Parameter.class);
+				.doQuery(ParameterPojo.class);
 
 		return new TemplateBenchmark(baseTemplate, lastTemplate, parameters);
 	}
@@ -197,9 +197,9 @@ public class ParameterServiceImpl implements ParameterService {
 	@Data
 	@AllArgsConstructor
 	public static class TemplateBenchmark {
-		private final Template baseTemplate;
-		private final Template lastTemplate;
-		private final List<Parameter> parameters;
+		private final TemplatePojo baseTemplate;
+		private final TemplatePojo lastTemplate;
+		private final List<ParameterPojo> parameters;
 	}
 
 	/**
@@ -208,8 +208,8 @@ public class ParameterServiceImpl implements ParameterService {
 	@Data
 	@AllArgsConstructor
 	public static class ParameterProcessingResult {
-		private final List<Parameter> newParameters;
-		private final List<RevisionRecord> revisionRecords;
+		private final List<ParameterPojo> newParameters;
+		private final List<RevisionRecordPojo> revisionRecords;
 	}
 
 	private Integer calculateNextVersion(Integer currentVersion) {
@@ -222,26 +222,26 @@ public class ParameterServiceImpl implements ParameterService {
 
 	public ParameterProcessingResult processParameters(
             List<ParameterForm> parameterForms,
-            List<Parameter> existingParameters,
-            Template baseTemplate,
-            Template newTemplate,
+            List<ParameterPojo> existingParameters,
+            TemplatePojo baseTemplate,
+            TemplatePojo newTemplate,
 			String userId,
 			boolean isLastComplete
 	) {
-		Map<String, Parameter> parameterMap = existingParameters.stream()
-				.collect(Collectors.toMap(Parameter::getId, param -> param, (k1, k2) -> {
+		Map<String, ParameterPojo> parameterMap = existingParameters.stream()
+				.collect(Collectors.toMap(ParameterPojo::getId, param -> param, (k1, k2) -> {
 					throw new IllegalStateException("发现重复的参数ID: " + k1);
 				}));
 
-		List<Parameter> newParameters = new ArrayList<>();
-		List<RevisionRecord> revisionRecords = new ArrayList<>();
+		List<ParameterPojo> newParameters = new ArrayList<>();
+		List<RevisionRecordPojo> revisionRecords = new ArrayList<>();
 
 		// 处理模板部分参数
 		for (ParameterForm parameterForm : parameterForms) {
 			if (parameterForm.getOperation() == null) {
 				parameterForm.setOperation("");
 			}
-			ParameterOperation operation = ParameterOperation.fromCode(parameterForm.getOperation());
+			ParameterOperationEnum operation = ParameterOperationEnum.fromCode(parameterForm.getOperation());
 			switch (operation) {
 				case INSERT:
 					handleInsertOperation(parameterForm, newTemplate, newParameters, revisionRecords, baseTemplate, userId);
@@ -259,7 +259,7 @@ public class ParameterServiceImpl implements ParameterService {
 		}
 
 		// 处理模板剩余的参数
-		List<Parameter> unmatchedParameters = findUnmatchedParameters(parameterMap, parameterForms);
+		List<ParameterPojo> unmatchedParameters = findUnmatchedParameters(parameterMap, parameterForms);
 		// 未修改的参数也需要新增然后添加进新的参数列表中
 		if (!isLastComplete && !unmatchedParameters.isEmpty()) {
 			unmatchedParameters.forEach(parameter -> parameter.setId(null));
@@ -273,24 +273,24 @@ public class ParameterServiceImpl implements ParameterService {
 	 * 处理新增参数
 	 */
     private void handleInsertOperation(
-            ParameterForm form, Template newTemplate,
-            List<Parameter> newParameters, List<RevisionRecord> revisionRecords,
-            Template baseTemplate, String userId
+			ParameterForm form, TemplatePojo newTemplate,
+			List<ParameterPojo> newParameters, List<RevisionRecordPojo> revisionRecords,
+			TemplatePojo baseTemplate, String userId
     ) {
-		Parameter newParameter = new Parameter();
+		ParameterPojo newParameter = new ParameterPojo();
 		BeanUtils.copyProperties(form, newParameter);
 		newParameter.setCreatedBy(userId);
 		newParameter.setId(null);
 
-		Parameter parameter = bd.getBusinessDatabase()
+		ParameterPojo parameter = bd.getBusinessDatabase()
 				.viewQueryMode(true)
 				.view("selectMaxNumber")
 				.setVar("templateId", baseTemplate.getId())
-				.doQueryFirst(Parameter.class);
+				.doQueryFirst(ParameterPojo.class);
 
 		int maxNum = newParameters.stream()
 				.filter(Objects::nonNull)
-				.map(Parameter::getParameterNumber)
+				.map(ParameterPojo::getParameterNumber)
 				.filter(Objects::nonNull)
 				.mapToInt(Integer::intValue)
 				.max()
@@ -305,7 +305,7 @@ public class ParameterServiceImpl implements ParameterService {
 		newParameter.setId(null);
 		bd.getBusinessDatabase().doInsert(newParameter);
 		newParameters.add(newParameter);
-		revisionRecords.add(new RevisionRecord(
+		revisionRecords.add(new RevisionRecordPojo(
 				newTemplate.getTemplateName(),
 				newTemplate.getVersion(),
 				newParameter.getParameterNumber(),
@@ -322,18 +322,18 @@ public class ParameterServiceImpl implements ParameterService {
 	 * 处理更新参数
 	 */
     private void handleUpdateOperation(
-            ParameterForm form, Map<String, Parameter> parameterMap,
-            Template newTemplate, List<Parameter> newParameters,
-            List<RevisionRecord> revisionRecords, Template baseTemplate,
+			ParameterForm form, Map<String, ParameterPojo> parameterMap,
+			TemplatePojo newTemplate, List<ParameterPojo> newParameters,
+			List<RevisionRecordPojo> revisionRecords, TemplatePojo baseTemplate,
 			String userId
     ) {
-		Parameter originalParameter = parameterMap.get(form.getParameterId());
+		ParameterPojo originalParameter = parameterMap.get(form.getParameterId());
 
 		if (originalParameter == null) {
 			throw new IllegalArgumentException("未找到要更新的参数，编号: " + form.getParameterNumber());
 		}
 
-		Parameter updatedParameter = new Parameter();
+		ParameterPojo updatedParameter = new ParameterPojo();
 		BeanUtils.copyProperties(form, updatedParameter);
 		String detail = getParameterChange(originalParameter, updatedParameter);
 		updatedParameter.setCreatedBy(userId);
@@ -350,7 +350,7 @@ public class ParameterServiceImpl implements ParameterService {
 					.doInsert(updatedParameter);
 		}
 		newParameters.add(updatedParameter);
-		revisionRecords.add(new RevisionRecord(
+		revisionRecords.add(new RevisionRecordPojo(
 				newTemplate.getTemplateName(),
 				newTemplate.getVersion(),
 				form.getParameterNumber(),
@@ -363,7 +363,7 @@ public class ParameterServiceImpl implements ParameterService {
 		));
 	}
 
-	private String getParameterChange(Parameter originalParameter, Parameter updatedParameter) {
+	private String getParameterChange(ParameterPojo originalParameter, ParameterPojo updatedParameter) {
         return handleParameterChange("参数名", originalParameter.getParameterName(), updatedParameter.getParameterName()) +
                 handleParameterChange("参数类型", originalParameter.getParameterType(), updatedParameter.getParameterType()) +
                 handleParameterChange("子系统", originalParameter.getSubsystemName(), updatedParameter.getSubsystemName()) +
@@ -401,14 +401,14 @@ public class ParameterServiceImpl implements ParameterService {
 	 * 处理删除参数
 	 */
 	private void handleDeleteOperation(
-			ParameterForm form, Map<String, Parameter> parameterMap,
-			Template newTemplate, List<RevisionRecord> revisionRecords,
-			Template baseTemplate
+			ParameterForm form, Map<String, ParameterPojo> parameterMap,
+			TemplatePojo newTemplate, List<RevisionRecordPojo> revisionRecords,
+			TemplatePojo baseTemplate
 	) {
-		Parameter deletedParameter = parameterMap.get(form.getParameterId());
+		ParameterPojo deletedParameter = parameterMap.get(form.getParameterId());
 
 		if (deletedParameter != null) {
-			revisionRecords.add(new RevisionRecord(
+			revisionRecords.add(new RevisionRecordPojo(
 					newTemplate.getTemplateName(),
 					newTemplate.getVersion(),
 					form.getParameterNumber(),
@@ -426,10 +426,10 @@ public class ParameterServiceImpl implements ParameterService {
 	 * 处理未修改参数
 	 */
 	private void handleUnchangedOperation(
-			ParameterForm form, Map<String, Parameter> parameterMap,
-			List<Parameter> newParameters, boolean isLastComplete
+			ParameterForm form, Map<String, ParameterPojo> parameterMap,
+			List<ParameterPojo> newParameters, boolean isLastComplete
 	) {
-		Parameter unchangedParameter = parameterMap.get(form.getParameterId());
+		ParameterPojo unchangedParameter = parameterMap.get(form.getParameterId());
 		if (unchangedParameter == null) {
 			return;
 		}
@@ -441,8 +441,8 @@ public class ParameterServiceImpl implements ParameterService {
 		newParameters.add(unchangedParameter);
 	}
 
-	public List<Parameter> findUnmatchedParameters(
-			Map<String, Parameter> parameterMap,
+	public List<ParameterPojo> findUnmatchedParameters(
+			Map<String, ParameterPojo> parameterMap,
 			List<ParameterForm> parameterForms) {
 		Set<String> formIds = parameterForms.stream()
 				.map(ParameterForm::getParameterId)
@@ -457,19 +457,19 @@ public class ParameterServiceImpl implements ParameterService {
 	/**
 	 * 保存所有数据
 	 */
-	public void saveAllData(Template originalTemplate, Template newTemplate, ParameterProcessingResult result) {
+	public void saveAllData(TemplatePojo originalTemplate, TemplatePojo newTemplate, ParameterProcessingResult result) {
 		List<String> parameterIds = bd.getBusinessDatabase()
 				.eq("template_id", newTemplate.getId())
-				.doQuery(TemplateAndParameter.class).stream()
-				.map(TemplateAndParameter::getParameterId)
+				.doQuery(TemplateAndParameterPojo.class).stream()
+				.map(TemplateAndParameterPojo::getParameterId)
 				.collect(Collectors.toList());
 
 		// 如果是原模板
 		if (Objects.equals(originalTemplate.getId(), newTemplate.getId())) {
 			bd.getBusinessDatabase()
 					.eq("template_id", originalTemplate.getId())
-					.doDelete(TemplateAndParameter.class);
-			List<TemplateAndParameter> templateAndParameters =
+					.doDelete(TemplateAndParameterPojo.class);
+			List<TemplateAndParameterPojo> templateAndParameters =
 					result.getNewParameters().stream()
 							.map(parameter -> createTemplateAndParameter(newTemplate.getId(), parameter.getId()))
 							.collect(Collectors.toList());
@@ -477,7 +477,7 @@ public class ParameterServiceImpl implements ParameterService {
 		}
 		// 如果不是原模板
 		else {
-			List<TemplateAndParameter> templateAndParameters =
+			List<TemplateAndParameterPojo> templateAndParameters =
 					result.getNewParameters().stream()
 							.filter(parameter -> !parameterIds.contains(parameter.getId()))
 							.map(parameter -> createTemplateAndParameter(newTemplate.getId(), parameter.getId()))
@@ -493,8 +493,8 @@ public class ParameterServiceImpl implements ParameterService {
 	/**
 	 * 创建模板参数关联
 	 */
-	private TemplateAndParameter createTemplateAndParameter(String templateId, String parameterId) {
-		TemplateAndParameter tap = new TemplateAndParameter();
+	private TemplateAndParameterPojo createTemplateAndParameter(String templateId, String parameterId) {
+		TemplateAndParameterPojo tap = new TemplateAndParameterPojo();
 		tap.setTemplateId(templateId);
 		tap.setParameterId(parameterId);
 		return tap;
diff --git a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePerServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePerServiceImpl.java
index 7d4bffc..d1d84d2 100644
--- a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePerServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePerServiceImpl.java
@@ -5,7 +5,7 @@ import com.definesys.mpaas.common.exception.MpaasRuntimeException;
 import com.definesys.mpaas.query.MpaasQueryFactory;
 import com.xdap.api.moudle.department.pojo.entity.XdapDepartments;
 import com.xdap.api.moudle.user.pojo.XdapUsers;
-import com.xdap.self_development.pojo.ResponsiblePerson;
+import com.xdap.self_development.domain.pojo.ResponsiblePersonPojo;
 import com.xdap.self_development.service.ResponsiblePerService;
 import com.xdap.self_development.service.XdapDeptUsersService;
 import lombok.extern.slf4j.Slf4j;
@@ -33,18 +33,18 @@ public class ResponsiblePerServiceImpl implements ResponsiblePerService {
     @Autowired
     private XdapDeptUsersService  xdapDeptUsersService;
     @Override
-    public ResponsiblePerson selectByDepAndPer(String department, String resPerson) {
+    public ResponsiblePersonPojo selectByDepAndPer(String department, String resPerson) {
         if (ObjectUtils.isEmpty(department) || ObjectUtils.isEmpty(resPerson)) {
             return null;
         }
         XdapDepartments deptByName = xdapDeptUsersService.selectDeptByName(department);
         List<XdapUsers> userByName = xdapDeptUsersService.selectUserByPersonName(resPerson);
         XdapUsers XdapUsers = xdapDeptUsersService.selectUserByUserListAndDeptName(userByName, deptByName);
-        ResponsiblePerson ResponsiblePerson = null;
-        List<ResponsiblePerson> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
+        ResponsiblePersonPojo ResponsiblePerson = null;
+        List<ResponsiblePersonPojo> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .eq("department_id", deptByName.getId())
                 .eq("user_id", XdapUsers.getId())
-                .doQuery(ResponsiblePerson.class);
+                .doQuery(ResponsiblePersonPojo.class);
 
         if (personPojos != null && !personPojos.isEmpty()) {
             ResponsiblePerson = personPojos.get(0);
@@ -53,14 +53,14 @@ public class ResponsiblePerServiceImpl implements ResponsiblePerService {
     }
 
     @Override
-    public ResponsiblePerson selectByDep(String departmentId) {
+    public ResponsiblePersonPojo selectByDep(String departmentId) {
         if (ObjectUtils.isEmpty(departmentId) && ObjectUtils.isEmpty(departmentId)) {
             return null;
         }
-        ResponsiblePerson ResponsiblePerson = null;
-        List<ResponsiblePerson> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
+        ResponsiblePersonPojo ResponsiblePerson = null;
+        List<ResponsiblePersonPojo> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .eq("department_id", departmentId)
-                .doQuery(ResponsiblePerson.class);
+                .doQuery(ResponsiblePersonPojo.class);
 
         if (personPojos != null && !personPojos.isEmpty()) {
             ResponsiblePerson = personPojos.get(0);
@@ -69,7 +69,7 @@ public class ResponsiblePerServiceImpl implements ResponsiblePerService {
     }
 
     @Override
-    public List<ResponsiblePerson> selectByUserId(List<XdapUsers> userIds) {
+    public List<ResponsiblePersonPojo> selectByUserId(List<XdapUsers> userIds) {
         if (ObjectUtils.isEmpty(userIds)) {
             return null;
         }
@@ -77,26 +77,26 @@ public class ResponsiblePerServiceImpl implements ResponsiblePerService {
         for (XdapUsers userId : userIds) {
             idlist.add(userId.getId());
         }
-        List<ResponsiblePerson> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
+        List<ResponsiblePersonPojo> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .in("user_id", idlist)
-                .doQuery(ResponsiblePerson.class);
+                .doQuery(ResponsiblePersonPojo.class);
         return personPojos;
     }
 
     @Override
-    public List<ResponsiblePerson> selectByDepName(String departmentName) {
+    public List<ResponsiblePersonPojo> selectByDepName(String departmentName) {
         XdapDepartments XdapDepartments = xdapDeptUsersService.selectDeptByName(departmentName);
         if (ObjectUtils.isEmpty(XdapDepartments)) {
             return null;
         }
-        List<ResponsiblePerson> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
+        List<ResponsiblePersonPojo> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .eq("department_id", XdapDepartments.getId())
-                .doQuery(ResponsiblePerson.class);
+                .doQuery(ResponsiblePersonPojo.class);
         return personPojos;
     }
 
     @Override
-    public Object insert(ResponsiblePerson ResponsiblePerson) {
+    public Object insert(ResponsiblePersonPojo ResponsiblePerson) {
         Object testDemo = null;
         try {
             testDemo = sw.buildFromDatasource("xdap_app_223770822127386625")
@@ -109,20 +109,20 @@ public class ResponsiblePerServiceImpl implements ResponsiblePerService {
     }
 
     @Override
-    public List<ResponsiblePerson> seelctAll() {
-        List<ResponsiblePerson> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
-                .doQuery(ResponsiblePerson.class);
+    public List<ResponsiblePersonPojo> seelctAll() {
+        List<ResponsiblePersonPojo> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
+                .doQuery(ResponsiblePersonPojo.class);
         return personPojos;
     }
 
     @Override
-    public ResponsiblePerson selectById(String responsiblePersonId) {
+    public ResponsiblePersonPojo selectById(String responsiblePersonId) {
         if (ObjectUtils.isEmpty(responsiblePersonId)) {
             return null;
         }
-        List<ResponsiblePerson> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
+        List<ResponsiblePersonPojo> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .in("id", responsiblePersonId)
-                .doQuery(ResponsiblePerson.class);
+                .doQuery(ResponsiblePersonPojo.class);
         if (ObjectUtils.isNotEmpty(personPojos)) {
             return personPojos.get(0);
         }else {
@@ -131,11 +131,11 @@ public class ResponsiblePerServiceImpl implements ResponsiblePerService {
     }
 
     @Override
-    public List<ResponsiblePerson> selectBysubSystemDept(String subSystem, String dept) {
-        List<ResponsiblePerson> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
+    public List<ResponsiblePersonPojo> selectBysubSystemDept(String subSystem, String dept) {
+        List<ResponsiblePersonPojo> personPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
                 .like("subsystem", subSystem)
                 .eq("department", dept)
-                .doQuery(ResponsiblePerson.class);
+                .doQuery(ResponsiblePersonPojo.class);
         return personPojos;
     }
 }
diff --git a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java
index bf94488..3855343 100644
--- a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java
@@ -11,9 +11,9 @@ import com.xdap.self_development.common.BusinessDatabase;
 import com.xdap.self_development.controller.form.*;
 import com.xdap.self_development.exception.CommonException;
 import com.xdap.self_development.listener.PersonReadListener;
-import com.xdap.self_development.pojo.Parameter;
-import com.xdap.self_development.pojo.ResponsiblePerson;
-import com.xdap.self_development.pojo.view.XdapUserView;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
+import com.xdap.self_development.domain.pojo.ResponsiblePersonPojo;
+import com.xdap.self_development.domain.view.XdapUserView;
 import com.xdap.self_development.service.ResponsiblePersonService;
 import com.xdap.self_development.service.XdapDeptUsersService;
 import org.apache.commons.lang3.ObjectUtils;
@@ -45,17 +45,17 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
 
     @Override
     public void saveResponsiblePerson(ResponsiblePersonForm form) {
-        List<ResponsiblePerson> responsiblePeople = bd.getBusinessDatabase()
+        List<ResponsiblePersonPojo> responsiblePeople = bd.getBusinessDatabase()
                 .eq("department_id", form.getDepartmentId())
                 .eq("subsystem", form.getSubsystem())
                 .eq("personLevel", 1)
-                .doQuery(ResponsiblePerson.class);
+                .doQuery(ResponsiblePersonPojo.class);
 
         if (!responsiblePeople.isEmpty()) {
             throw new CommonException("一个部门和子系统只能有一个责任人");
         }
 
-        ResponsiblePerson responsiblePerson = new ResponsiblePerson();
+        ResponsiblePersonPojo responsiblePerson = new ResponsiblePersonPojo();
         responsiblePerson.setDepartment(form.getDepartment());
         responsiblePerson.setDepartmentId(form.getDepartmentId());
         responsiblePerson.setUserId(form.getUserId());
@@ -67,16 +67,16 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
 
     @Override
     public void saveFilledPerson(FilledPersonForm form) {
-        List<ResponsiblePerson> responsiblePeople = bd.getBusinessDatabase()
+        List<ResponsiblePersonPojo> responsiblePeople = bd.getBusinessDatabase()
                 .eq("userId", form.getUserId())
                 .eq("personLevel", 2)
-                .doQuery(ResponsiblePerson.class);
+                .doQuery(ResponsiblePersonPojo.class);
 
         if (!responsiblePeople.isEmpty()) {
             throw new CommonException("请不要重复新增填写人");
         }
 
-        ResponsiblePerson responsiblePerson = new ResponsiblePerson();
+        ResponsiblePersonPojo responsiblePerson = new ResponsiblePersonPojo();
         responsiblePerson.setDepartment(form.getDepartment());
         responsiblePerson.setDepartmentId(form.getDepartmentId());
         responsiblePerson.setUserId(form.getUserId());
@@ -95,7 +95,7 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
                 .update("department", form.getDepartment())
                 .update("subsystem", form.getSubsystem())
                 .update("creation_date", Timestamp.valueOf(LocalDateTime.now()))
-                .doUpdate(ResponsiblePerson.class);
+                .doUpdate(ResponsiblePersonPojo.class);
     }
 
     @Override
@@ -107,50 +107,50 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
                 .update("department", form.getDepartment())
                 .update("subsystem", form.getSubsystem())
                 .update("parts_name", form.getPartsName())
-                .doUpdate(ResponsiblePerson.class);
+                .doUpdate(ResponsiblePersonPojo.class);
     }
 
     @Override
     public void deleteResponsiblePerson(String rowId) {
         bd.getBusinessDatabase()
                 .rowid("id", rowId)
-                .doDelete(ResponsiblePerson.class);
+                .doDelete(ResponsiblePersonPojo.class);
     }
 
     @Override
-    public PageQueryResult<ResponsiblePerson> getDeptResponsible(DeptResponsiblePageForm form) {
+    public PageQueryResult<ResponsiblePersonPojo> getDeptResponsible(DeptResponsiblePageForm form) {
 
         return bd.getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("getResponsibleAndName")
                 .setVar("level", 1)
-                .doPageQuery(form.getPageNumber(), form.getPageSize(), ResponsiblePerson.class);
+                .doPageQuery(form.getPageNumber(), form.getPageSize(), ResponsiblePersonPojo.class);
     }
 
     @Override
-    public PageQueryResult<ResponsiblePerson> getDeptFilled(DeptResponsiblePageForm form) {
+    public PageQueryResult<ResponsiblePersonPojo> getDeptFilled(DeptResponsiblePageForm form) {
         return bd.getBusinessDatabase()
                 .viewQueryMode(true).view("getResponsibleAndName")
                 .setVar("level", 2)
-                .doPageQuery(form.getPageNumber(), form.getPageSize(), ResponsiblePerson.class);
+                .doPageQuery(form.getPageNumber(), form.getPageSize(), ResponsiblePersonPojo.class);
     }
 
     @Override
     public Boolean isResponsiblePerson(String userId) {
-        List<ResponsiblePerson> responsiblePeople = bd.getBusinessDatabase()
+        List<ResponsiblePersonPojo> responsiblePeople = bd.getBusinessDatabase()
                 .eq("userId", userId)
-                .doQuery(ResponsiblePerson.class);
+                .doQuery(ResponsiblePersonPojo.class);
         return !responsiblePeople.isEmpty();
     }
 
     @Override
     public Set<String> getAllSubsystem() {
-        List<Parameter> templates = bd
+        List<ParameterPojo> templates = bd
                 .getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("getAllSubsystem")
-                .doQuery(Parameter.class);
-        return templates.stream().map(Parameter::getSubsystemName).collect(Collectors.toSet());
+                .doQuery(ParameterPojo.class);
+        return templates.stream().map(ParameterPojo::getSubsystemName).collect(Collectors.toSet());
     }
 
     @Override
@@ -159,10 +159,10 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
             return null;
         }
         ArrayList<XdapUsers> xdapUsers1 = new ArrayList<XdapUsers>();
-        List<ResponsiblePerson> responsiblePeople = bd.getBusinessDatabase()
+        List<ResponsiblePersonPojo> responsiblePeople = bd.getBusinessDatabase()
                 .eq("department", dept)
                 .eq("subsystem", subsystem)
-                .doQuery(ResponsiblePerson.class);
+                .doQuery(ResponsiblePersonPojo.class);
         if (!responsiblePeople.isEmpty()) {
             List<String> userIds = responsiblePeople.stream().map(x -> x.getUserId()).collect(Collectors.toList());
             for (String userId : userIds) {
@@ -188,13 +188,13 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
             response.setHeader("Pragma", "no-cache");
             response.setDateHeader("Expires", 0);
 
-            List<ResponsiblePerson> list = bd.getBusinessDatabase()
+            List<ResponsiblePersonPojo> list = bd.getBusinessDatabase()
                     .viewQueryMode(true)
                     .view("getResponsibleAndName")
                     .setVar("level", 1)
-                    .doQuery(ResponsiblePerson.class);
+                    .doQuery(ResponsiblePersonPojo.class);
 
-            EasyExcel.write(response.getOutputStream(), ResponsiblePerson.class)
+            EasyExcel.write(response.getOutputStream(), ResponsiblePersonPojo.class)
                     .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                     .includeColumnFieldNames(getIncludeColumnFieldNames())
                     .sheet("责任人")
@@ -217,10 +217,10 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
             response.setHeader("Pragma", "no-cache");
             response.setDateHeader("Expires", 0);
 
-            List<ResponsiblePerson> list = new ArrayList<>();
-            list.add(new ResponsiblePerson());
+            List<ResponsiblePersonPojo> list = new ArrayList<>();
+            list.add(new ResponsiblePersonPojo());
 
-            EasyExcel.write(response.getOutputStream(), ResponsiblePerson.class)
+            EasyExcel.write(response.getOutputStream(), ResponsiblePersonPojo.class)
                     .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                     .includeColumnFieldNames(getIncludeColumnFieldNames())
                     .sheet("责任人")
@@ -249,7 +249,7 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
         try (InputStream inputStream = file.getInputStream()) {
             EasyExcel.read(
                     inputStream,
-                    ResponsiblePerson.class,
+                    ResponsiblePersonPojo.class,
                     new PersonReadListener(this, problems)
             ).doReadAll();
 
@@ -279,13 +279,13 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService {
 
     @Override
     @Transactional
-    public void importAllPerson(List<ResponsiblePerson> cachedDataList, MyResponse problems) {
+    public void importAllPerson(List<ResponsiblePersonPojo> cachedDataList, MyResponse problems) {
         cachedDataList.forEach(item -> {
-            List<ResponsiblePerson> responsiblePeople = bd.getBusinessDatabase()
+            List<ResponsiblePersonPojo> responsiblePeople = bd.getBusinessDatabase()
                     .eq("department_id", item.getDepartmentId())
                     .eq("subsystem", item.getSubsystem())
                     .eq("personLevel", 1)
-                    .doQuery(ResponsiblePerson.class);
+                    .doQuery(ResponsiblePersonPojo.class);
 
             if (!responsiblePeople.isEmpty()) {
                 problems.setFlag(true);
diff --git a/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java
index 746aaeb..be4b185 100644
--- a/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java
@@ -3,7 +3,6 @@ package com.xdap.self_development.service.impl;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.definesys.mpaas.query.MpaasQueryFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xdap.motor.utils.StringUtils;
@@ -12,7 +11,7 @@ import com.xdap.self_development.controller.request.AnalysisRequest;
 import com.xdap.self_development.controller.request.AnalysisVerRequest;
 import com.xdap.self_development.controller.request.ModelComparisonExportRequest;
 import com.xdap.self_development.controller.request.ModelItem;
-import com.xdap.self_development.pojo.*;
+import com.xdap.self_development.domain.pojo.*;
 import com.xdap.self_development.service.DataEntryEngineModelService;
 import com.xdap.self_development.service.EngineParamDetailService;
 import com.xdap.self_development.service.TcDataQueryService;
@@ -31,8 +30,6 @@ import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
 @Service
@@ -60,19 +57,19 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
 
     //产品编号(状态代号) = 状态机
     @Override
-    public HashMap<String, List<ClassificationAttribute>> tcDataSelectByC(String productNumber, String partsName, String parameterName) {
+    public HashMap<String, List<ClassificationAttributePojo>> tcDataSelectByC(String productNumber, String partsName, String parameterName) {
 
-        EnginePartsCollection enginePartsCollection = bd.getTCDatabase()
+        EnginePartsCollectionPojo enginePartsCollection = bd.getTCDatabase()
                 .eq("ztj", productNumber)
                 .eq("lbjmc", partsName)
-                .doQueryFirst(EnginePartsCollection.class);
+                .doQueryFirst(EnginePartsCollectionPojo.class);
         if (enginePartsCollection == null || enginePartsCollection.getLbjth() == null) {
             return null;
         }
-        List<ClassificationAttribute> list = bd.getTCDatabase()
+        List<ClassificationAttributePojo> list = bd.getTCDatabase()
                 .eq("pitemId", enginePartsCollection.getLbjth())
-                .doQuery(ClassificationAttribute.class);
-        HashMap<String, List<ClassificationAttribute>> stringListHashMap = new HashMap<>();
+                .doQuery(ClassificationAttributePojo.class);
+        HashMap<String, List<ClassificationAttributePojo>> stringListHashMap = new HashMap<>();
         stringListHashMap.put(productNumber, list);
         return stringListHashMap;
     }
@@ -82,46 +79,46 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
     @Override
     public ArrayList<EngineParamDetailPojo> tcDataSelectAllByproductNumber(DataEntryEngineModelPojo engineModelPojo) {
         String productNumber = engineModelPojo.getProductNumber();
-        HashMap<String, List<ClassificationAttribute>> stringListHashMap = new HashMap<>();
+        HashMap<String, List<ClassificationAttributePojo>> stringListHashMap = new HashMap<>();
         if (ObjectUtils.isEmpty(productNumber)) {
             return null;
         }
         ArrayList<EngineParamDetailPojo> engineParamDetailPojos = new ArrayList<>();
         //查找参数模板TC参数数据
-        List<Parameter> parameters = engineParamDetailService.selectAllAndTcByNewVersion();
-        List<Parameter> collect = parameters.stream().filter(x -> "TC分类表".equals(x.getParameterSource())).collect(Collectors.toList());
+        List<ParameterPojo> parameters = engineParamDetailService.selectAllAndTcByNewVersion();
+        List<ParameterPojo> collect = parameters.stream().filter(x -> "TC分类表".equals(x.getParameterSource())).collect(Collectors.toList());
         if (ObjectUtils.isEmpty(collect)) {
             return null;
         }
         //通过零部件集合+状态机 查找图号
         String id = engineModelPojo.getId();
 
-        Map<String, List<Parameter>> stringListMap = collect.stream().collect(Collectors.groupingBy(Parameter::getPartsName));
+        Map<String, List<ParameterPojo>> stringListMap = collect.stream().collect(Collectors.groupingBy(ParameterPojo::getPartsName));
         Set<String> partsNames = stringListMap.keySet();
         for (String partsName : partsNames) {
             //获取系统内零部件下的参数
             List<String> parametersOnPartsName = stringListMap.get(partsName).stream().map(x -> x.getParameterName()).collect(Collectors.toList());
 
-            List<EnginePartsCollection> partsCollections = bd.getTCDatabase()
+            List<EnginePartsCollectionPojo> partsCollections = bd.getTCDatabase()
                     .eq("ztj", productNumber)
                     .eq("lbjmc", partsName)
-                    .doQuery(EnginePartsCollection.class);
+                    .doQuery(EnginePartsCollectionPojo.class);
             //查找图号
             List<String> allLbjths = partsCollections.stream()
-                    .map(EnginePartsCollection::getLbjth)
+                    .map(EnginePartsCollectionPojo::getLbjth)
                     .filter(ObjectUtils::isNotEmpty)
                     .distinct()
                     .collect(Collectors.toList());
             //查找参数
             if (!allLbjths.isEmpty()) {
-                List<ClassificationAttribute> allClassifications = bd.getTCDatabase()
+                List<ClassificationAttributePojo> allClassifications = bd.getTCDatabase()
                         .in("pitemId", allLbjths)
-                        .doQuery(ClassificationAttribute.class)
+                        .doQuery(ClassificationAttributePojo.class)
                         .stream()
                         .filter(attr -> parametersOnPartsName.contains(attr.getIdattrtbutehame()))
                         .collect(Collectors.toList());
 
-                for (ClassificationAttribute classificationAttribute : allClassifications) {
+                for (ClassificationAttributePojo classificationAttribute : allClassifications) {
                     EngineParamDetailPojo engineParamDetailPojo = new EngineParamDetailPojo();
                     engineParamDetailPojo.setEngineModelId(engineModelPojo.getId());
                     engineParamDetailPojo.setPartsName(partsName);
@@ -158,11 +155,11 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
         }
         List<EngineParamDetailPojo> allPojos = new ArrayList<>();
 //        List<EngineParamDetailPojo> SysAllPojos = new ArrayList<>();
-        List<Parameter> parameters = engineParamDetailService.selectAllAndTcByNewVersion();
+        List<ParameterPojo> parameters = engineParamDetailService.selectAllAndTcByNewVersion();
         DataEntryEngineModelPojo dataEntryEngineModelPojo = engineModelService.selectBymodelId(engineModelID);
         //查到所有TC表的参数 返回零部件，参数列表
         for (String subsystemType : subsystemTypes) {
-            HashMap<String, List<ClassificationAttribute>> stringListHashMap = new HashMap<>();
+            HashMap<String, List<ClassificationAttributePojo>> stringListHashMap = new HashMap<>();
             if (subsystemType.split("-").length != 2) {
                 throw new RuntimeException("查询条件异常,需子系统-零部件名称,若零部件为空则传入“/”");
             }
@@ -184,15 +181,15 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
             }
 
             //开始查找TC数据
-            List<EnginePartsCollection> lbjmcs = bd.getTCDatabase()
+            List<EnginePartsCollectionPojo> lbjmcs = bd.getTCDatabase()
                     .eq("ztj", dataEntryEngineModelPojo.getProductNumber())
                     .eq("lbjmc", parts_name)
-                    .doQuery(EnginePartsCollection.class);
+                    .doQuery(EnginePartsCollectionPojo.class);
             if (ObjectUtils.isEmpty(lbjmcs)) {
                 log.error("根据零部件未找到状态机图号列表");
             }
-            List<ClassificationAttribute> listl = new ArrayList<>();
-            for (EnginePartsCollection lbjmc : lbjmcs) {
+            List<ClassificationAttributePojo> listl = new ArrayList<>();
+            for (EnginePartsCollectionPojo lbjmc : lbjmcs) {
                 //获取图号
                 String lbjth = lbjmc.getLbjth();
                 if (ObjectUtils.isEmpty(lbjth)) {
@@ -200,13 +197,13 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
                 }
                 listl.addAll(bd.getTCDatabase()
                         .eq("pitemId", lbjth)
-                        .doQuery(ClassificationAttribute.class));
+                        .doQuery(ClassificationAttributePojo.class));
             }
             stringListHashMap.put(parts_name, listl);
-            for (Map.Entry<String, List<ClassificationAttribute>> stringListEntry : stringListHashMap.entrySet()) {
+            for (Map.Entry<String, List<ClassificationAttributePojo>> stringListEntry : stringListHashMap.entrySet()) {
                 String key = stringListEntry.getKey();//零部件
-                List<ClassificationAttribute> list = stringListEntry.getValue();//零部件里的值
-                for (ClassificationAttribute classificationAttribute : list) {
+                List<ClassificationAttributePojo> list = stringListEntry.getValue();//零部件里的值
+                for (ClassificationAttributePojo classificationAttribute : list) {
                     String idattrtbutehame = classificationAttribute.getIdattrtbutehame();
                     String fieldvalue = classificationAttribute.getFieldvalue();
                     List<EngineParamDetailPojo> pojos = parameters.stream()
@@ -246,11 +243,11 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
 
 
         List<EngineParamDetailPojo> allPojos = new ArrayList<>();
-        List<Parameter> parameters = engineParamDetailService.selectAllAndTcByNewVersion();
+        List<ParameterPojo> parameters = engineParamDetailService.selectAllAndTcByNewVersion();
         DataEntryEngineModelPojo dataEntryEngineModelPojo = engineModelService.selectBymodelId(engineModelID);
 
         // 预加载所有参数信息
-        Map<String, List<Parameter>> parameterMap = parameters.stream()
+        Map<String, List<ParameterPojo>> parameterMap = parameters.stream()
                 .collect(Collectors.groupingBy(p -> p.getPartsName() + "&&" + p.getParameterName()));
 
         //解析所有子系统-零部件对
@@ -291,31 +288,31 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
                 .distinct()
                 .collect(Collectors.toList());
 
-        List<EnginePartsCollection> allEngineParts = bd.getTCDatabase()
+        List<EnginePartsCollectionPojo> allEngineParts = bd.getTCDatabase()
                 .eq("ztj", dataEntryEngineModelPojo.getProductNumber())
                 .in("lbjmc", uniquePartsNames)
-                .doQuery(EnginePartsCollection.class);
+                .doQuery(EnginePartsCollectionPojo.class);
 
         // 按零部件名称分组
-        Map<String, List<EnginePartsCollection>> partsMap = allEngineParts.stream()
-                .collect(Collectors.groupingBy(EnginePartsCollection::getLbjmc));
+        Map<String, List<EnginePartsCollectionPojo>> partsMap = allEngineParts.stream()
+                .collect(Collectors.groupingBy(EnginePartsCollectionPojo::getLbjmc));
 
         //批量查询所有图号对应的分类属性
         List<String> allLbjths = allEngineParts.stream()
-                .map(EnginePartsCollection::getLbjth)
+                .map(EnginePartsCollectionPojo::getLbjth)
                 .filter(ObjectUtils::isNotEmpty)
                 .distinct()
                 .collect(Collectors.toList());
 
-        Map<String, List<ClassificationAttribute>> classificationMap = new HashMap<>();
+        Map<String, List<ClassificationAttributePojo>> classificationMap = new HashMap<>();
         if (!allLbjths.isEmpty()) {
-            List<ClassificationAttribute> allClassifications = bd.getTCDatabase()
+            List<ClassificationAttributePojo> allClassifications = bd.getTCDatabase()
                     .in("pitemId", allLbjths)
-                    .doQuery(ClassificationAttribute.class);
+                    .doQuery(ClassificationAttributePojo.class);
 
             // 按图号分组
             classificationMap = allClassifications.stream()
-                    .collect(Collectors.groupingBy(ClassificationAttribute::getPitemId));
+                    .collect(Collectors.groupingBy(ClassificationAttributePojo::getPitemId));
         }
 
         // 处理每个子系统-零部件对
@@ -324,11 +321,11 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
             String partsName = pair.getValue();
 
             // 获取该零部件的所有图号
-            List<EnginePartsCollection> partsCollections = partsMap.getOrDefault(partsName, Collections.emptyList());
+            List<EnginePartsCollectionPojo> partsCollections = partsMap.getOrDefault(partsName, Collections.emptyList());
 
             // 获取所有分类属性
-            List<ClassificationAttribute> allAttributes = new ArrayList<>();
-            for (EnginePartsCollection parts : partsCollections) {
+            List<ClassificationAttributePojo> allAttributes = new ArrayList<>();
+            for (EnginePartsCollectionPojo parts : partsCollections) {
                 String lbjth = parts.getLbjth();
                 if (ObjectUtils.isNotEmpty(lbjth)) {
                     allAttributes.addAll(classificationMap.getOrDefault(lbjth, Collections.emptyList()));
@@ -339,7 +336,7 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
             List<EngineParamDetailPojo> tcDataPojos = allAttributes.stream()
                     .filter(attr -> parameterMap.containsKey(partsName + "&&" + attr.getIdattrtbutehame()))
                     .map(attr -> {
-                        Parameter param = parameterMap.get(partsName + "&&" + attr.getIdattrtbutehame()).get(0);
+                        ParameterPojo param = parameterMap.get(partsName + "&&" + attr.getIdattrtbutehame()).get(0);
                         EngineParamDetailPojo pojo = new EngineParamDetailPojo();
                         pojo.setEngineModelId(dataEntryEngineModelPojo.getId());
                         pojo.setPartsName(param.getPartsName());
@@ -380,18 +377,18 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
 
         }
         try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build()) {
-            ArrayList<EnginePartsCollection> enginePartsCollections = new ArrayList<>();
-            List<EnginePartsCollection> lbjmcs = bd.getTCDatabase()
-                    .doQuery(EnginePartsCollection.class);
-            for (EnginePartsCollection parameter : lbjmcs) {
-                EnginePartsCollection engineParamDetailExcel = new EnginePartsCollection();
+            ArrayList<EnginePartsCollectionPojo> enginePartsCollections = new ArrayList<>();
+            List<EnginePartsCollectionPojo> lbjmcs = bd.getTCDatabase()
+                    .doQuery(EnginePartsCollectionPojo.class);
+            for (EnginePartsCollectionPojo parameter : lbjmcs) {
+                EnginePartsCollectionPojo engineParamDetailExcel = new EnginePartsCollectionPojo();
                 engineParamDetailExcel.setZtj(parameter.getZtj());
                 engineParamDetailExcel.setLbjth(parameter.getLbjth());
                 engineParamDetailExcel.setLbjmc(parameter.getLbjmc());
                 enginePartsCollections.add(engineParamDetailExcel);
             }
             WriteSheet sheet = EasyExcel.writerSheet()
-                    .head(EnginePartsCollection.class)  // 所有Sheet使用相同的表头
+                    .head(EnginePartsCollectionPojo.class)  // 所有Sheet使用相同的表头
                     .build();
             excelWriter.write(enginePartsCollections, sheet); // 写入数据，只生成表头
         } catch (Exception e) {
@@ -402,18 +399,18 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
     @Override
     public void excelExportB(HttpServletResponse response) {
         try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build()) {
-            ArrayList<ClassificationAttribute> enginePartsCollections = new ArrayList<>();
-            List<ClassificationAttribute> lbjmcs = bd.getTCDatabase()
-                    .doQuery(ClassificationAttribute.class);
-            for (ClassificationAttribute parameter : lbjmcs) {
-                ClassificationAttribute engineParamDetailExcel = new ClassificationAttribute();
+            ArrayList<ClassificationAttributePojo> enginePartsCollections = new ArrayList<>();
+            List<ClassificationAttributePojo> lbjmcs = bd.getTCDatabase()
+                    .doQuery(ClassificationAttributePojo.class);
+            for (ClassificationAttributePojo parameter : lbjmcs) {
+                ClassificationAttributePojo engineParamDetailExcel = new ClassificationAttributePojo();
                 engineParamDetailExcel.setFieldvalue(parameter.getFieldvalue());
                 engineParamDetailExcel.setIdattrtbutehame(parameter.getIdattrtbutehame());
                 engineParamDetailExcel.setPitemId(parameter.getPitemId());
                 enginePartsCollections.add(engineParamDetailExcel);
             }
             WriteSheet sheet = EasyExcel.writerSheet()
-                    .head(ClassificationAttribute.class)  // 所有Sheet使用相同的表头
+                    .head(ClassificationAttributePojo.class)  // 所有Sheet使用相同的表头
                     .build();
             excelWriter.write(enginePartsCollections, sheet); // 写入数据，只生成表头
         } catch (Exception e) {
@@ -621,11 +618,11 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
     @Override
     public Map<String, List<EngineParamDetailPojo>> tcDataSelectByVersion(AnalysisVerRequest analysisRequest) {
 //        List<EngineParamDetailPojo> allPojos = new ArrayList<>();
-        List<Parameter> parameters = engineParamDetailService.selectAllAndTcByNewVersion();
+        List<ParameterPojo> parameters = engineParamDetailService.selectAllAndTcByNewVersion();
         DataEntryEngineModelPojo dataEntryEngineModelPojo = engineModelService.selectBymodelId(analysisRequest.getEngineModelID());
 
         // 预加载所有参数信息
-//        Map<String, List<Parameter>> parameterMap = parameters.stream()
+//        Map<String, List<ParameterPojo>> parameterMap = parameters.stream()
 //                .collect(Collectors.groupingBy(p -> p.getPartsName() + "&&" + p.getParameterName()));
 
         //解析所有子系统-零部件对
@@ -663,7 +660,7 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
 //        allPojos.addAll(filteredSystemData);
 
         //批量查询所有TC数据
-        Map<String, List<Parameter>> parameterMapTc = parameters.stream()
+        Map<String, List<ParameterPojo>> parameterMapTc = parameters.stream()
                 .filter(x-> Objects.equals(x.getParameterSource(), "TC分类表"))
                 .collect(Collectors.groupingBy(p -> p.getPartsName() + "&&" + p.getParameterName()));
         List<Map.Entry<String, String>> subsystemPartsPairsTc = analysisRequest.getSubsystemParts().stream()
@@ -681,31 +678,31 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
                 .distinct()
                 .collect(Collectors.toList());
 
-        List<EnginePartsCollection> allEngineParts = bd.getTCDatabase()
+        List<EnginePartsCollectionPojo> allEngineParts = bd.getTCDatabase()
                 .eq("ztj", dataEntryEngineModelPojo.getProductNumber())
                 .in("lbjmc", uniquePartsNames)
-                .doQuery(EnginePartsCollection.class);
+                .doQuery(EnginePartsCollectionPojo.class);
 
         // 按零部件名称分组
-        Map<String, List<EnginePartsCollection>> partsMap = allEngineParts.stream()
-                .collect(Collectors.groupingBy(EnginePartsCollection::getLbjmc));
+        Map<String, List<EnginePartsCollectionPojo>> partsMap = allEngineParts.stream()
+                .collect(Collectors.groupingBy(EnginePartsCollectionPojo::getLbjmc));
 
         //批量查询所有图号对应的分类属性
         List<String> allLbjths = allEngineParts.stream()
-                .map(EnginePartsCollection::getLbjth)
+                .map(EnginePartsCollectionPojo::getLbjth)
                 .filter(ObjectUtils::isNotEmpty)
                 .distinct()
                 .collect(Collectors.toList());
 
-        Map<String, List<ClassificationAttribute>> classificationMap = new HashMap<>();
+        Map<String, List<ClassificationAttributePojo>> classificationMap = new HashMap<>();
         if (!allLbjths.isEmpty()) {
-            List<ClassificationAttribute> allClassifications = bd.getTCDatabase()
+            List<ClassificationAttributePojo> allClassifications = bd.getTCDatabase()
                     .in("pitemId", allLbjths)
-                    .doQuery(ClassificationAttribute.class);
+                    .doQuery(ClassificationAttributePojo.class);
 
             // 按图号分组
             classificationMap = allClassifications.stream()
-                    .collect(Collectors.groupingBy(ClassificationAttribute::getPitemId));
+                    .collect(Collectors.groupingBy(ClassificationAttributePojo::getPitemId));
         }
 
         // 处理每个子系统-零部件对
@@ -714,11 +711,11 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
             String partsName = pair.getValue();
 
             // 获取该零部件的所有图号
-            List<EnginePartsCollection> partsCollections = partsMap.getOrDefault(partsName, Collections.emptyList());
+            List<EnginePartsCollectionPojo> partsCollections = partsMap.getOrDefault(partsName, Collections.emptyList());
 
             // 获取所有分类属性
-            List<ClassificationAttribute> allAttributes = new ArrayList<>();
-            for (EnginePartsCollection parts : partsCollections) {
+            List<ClassificationAttributePojo> allAttributes = new ArrayList<>();
+            for (EnginePartsCollectionPojo parts : partsCollections) {
                 String lbjth = parts.getLbjth();
                 if (ObjectUtils.isNotEmpty(lbjth)) {
                     allAttributes.addAll(classificationMap.getOrDefault(lbjth, Collections.emptyList()));
@@ -729,7 +726,7 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
             List<EngineParamDetailPojo> tcDataPojos = allAttributes.stream()
                     .filter(attr -> parameterMapTc.containsKey(partsName + "&&" + attr.getIdattrtbutehame()))
                     .map(attr -> {
-                        Parameter param = parameterMapTc.get(partsName + "&&" + attr.getIdattrtbutehame()).get(0);
+                        ParameterPojo param = parameterMapTc.get(partsName + "&&" + attr.getIdattrtbutehame()).get(0);
                         EngineParamDetailPojo pojo = new EngineParamDetailPojo();
                         pojo.setEngineModelId(dataEntryEngineModelPojo.getId());
                         pojo.setPartsName(param.getPartsName());
@@ -773,8 +770,8 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
         }
 
         // 一次性查询所有参数模板 TC 参数数据
-        List<Parameter> parameters = engineParamDetailService.selectAllAndTcByNewVersion();
-        List<Parameter> collect = parameters.stream()
+        List<ParameterPojo> parameters = engineParamDetailService.selectAllAndTcByNewVersion();
+        List<ParameterPojo> collect = parameters.stream()
                 .filter(x -> "TC分类表".equals(x.getParameterSource()))
                 .collect(Collectors.toList());
 
@@ -783,38 +780,38 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
         }
 
         // 按 partsName 分组
-        Map<String, List<Parameter>> stringListMap = collect.stream()
-                .collect(Collectors.groupingBy(Parameter::getPartsName));
+        Map<String, List<ParameterPojo>> stringListMap = collect.stream()
+                .collect(Collectors.groupingBy(ParameterPojo::getPartsName));
 
         Set<String> partsNames = stringListMap.keySet();
         // 预处理参数名集合
         Map<String, Set<String>> partsParamNameMap = new HashMap<>(partsNames.size());
         for (String partsName : partsNames) {
-            List<Parameter> parameterList = stringListMap.get(partsName);
+            List<ParameterPojo> parameterList = stringListMap.get(partsName);
             if (parameterList != null) {
                 Set<String> paramNameSet = parameterList.stream()
-                        .map(Parameter::getParameterName)
+                        .map(ParameterPojo::getParameterName)
                         .collect(Collectors.toSet());
                 partsParamNameMap.put(partsName, paramNameSet);
             }
         }
 
-        // 一次性查询所有 EnginePartsCollection
-        List<EnginePartsCollection> allPartsCollections = bd.getTCDatabase()
+        // 一次性查询所有 EnginePartsCollectionPojo
+        List<EnginePartsCollectionPojo> allPartsCollections = bd.getTCDatabase()
                 .in("ztj", productNumbers)
                 .in("lbjmc", partsNames)
-                .doQuery(EnginePartsCollection.class);
+                .doQuery(EnginePartsCollectionPojo.class);
 
         // 按 productNumber 和 partsName 分组
-         Map<String, Map<String, List<EnginePartsCollection>>> partsCollectionsMap = allPartsCollections.stream()
+         Map<String, Map<String, List<EnginePartsCollectionPojo>>> partsCollectionsMap = allPartsCollections.stream()
          .collect(Collectors.groupingBy(
-                 EnginePartsCollection::getZtj,
-                 Collectors.groupingBy(EnginePartsCollection::getLbjmc)
+                 EnginePartsCollectionPojo::getZtj,
+                 Collectors.groupingBy(EnginePartsCollectionPojo::getLbjmc)
          ));
 
         // 收集所有图号
         Set<String> allLbjths = allPartsCollections.stream()
-                .map(EnginePartsCollection::getLbjth)
+                .map(EnginePartsCollectionPojo::getLbjth)
                 .filter(ObjectUtils::isNotEmpty)
                 .collect(Collectors.toSet());
 
@@ -822,28 +819,28 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
             return Collections.emptyList();
         }
 
-        // 一次性查询所有 ClassificationAttribute
-        List<ClassificationAttribute> allClassifications = bd.getTCDatabase()
+        // 一次性查询所有 ClassificationAttributePojo
+        List<ClassificationAttributePojo> allClassifications = bd.getTCDatabase()
                 .in("pitemId", allLbjths)
-                .doQuery(ClassificationAttribute.class);
+                .doQuery(ClassificationAttributePojo.class);
 
         // 按 pitemId 分组
-        Map<String, List<ClassificationAttribute>> classificationMap = allClassifications.stream()
-                .collect(Collectors.groupingBy(ClassificationAttribute::getPitemId));
+        Map<String, List<ClassificationAttributePojo>> classificationMap = allClassifications.stream()
+                .collect(Collectors.groupingBy(ClassificationAttributePojo::getPitemId));
 
         Map<String, Map<String, List<String>>> productPartsLbjthMap = new HashMap<>();
-        for (Map.Entry<String, Map<String, List<EnginePartsCollection>>> productEntry : partsCollectionsMap.entrySet()) {
+        for (Map.Entry<String, Map<String, List<EnginePartsCollectionPojo>>> productEntry : partsCollectionsMap.entrySet()) {
             String productNumber = productEntry.getKey();
-            Map<String, List<EnginePartsCollection>> partsMap = productEntry.getValue();
+            Map<String, List<EnginePartsCollectionPojo>> partsMap = productEntry.getValue();
 
             Map<String, List<String>> partsLbjthMap = new HashMap<>();
-            for (Map.Entry<String, List<EnginePartsCollection>> partsEntry : partsMap.entrySet()) {
+            for (Map.Entry<String, List<EnginePartsCollectionPojo>> partsEntry : partsMap.entrySet()) {
                 String partsName = partsEntry.getKey();
-                List<EnginePartsCollection> partsCollections = partsEntry.getValue();
+                List<EnginePartsCollectionPojo> partsCollections = partsEntry.getValue();
 
                 // 提前过滤并收集图号
                 List<String> lbjths = partsCollections.stream()
-                        .map(EnginePartsCollection::getLbjth)
+                        .map(EnginePartsCollectionPojo::getLbjth)
                         .filter(ObjectUtils::isNotEmpty)
                         .filter(classificationMap::containsKey)
                         .collect(Collectors.toList());
@@ -861,7 +858,7 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
                 continue;
             }
 
-            Map<String, List<EnginePartsCollection>> partsMap = partsCollectionsMap.get(productNumber);
+            Map<String, List<EnginePartsCollectionPojo>> partsMap = partsCollectionsMap.get(productNumber);
             if (partsMap == null) {
                 continue;
             }
@@ -883,12 +880,12 @@ public class TcDataQueryServiceImpl implements TcDataQueryService {
                 }
 
                 for (String lbjth : lbjths) {
-                    List<ClassificationAttribute> classifications = classificationMap.get(lbjth);
+                    List<ClassificationAttributePojo> classifications = classificationMap.get(lbjth);
                     if (classifications == null) {
                         continue;
                     }
 
-                    for (ClassificationAttribute classificationAttribute : classifications) {
+                    for (ClassificationAttributePojo classificationAttribute : classifications) {
                         if (parameterNameSet.contains(classificationAttribute.getIdattrtbutehame())) {
                             EngineParamDetailPojo engineParamDetailPojo = new EngineParamDetailPojo();
                             engineParamDetailPojo.setEngineModelId(engineModelPojo.getId());
diff --git a/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java
index 60f6db4..c36a883 100644
--- a/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java
@@ -6,16 +6,16 @@ import com.xdap.api.moudle.user.pojo.XdapUsers;
 import com.xdap.self_development.common.BusinessDatabase;
 import com.xdap.self_development.controller.form.*;
 import com.xdap.self_development.exception.CommonException;
-import com.xdap.self_development.pojo.*;
-import com.xdap.self_development.pojo.dto.ApprovalNodeDTO;
-import com.xdap.self_development.pojo.dto.ApprovalNodesDTO;
-import com.xdap.self_development.pojo.view.ApprovalFlowNodeView;
-import com.xdap.self_development.pojo.view.FlowNode;
-import com.xdap.self_development.pojo.view.TemplateChangeView;
-import com.xdap.self_development.pojo.view.TodoAndTemplateView;
+import com.xdap.self_development.domain.pojo.*;
+import com.xdap.self_development.domain.dto.ApprovalNodeDTO;
+import com.xdap.self_development.domain.dto.ApprovalNodesDTO;
+import com.xdap.self_development.domain.view.ApprovalFlowNodeView;
+import com.xdap.self_development.domain.view.FlowNode;
+import com.xdap.self_development.domain.view.TemplateChangeView;
+import com.xdap.self_development.domain.view.TodoAndTemplateView;
 import com.xdap.self_development.service.TemplateApprovalService;
 import com.xdap.self_development.service.XdapDeptUsersService;
-import com.xdap.self_development.utils.RedisLockUtil;
+import com.xdap.self_development.utils.RedisLockUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,10 +25,8 @@ import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service
 @Slf4j
@@ -36,7 +34,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     @Resource
     private BusinessDatabase bd;
     @Resource
-    private RedisLockUtil redisLockUtil;
+    private RedisLockUtils redisLockUtil;
     @Resource
     private XdapDeptUsersService xdapDeptUsersService;
     @Resource
@@ -51,9 +49,9 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     @Transactional
     public String startApproval(StartApprovalRequest request) {
         // 验证能否发起审批
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .rowid("id", request.getTemplateRowId())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
         if (template == null) {
             throw new CommonException("模板不存在");
         }
@@ -62,27 +60,27 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
             throw new CommonException("非草稿不允许发起审批");
         }
 
-        List<Template> templates = bd.getBusinessDatabase()
+        List<TemplatePojo> templates = bd.getBusinessDatabase()
                 .eq("template_name", template.getTemplateName())
-                .orderBy("version", "asc").doQuery(Template.class);
-        boolean approving = templates.stream().map(Template::getStatus)
+                .orderBy("version", "asc").doQuery(TemplatePojo.class);
+        boolean approving = templates.stream().map(TemplatePojo::getStatus)
                 .collect(Collectors.toList()).contains("APPROVING");
         if (approving) {
             throw new CommonException("同名模板已在审核中");
         }
 
-        List<TemplateAndParameter> templateAndParameters = bd.getBusinessDatabase()
-                .eq("template_id", template.getId()).doQuery(TemplateAndParameter.class);
+        List<TemplateAndParameterPojo> templateAndParameters = bd.getBusinessDatabase()
+                .eq("template_id", template.getId()).doQuery(TemplateAndParameterPojo.class);
 
         if (templateAndParameters.isEmpty()) {
             throw new CommonException("空参数模板不允许发起审批");
         }
 
         // 清除拒绝提醒待办
-        ApprovalFlow historyFlow = bd.getBusinessDatabase()
+        ApprovalFlowPojo historyFlow = bd.getBusinessDatabase()
                 .eq("template_id", template.getId())
                 .in("flow_status", "REJECTED", "RETURNED")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (historyFlow != null) {
             bd.getBusinessDatabase()
                     .eq("document_no", historyFlow.getId())
@@ -92,7 +90,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
         }
 
         // 新增流程
-        ApprovalFlow flow = new ApprovalFlow();
+        ApprovalFlowPojo flow = new ApprovalFlowPojo();
         flow.setTemplateId(template.getId());
         flow.setCurrentNode(1);
         flow.setFlowStatus("APPROVING");
@@ -174,7 +172,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
 
         // 新增发起记录
         bd.getBusinessDatabase().doInsert(
-                new ApprovalRecord(
+                new ApprovalRecordPojo(
                         flow.getId(),
                         "发起审批",
                         xdapDeptUsersService.selectUserByID(request.getUserId()).getUsername(),
@@ -191,16 +189,16 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
         bd.getBusinessDatabase()
                 .rowid("id", template.getRowId())
                 .update("status", template.getStatus())
-                .doUpdate(Template.class);
+                .doUpdate(TemplatePojo.class);
         return flow.getId();
     }
 
     @Override
     @Transactional
     public void continueApproval(String flowId, String userId) {
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", flowId)
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (flow == null) {
             throw new CommonException("流程不存在");
         }
@@ -227,13 +225,13 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                     .update("flow_status", "APPROVING")
                     .update("current_node", firstNode.getNodeOrder())
                     .update("pre_node", -1)
-                    .doUpdate(ApprovalFlow.class);
+                    .doUpdate(ApprovalFlowPojo.class);
         }
 
         // 获取当前节点和模板
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .eq("id", flow.getTemplateId())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
 
         // 添加新待办
         List<TodoTaskPojo> list = new ArrayList<>();
@@ -257,12 +255,12 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
         }
         bd.getBusinessDatabase().doBatchInsert(list);
 
-        ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+        ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                 .eq("flow_id", flow.getId())
                 .orderBy("approval_time", "desc")
-                .doQueryFirst(ApprovalRecord.class);
+                .doQueryFirst(ApprovalRecordPojo.class);
         bd.getBusinessDatabase().doInsert(
-                new ApprovalRecord(
+                new ApprovalRecordPojo(
                         flow.getId(),
                         "重新发起",
                         xdapDeptUsersService.selectUserByID(userId).getUsername(),
@@ -280,20 +278,20 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     @Transactional
     public void directSendingApproval(String templateId, String userId) {
         // 获取模板
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .eq("id", templateId)
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
         if (template == null) {
             throw new CommonException("模板不存在");
         }
 
         // 获取到模板最近一次未完成的流程
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("template_id", templateId)
                 .ne("pre_node", -1)
                 .ne("flow_status", "COMPLETE")
                 .orderBy("created_time", "desc")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (flow == null) {
             throw new CommonException("流程没有直送节点");
         }
@@ -318,10 +316,10 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                 .eq("approval_id", flow.getId())
                 .eq("node_order", flow.getPreNode())
                 .doQueryFirst(ApprovalConfigPojo.class);
-        ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+        ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                 .eq("flow_id", flow.getId())
                 .orderBy("approval_time", "desc")
-                .doQueryFirst(ApprovalRecord.class) ;
+                .doQueryFirst(ApprovalRecordPojo.class) ;
         Integer level = Objects.equals(lastedRecord.getResult(), "MSG") ? lastedRecord.getApprovalLevel() : lastedRecord.getApprovalLevel() + 1;
 
         // 重新创建待办继续流程
@@ -338,12 +336,12 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                 .update("flow_status", "APPROVING")
                 .update("current_node", flow.getPreNode())
                 .update("pre_node", -1)
-                .doUpdate(ApprovalFlow.class);
+                .doUpdate(ApprovalFlowPojo.class);
 
         bd.getBusinessDatabase()
                 .eq("id", template.getId())
                 .update("status", "APPROVING")
-                .doUpdate(Template.class);
+                .doUpdate(TemplatePojo.class);
 
         // 清除拒绝提醒待办
         bd.getBusinessDatabase()
@@ -353,7 +351,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                 .doUpdate(TodoTaskPojo.class);
 
         // 创建直送记录
-        ApprovalRecord record = new ApprovalRecord(
+        ApprovalRecordPojo record = new ApprovalRecordPojo(
                 flow.getId(),
                 "直送至" + preNode.getNodeName(),
                 xdapDeptUsersService.selectUserByID(userId).getUsername(),
@@ -387,9 +385,9 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                 item.setCurrentUsers(null);
             } else {
                 List<String> userIds = JSON.parseArray(item.getCurrentUsers()).toJavaList(String.class);
-                List<ApprovalXdapUsers> approvalXdapUsers = bd.getBusinessDatabase()
+                List<ApprovalXdapUsersPojo> approvalXdapUsers = bd.getBusinessDatabase()
                         .in("id", userIds)
-                        .doQuery(ApprovalXdapUsers.class);
+                        .doQuery(ApprovalXdapUsersPojo.class);
                 item.setCurrentApprovers(approvalXdapUsers);
                 item.setCurrentUsers(null);
             }
@@ -400,10 +398,10 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     @Transactional
     public void handleApproval(HandleApprovalRequest request) {
         // 验证流程状态和用户权限
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", request.getFlowId())
                 .eq("flow_type", 1)
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (flow == null || !"APPROVING".equals(flow.getFlowStatus())) {
             throw new CommonException("流程不存在或已结束");
         }
@@ -416,10 +414,10 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
         }
 
         // 获取最新处理记录
-        ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+        ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                 .eq("flow_id", flow.getId())
                 .orderBy("approval_time", "desc")
-                .doQueryFirst(ApprovalRecord.class);
+                .doQueryFirst(ApprovalRecordPojo.class);
 
         // 处理审批节点
         if (!"会签".equals(currentNode.getNodeName())) {
@@ -436,7 +434,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                         .eq("flow_id", flow.getId())
                         .eq("node", currentNode.getNodeName())
                         .eq("approval_level", lastedRecord.getApprovalLevel())
-                        .doQuery(ApprovalRecord.class).size();
+                        .doQuery(ApprovalRecordPojo.class).size();
                 if (processedCount > 0) {
                     throw new CommonException("此节点已被他人处理");
                 }
@@ -458,14 +456,14 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     }
 
     public void processApprovalLogic(
-            ApprovalFlow flow,
+            ApprovalFlowPojo flow,
             HandleApprovalRequest request,
             ApprovalConfigPojo currentNode,
-            ApprovalRecord lastedRecord
+            ApprovalRecordPojo lastedRecord
     ) {
 
         // 新增当前审批结果
-        ApprovalRecord record = new ApprovalRecord(
+        ApprovalRecordPojo record = new ApprovalRecordPojo(
                 flow.getId(),
                 currentNode.getNodeName(),
                 request.getUserId(),
@@ -522,7 +520,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     }
 
     public void cancelProcess(
-            ApprovalFlow flow,
+            ApprovalFlowPojo flow,
             ApprovalConfigPojo node,
             String status,
             String userId
@@ -541,17 +539,17 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                 .update("flow_status", flow.getFlowStatus())
                 .update("return_num", flow.getReturnNum() + 1)
                 .update("pre_node", node.getNodeOrder())
-                .doUpdate(ApprovalFlow.class);
+                .doUpdate(ApprovalFlowPojo.class);
         // 更新模板状态(重新打回草稿状态)
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .eq("id", flow.getTemplateId())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
         template.setStatus("DRAFT");
         bd.getBusinessDatabase()
                 .rowid("id", template.getRowId())
                 .update("status", template.getStatus())
                 .update("return_num", template.getReturnNum() + 1)
-                .doUpdate(Template.class);
+                .doUpdate(TemplatePojo.class);
         // 增加拒绝待办
         if (Objects.equals(status, "REJECTED")) {
             TodoTaskPojo todoTask = new TodoTaskPojo();
@@ -577,7 +575,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
 
     // 处理下一节点流转
     public void processNextNode(
-            ApprovalFlow flow,
+            ApprovalFlowPojo flow,
             ApprovalConfigPojo currentNode,
             String userId
     ) {
@@ -587,9 +585,9 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
         }
 
         // 查询模板状态
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .eq("id", flow.getTemplateId())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
         // 获取下一个节点
         ApprovalConfigPojo nextNode = bd.getBusinessDatabase()
                 .eq("approval_id", flow.getId())
@@ -605,13 +603,13 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                     .eq("template_name", template.getTemplateName())
                     .eq("version", template.getVersion() - 1)
                     .update("status", "HISTORY")
-                    .doUpdate(Template.class);
+                    .doUpdate(TemplatePojo.class);
             // 将当前版本状态改为已发布
             bd.getBusinessDatabase()
                     .rowid("id", template.getRowId())
                     .update("status", template.getStatus())
                     .update("published_time", Timestamp.valueOf(LocalDateTime.now()))
-                    .doUpdate(Template.class);
+                    .doUpdate(TemplatePojo.class);
             // 待办环节修改
             myself.updateTasks(flow, "已完成", 0, null);
             // 更新机型版本
@@ -626,20 +624,20 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                 .update("flow_status", flow.getFlowStatus())
                 .update("current_node", flow.getCurrentNode())
                 .update("pre_node", -1)
-                .doUpdate(ApprovalFlow.class);
+                .doUpdate(ApprovalFlowPojo.class);
     }
 
     // 检查节点是否完成
-    public boolean checkNodeComplete(ApprovalFlow flow, ApprovalConfigPojo node) {
-        ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+    public boolean checkNodeComplete(ApprovalFlowPojo flow, ApprovalConfigPojo node) {
+        ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                 .eq("flow_id", flow.getId())
                 .orderBy("approval_time", "desc")
-                .doQueryFirst(ApprovalRecord.class);
+                .doQueryFirst(ApprovalRecordPojo.class);
         Integer processedCount = bd.getBusinessDatabase()
                 .eq("flow_id", flow.getId())
                 .eq("node", node.getNodeName())
                 .eq("approval_level", lastedRecord.getApprovalLevel())
-                .doQuery(ApprovalRecord.class).size();
+                .doQuery(ApprovalRecordPojo.class).size();
         if ("会签".equals(node.getNodeName())) {
             return processedCount.equals(JSON.parseArray(node.getAssignees()).size());
         } else {
@@ -648,9 +646,9 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     }
 
     public void addNodeTodo(
-            ApprovalFlow flow,
+            ApprovalFlowPojo flow,
             ApprovalConfigPojo node,
-            Template template,
+            TemplatePojo template,
             String createBy,
             Integer enableReturn
     ) {
@@ -687,9 +685,9 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
 
     @Override
     public List<String> getReturnNodes(String flowId) {
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", flowId)
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         return bd.getBusinessDatabase()
                 .eq("approval_id", flowId)
                 .lt("node_order", flow.getCurrentNode())
@@ -709,12 +707,12 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
         List<ApprovalUserNodeDTO> list = new ArrayList<>();
 
         // 获取到模板最近一次未完成的流程
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("template_id", templateId)
                 .ne("pre_node", -1)
                 .ne("flow_status", "COMPLETE")
                 .orderBy("created_time", "desc")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (flow == null) {
             nodes.setNodeList(list);
             return nodes;
@@ -746,9 +744,9 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
 
     @Override
     public boolean getIsDirect(String flowId) {
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", flowId)
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
 
         if (flow == null) {
             return false;
@@ -760,10 +758,10 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     @Override
     @Transactional
     public void updateFlowTitle(String flowId, String title) {
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", flowId)
                 .ne("flow_status", "COMPLETE")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
 
         if (flow == null) {
             throw new CommonException("流程不存在");
@@ -776,7 +774,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
         bd.getBusinessDatabase()
                 .eq("id", flowId)
                 .update("process_title", title)
-                .doUpdate(ApprovalFlow.class);
+                .doUpdate(ApprovalFlowPojo.class);
 
         bd.getBusinessDatabase()
                 .eq("document_no", flowId)
@@ -794,10 +792,10 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
 
     @Override
     public List<String> getEditableNodes(String flowId) {
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", flowId)
                 .ne("flow_status", "COMPLETE")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
 
         if (flow == null) {
             throw new CommonException("流程不存在");
@@ -819,10 +817,10 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     @Transactional
     public void updateNode(UpdateNodeForm form) {
         // 检查流程
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", form.getFlowId())
                 .ne("flow_status", "COMPLETE")
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
 
         if (flow == null) {
             throw new CommonException("流程不存在");
@@ -834,7 +832,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
             bd.getBusinessDatabase()
                     .eq("id", flow.getId())
                     .update("process_title", form.getTitle())
-                    .doUpdate(ApprovalFlow.class);
+                    .doUpdate(ApprovalFlowPojo.class);
         }
     }
 
@@ -931,7 +929,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     }
 
     @Override
-    public void updateTasks(ApprovalFlow flow, String status, Integer enableReturn, ApprovalConfigPojo currentNode) {
+    public void updateTasks(ApprovalFlowPojo flow, String status, Integer enableReturn, ApprovalConfigPojo currentNode) {
         // 更新已办和发起的节点状态
         bd.getBusinessDatabase()
                 .eq("document_no", flow.getId())
@@ -948,9 +946,9 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
 
     @Override
     public PageQueryResult<TemplateChangeView> getTemplateChanges(ApprovalAndParameterForm form) {
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .eq("id", form.getTemplateId())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
         if (form.getFlowId() == null) {
             return bd.getBusinessDatabase()
                     .viewQueryMode(true)
@@ -959,9 +957,9 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                     .setVar("returnNum", template.getReturnNum())
                     .doPageQuery(form.getPageNumber(), form.getPageSize(), TemplateChangeView.class);
         } else {
-            ApprovalFlow approvalFlow = bd.getBusinessDatabase()
+            ApprovalFlowPojo approvalFlow = bd.getBusinessDatabase()
                     .eq("id", form.getFlowId())
-                    .doQueryFirst(ApprovalFlow.class);
+                    .doQueryFirst(ApprovalFlowPojo.class);
             if (approvalFlow == null) {
                 return bd.getBusinessDatabase()
                         .viewQueryMode(true)
@@ -983,9 +981,9 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     @Override
     public ApprovalFlowNodeView getApprovalProcess(ApprovalFlowForm form) {
         ApprovalFlowNodeView flowNodeView = new ApprovalFlowNodeView();
-        ApprovalFlow approvalFlow = bd.getBusinessDatabase()
+        ApprovalFlowPojo approvalFlow = bd.getBusinessDatabase()
                 .eq("id", form.getFlowId())
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         // 无流程创建空返回
         if (approvalFlow == null) {
             return flowNodeView;
@@ -993,14 +991,14 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
 
         List<FlowNode> flowNodes = new ArrayList<>();
 
-        List<ApprovalRecord> allRecord = bd.getBusinessDatabase()
+        List<ApprovalRecordPojo> allRecord = bd.getBusinessDatabase()
                 .eq("flow_id", approvalFlow.getId())
                 .orderBy("approval_time", "asc")
-                .doQuery(ApprovalRecord.class);
+                .doQuery(ApprovalRecordPojo.class);
 
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .eq("id", approvalFlow.getTemplateId())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
 
         // 获取节点信息
         if (approvalFlow.getCurrentNode() != null) {
@@ -1039,13 +1037,13 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                 ));
 
         // 获取所有层级
-        Map<Integer, List<ApprovalRecord>> levelMap = allRecord.stream()
+        Map<Integer, List<ApprovalRecordPojo>> levelMap = allRecord.stream()
                 .collect(Collectors.groupingBy(
-                        ApprovalRecord::getApprovalLevel,
+                        ApprovalRecordPojo::getApprovalLevel,
                         Collectors.collectingAndThen(
                                 Collectors.toList(),
                                 list -> list.stream()
-                                        .sorted(Comparator.comparing(ApprovalRecord::getApprovalTime))
+                                        .sorted(Comparator.comparing(ApprovalRecordPojo::getApprovalTime))
                                         .collect(Collectors.toList())
                         )
                 ));
@@ -1053,14 +1051,14 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
         // 获取最大层级
         int maxLevel = levelMap.keySet().stream().max(Integer::compare).orElse(1);
 
-        for (Map.Entry<Integer, List<ApprovalRecord>> entry : levelMap.entrySet()) {
+        for (Map.Entry<Integer, List<ApprovalRecordPojo>> entry : levelMap.entrySet()) {
             // 获取到每一层
             int level = entry.getKey();
             Set<Integer> nodeList = new HashSet<>();
-            List<ApprovalRecord> records = entry.getValue();
-            List<ApprovalRecord> uniqueRecords = new ArrayList<>(records.stream()
+            List<ApprovalRecordPojo> records = entry.getValue();
+            List<ApprovalRecordPojo> uniqueRecords = new ArrayList<>(records.stream()
                     .collect(Collectors.toMap(
-                            ApprovalRecord::getNode,
+                            ApprovalRecordPojo::getNode,
                             Function.identity(),
                             (first, second) -> first
                     ))
@@ -1105,15 +1103,15 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     ) {
         FlowNode nodeView = new FlowNode();
         if (Objects.equals(node.getNodeName(), "会签")) {
-            List<ApprovalRecord> records = bd.getBusinessDatabase()
+            List<ApprovalRecordPojo> records = bd.getBusinessDatabase()
                     .eq("flow_id", flowId)
                     .eq("node", node.getNodeName())
                     .eq("approval_level", level)
-                    .doQuery(ApprovalRecord.class);
+                    .doQuery(ApprovalRecordPojo.class);
             List<String> results = records.stream()
-                    .map(ApprovalRecord::getResult).collect(Collectors.toList());
-            List<ApprovalRecord> reversedTime = records.stream().sorted(Comparator
-                    .comparing(ApprovalRecord::getApprovalTime).reversed()).collect(Collectors.toList());
+                    .map(ApprovalRecordPojo::getResult).collect(Collectors.toList());
+            List<ApprovalRecordPojo> reversedTime = records.stream().sorted(Comparator
+                    .comparing(ApprovalRecordPojo::getApprovalTime).reversed()).collect(Collectors.toList());
             if (records.size() == JSON.parseArray(node.getAssignees()).size() || results.contains("REJECT") || results.contains("RETURN")) {
                 // 节点已完成
                 nodeView.setNodeOrder(node.getNodeOrder());
@@ -1133,16 +1131,16 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                 nodeView.setNodeOrder(node.getNodeOrder());
                 nodeView.setNode(node.getNodeName());
                 nodeView.setResult("待审批");
-                List<String> includedIds = records.stream().map(ApprovalRecord::getUserId).collect(Collectors.toList());
+                List<String> includedIds = records.stream().map(ApprovalRecordPojo::getUserId).collect(Collectors.toList());
                 nodeView.setTodoUserName(getUserNames(includedIds));
                 nodeView.setUndoUserName(getUserNames(JSON.parseArray(node.getAssignees()).toJavaList(String.class)));
             }
         } else {
-            ApprovalRecord record = bd.getBusinessDatabase()
+            ApprovalRecordPojo record = bd.getBusinessDatabase()
                     .eq("flow_id", flowId)
                     .eq("node", node.getNodeName())
                     .eq("approval_level", level)
-                    .doQueryFirst(ApprovalRecord.class);
+                    .doQueryFirst(ApprovalRecordPojo.class);
             nodeView.setNodeOrder(node.getNodeOrder());
             nodeView.setNode(node.getNodeName());
             if (record != null) {
@@ -1180,9 +1178,9 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     @Override
     @Transactional
     public void handleReturn(HandleApprovalRequest request) {
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", request.getFlowId())
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
         if (!Objects.equals(flow.getCreateBy(), request.getUserId())) {
             throw new CommonException("不是申请人无法撤回");
         }
@@ -1203,12 +1201,12 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
         }
         try {
             if ("RETURN".equals(request.getResult())) {
-                ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+                ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                         .eq("flow_id", flow.getId())
                         .orderBy("approval_time", "desc")
-                        .doQueryFirst(ApprovalRecord.class);
+                        .doQueryFirst(ApprovalRecordPojo.class);
 
-                ApprovalRecord approvalRecord = new ApprovalRecord(
+                ApprovalRecordPojo approvalRecord = new ApprovalRecordPojo(
                         flow.getId(),
                         "已撤回",
                         xdapDeptUsersService.selectUserByID(request.getUserId()).getUsername(),
@@ -1233,18 +1231,18 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
     @Transactional
     public void handleReturnToNode(HandleReturnNodeForm form) {
         // 查找流程
-        ApprovalFlow flow = bd.getBusinessDatabase()
+        ApprovalFlowPojo flow = bd.getBusinessDatabase()
                 .eq("id", form.getFlowId())
-                .doQueryFirst(ApprovalFlow.class);
+                .doQueryFirst(ApprovalFlowPojo.class);
 
         if (flow ==  null) {
             throw new CommonException("流程不存在");
         }
 
         // 查找模板
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .eq("id", flow.getTemplateId())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
 
         // 查找当前节点
         ApprovalConfigPojo currentNode = bd.getBusinessDatabase()
@@ -1285,17 +1283,17 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                     .eq("id", flow.getId())
                     .update("current_node", toNode.getNodeOrder())
                     .update("pre_node", flow.getCurrentNode())
-                    .doUpdate(ApprovalFlow.class);
+                    .doUpdate(ApprovalFlowPojo.class);
 
             // 生成新的待办
             myself.addNodeTodo(flow, toNode, template, form.getCreateUserId(), 0);
 
             // 生成处理记录
-            ApprovalRecord lastedRecord = bd.getBusinessDatabase()
+            ApprovalRecordPojo lastedRecord = bd.getBusinessDatabase()
                     .eq("flow_id", flow.getId())
                     .orderBy("approval_time", "desc")
-                    .doQueryFirst(ApprovalRecord.class);
-            ApprovalRecord record = new ApprovalRecord(
+                    .doQueryFirst(ApprovalRecordPojo.class);
+            ApprovalRecordPojo record = new ApprovalRecordPojo(
                     flow.getId(),
                     currentNode.getNodeName(),
                     form.getProcessUserId(),
@@ -1305,7 +1303,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
                     lastedRecord.getApprovalLevel()
             );
             bd.getBusinessDatabase().doInsert(record);
-            ApprovalRecord approvalRecord = new ApprovalRecord(
+            ApprovalRecordPojo approvalRecord = new ApprovalRecordPojo(
                     flow.getId(),
                     "退回至" + toNode.getNodeName(),
                     xdapDeptUsersService.selectUserByID(form.getProcessUserId()).getUsername(),
diff --git a/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java
index 0f6125d..06d1751 100644
--- a/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/TemplateServiceImpl.java
@@ -10,12 +10,12 @@ import com.xdap.self_development.common.BusinessDatabase;
 import com.xdap.self_development.controller.form.*;
 import com.xdap.self_development.exception.CommonException;
 import com.xdap.self_development.listener.SheetDataListener;
-import com.xdap.self_development.pojo.Parameter;
-import com.xdap.self_development.pojo.RevisionRecord;
-import com.xdap.self_development.pojo.Template;
-import com.xdap.self_development.pojo.TemplateAndParameter;
+import com.xdap.self_development.domain.pojo.ParameterPojo;
+import com.xdap.self_development.domain.pojo.RevisionRecordPojo;
+import com.xdap.self_development.domain.pojo.TemplateAndParameterPojo;
+import com.xdap.self_development.domain.pojo.TemplatePojo;
 import com.xdap.self_development.service.TemplateService;
-import com.xdap.self_development.utils.FormulaValidator;
+import com.xdap.self_development.utils.FormulaValidatorUtils;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -40,21 +40,21 @@ public class TemplateServiceImpl implements TemplateService {
     private BusinessDatabase bd;
 
     @Override
-    public PageQueryResult<Template> getTemplateByCondition(TemplatePageForm form) {
+    public PageQueryResult<TemplatePojo> getTemplateByCondition(TemplatePageForm form) {
         return bd.getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("getLatestTemplate")
                 .like("template_name", form.getTemplateName())
-                .doPageQuery(form.getPageNumber(), form.getPageSize(), Template.class);
+                .doPageQuery(form.getPageNumber(), form.getPageSize(), TemplatePojo.class);
     }
 
     @Override
     public void insertTemplate(InsertTemplateForm form) {
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("getNewTemplate")
                 .eq("template_name", form.getTemplateName())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
 
         // 如果有同名称模板
         if (template != null) {
@@ -62,7 +62,7 @@ public class TemplateServiceImpl implements TemplateService {
         }
 
         // 创建新模板
-        Template newTemplate = new Template(
+        TemplatePojo newTemplate = new TemplatePojo(
                 form.getTemplateName(), 1, "DRAFT", Timestamp.valueOf(LocalDateTime.now()),
                 null, form.getUserId(), System.currentTimeMillis(), 0
         );
@@ -73,19 +73,19 @@ public class TemplateServiceImpl implements TemplateService {
     @Override
     @Transactional
     public void updateTemplate(UpdateTemplateForm form) {
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("getLatestTemplateOrder")
                 .eq("template_name", form.getTemplateName())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
 
         if (template != null) {
             if (Objects.equals(form.getTemplateName(), template.getTemplateName()) && form.getOrderNum() != null) {
                 List<Long> sorted = bd.getBusinessDatabase()
                         .groupBy("order_num")
                         .orderBy("order_num", "desc")
-                        .doQuery(Template.class)
-                        .stream().map(Template::getOrderNum)
+                        .doQuery(TemplatePojo.class)
+                        .stream().map(TemplatePojo::getOrderNum)
                         .collect(Collectors.toList());
 
                 Long num = sorted.get(form.getOrderNum() - 1);
@@ -95,27 +95,27 @@ public class TemplateServiceImpl implements TemplateService {
 
                 List<String> originalTemplateId = bd.getBusinessDatabase()
                         .eq("order_num", template.getOrderNum())
-                        .doQuery(Template.class).stream().map(Template::getId)
+                        .doQuery(TemplatePojo.class).stream().map(TemplatePojo::getId)
                         .collect(Collectors.toList());
                 List<String> updateTemplateId = bd.getBusinessDatabase()
                         .eq("order_num", num)
-                        .doQuery(Template.class).stream().map(Template::getId)
+                        .doQuery(TemplatePojo.class).stream().map(TemplatePojo::getId)
                         .collect(Collectors.toList());
 
                 if (updateTemplateId.isEmpty()) {
                     bd.getBusinessDatabase()
                             .in("id", originalTemplateId)
                             .update("order_num", System.currentTimeMillis())
-                            .doUpdate(Template.class);
+                            .doUpdate(TemplatePojo.class);
                 } else {
                     bd.getBusinessDatabase()
                             .in("id", updateTemplateId)
                             .update("order_num", template.getOrderNum())
-                            .doUpdate(Template.class);
+                            .doUpdate(TemplatePojo.class);
                     bd.getBusinessDatabase()
                             .in("id", originalTemplateId)
                             .update("order_num", num)
-                            .doUpdate(Template.class);
+                            .doUpdate(TemplatePojo.class);
                 }
                 return;
             }
@@ -123,13 +123,13 @@ public class TemplateServiceImpl implements TemplateService {
         }
         String templateName = bd.getBusinessDatabase()
                 .rowid("id", form.getTemplateRowId())
-                .doQueryFirst(Template.class)
+                .doQueryFirst(TemplatePojo.class)
                 .getTemplateName();
 
         bd.getBusinessDatabase()
                 .eq("template_name", templateName)
                 .update("template_name", form.getTemplateName())
-                .doUpdate(Template.class);
+                .doUpdate(TemplatePojo.class);
     }
 
     @Override
@@ -152,7 +152,7 @@ public class TemplateServiceImpl implements TemplateService {
         try (InputStream inputStream = file.getInputStream()){
             EasyExcel.read(
                     inputStream,
-                    Parameter.class,
+                    ParameterPojo.class,
                     new SheetDataListener(this, templateRowId, userId, problems)
             ).doReadAll();
 
@@ -165,9 +165,9 @@ public class TemplateServiceImpl implements TemplateService {
 
     @Override
     public void exportTemplate(ExportTemplateForm form, HttpServletResponse response) {
-        Template templateDB = bd.getBusinessDatabase()
+        TemplatePojo templateDB = bd.getBusinessDatabase()
                 .rowid("id", form.getTemplateRowId())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
 
         String fileName = templateDB.getTemplateName() +
                 (form.isTemplateEmpty() ? "空模板_" : "参数模板_") +
@@ -182,19 +182,19 @@ public class TemplateServiceImpl implements TemplateService {
             response.setHeader("Pragma", "no-cache");
             response.setDateHeader("Expires", 0);
 
-            List<Parameter> list;
+            List<ParameterPojo> list;
             if (form.isTemplateEmpty()) {
                 list = new ArrayList<>();
-                list.add(new Parameter());
+                list.add(new ParameterPojo());
             } else {
                 list = bd.getBusinessDatabase()
                         .viewQueryMode(true)
                         .view("selectParametersByTId")
                         .setVar("templateId", templateDB.getId())
                         .orderBy("parameterNumber", "asc")
-                        .doQuery(Parameter.class);
+                        .doQuery(ParameterPojo.class);
             }
-            EasyExcel.write(response.getOutputStream(), Parameter.class)
+            EasyExcel.write(response.getOutputStream(), ParameterPojo.class)
                     .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                     .includeColumnFieldNames(getIncludeColumnFieldNames())
                     .sheet(templateDB.getTemplateName())
@@ -206,28 +206,28 @@ public class TemplateServiceImpl implements TemplateService {
     }
 
     @Override
-    public List<Template> getTemplateVersion(TemplateRowIdForm form) {
-        Template template = bd.getBusinessDatabase()
+    public List<TemplatePojo> getTemplateVersion(TemplateRowIdForm form) {
+        TemplatePojo template = bd.getBusinessDatabase()
                 .rowid("id", form.getTemplateRowId())
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
         return bd.getBusinessDatabase()
                 .eq("template_name", template.getTemplateName())
                 .orderBy("version", "desc")
-                .doQuery(Template.class);
+                .doQuery(TemplatePojo.class);
     }
 
     @Override
-    public Template getTemplateById(String templateId) {
+    public TemplatePojo getTemplateById(String templateId) {
         return bd.getBusinessDatabase()
                 .eq("id", templateId)
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
     }
 
     @Override
     public void deleteTemplate(String templateId) {
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .eq("id", templateId)
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
 
         if (template == null) {
             throw new CommonException("模板不存在");
@@ -235,12 +235,12 @@ public class TemplateServiceImpl implements TemplateService {
         if (!Objects.equals(template.getStatus(), "DRAFT") || template.getVersion() != 1) {
             throw new CommonException("非草稿版本不允许删除");
         }
-        bd.getBusinessDatabase().eq("id", templateId).doDelete(Template.class);
+        bd.getBusinessDatabase().eq("id", templateId).doDelete(TemplatePojo.class);
     }
 
     @Override
     @Transactional
-    public void processSheetData(List<Parameter> dataList, String sheetName,
+    public void processSheetData(List<ParameterPojo> dataList, String sheetName,
                                  String templateRowId, String createBy, MyResponse problems) {
         if (dataList.isEmpty()) {
             log.warn("Sheet {} 没有数据", sheetName);
@@ -248,7 +248,7 @@ public class TemplateServiceImpl implements TemplateService {
         }
 
         // 验证公式
-        for (Parameter data : dataList) {
+        for (ParameterPojo data : dataList) {
             data.setCreatedBy(createBy);
             if (data.getSubsystemName() == null) {
                 problems.setFlag(true);
@@ -260,7 +260,7 @@ public class TemplateServiceImpl implements TemplateService {
                 data.setPartsName("/");
             }
             if (Objects.equals(data.getParameterSource(), "公式计算")) {
-                Map<String, Object> validationResult = FormulaValidator.validateFormulaDetailed(
+                Map<String, Object> validationResult = FormulaValidatorUtils.validateFormulaDetailed(
                         data.getNumberOrFormula());
                 if (!(Boolean) validationResult.get("isValid")) {
                     String errorMsg = String.format("模板导入失败:"+"模板'%s'的参数'%s'公式格式错误， %s",
@@ -276,9 +276,9 @@ public class TemplateServiceImpl implements TemplateService {
         String templateName = sheetName;
         // 指定模板导入
         if (templateRowId != null && !templateRowId.isEmpty()) {
-            Template t = bd.getBusinessDatabase()
+            TemplatePojo t = bd.getBusinessDatabase()
                     .rowid("id", templateRowId)
-                    .doQueryFirst(Template.class);
+                    .doQueryFirst(TemplatePojo.class);
             templateName = t.getTemplateName();
 
             // 页名和模板名不一致不允许导入
@@ -289,10 +289,10 @@ public class TemplateServiceImpl implements TemplateService {
             }
         }
 
-        Template template = bd.getBusinessDatabase()
+        TemplatePojo template = bd.getBusinessDatabase()
                 .eq("template_name", templateName)
                 .orderBy("version", "desc")
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
         if (template != null && Objects.equals(template.getStatus(), "APPROVING")) {
             problems.setFlag(true);
             problems.getErrors().add("模板导入失败:模板'" + templateName + "'正在审批中");
@@ -303,27 +303,27 @@ public class TemplateServiceImpl implements TemplateService {
         }
 
         // 首先查找是否有草稿版本
-        Template draftTemplate = bd.getBusinessDatabase()
+        TemplatePojo draftTemplate = bd.getBusinessDatabase()
                 .eq("template_name", templateName)
                 .eq("status", "DRAFT")
-                .doQueryFirst(Template.class);
+                .doQueryFirst(TemplatePojo.class);
 
-        Template targetTemplate;
+        TemplatePojo targetTemplate;
         if (draftTemplate != null) {
             // 如果存在草稿版本，使用草稿版本
             targetTemplate = draftTemplate;
         } else {
             // 如果没有草稿版本，创建新版本
-            Template lastTemplate = bd.getBusinessDatabase()
+            TemplatePojo lastTemplate = bd.getBusinessDatabase()
                     .viewQueryMode(true)
                     .view("getNewTemplate")
                     .eq("template_name", templateName)
-                    .doQueryFirst(Template.class);
+                    .doQueryFirst(TemplatePojo.class);
 
-            List<Parameter> lastTemplateParameters = new ArrayList<>();
+            List<ParameterPojo> lastTemplateParameters = new ArrayList<>();
             if (lastTemplate != null) {
                 // 基于最新版本创建新版本
-                targetTemplate = new Template(
+                targetTemplate = new TemplatePojo(
                         templateName, lastTemplate.getVersion() + 1, "DRAFT",
                         Timestamp.valueOf(LocalDateTime.now()), null, createBy, System.currentTimeMillis(), 0
                 );
@@ -331,10 +331,10 @@ public class TemplateServiceImpl implements TemplateService {
                         .viewQueryMode(true)
                         .view("selectParametersByTId")
                         .setVar("templateId", lastTemplate.getId())
-                        .doQuery(Parameter.class);
+                        .doQuery(ParameterPojo.class);
             } else {
                 // 如果没有同名模板，创建第一个版本
-                targetTemplate = new Template(
+                targetTemplate = new TemplatePojo(
                         templateName, 1, "DRAFT", Timestamp.valueOf(LocalDateTime.now()),
                         null, createBy, System.currentTimeMillis(), 0
                 );
@@ -345,9 +345,9 @@ public class TemplateServiceImpl implements TemplateService {
             if (!lastTemplateParameters.isEmpty()) {
                 lastTemplateParameters.forEach(parameter -> parameter.setId(null));
                 bd.getBusinessDatabase().doBatchInsert(lastTemplateParameters);
-                List<TemplateAndParameter> list = new ArrayList<>();
-                for (Parameter parameter : lastTemplateParameters) {
-                    TemplateAndParameter templateAndParameter = new TemplateAndParameter();
+                List<TemplateAndParameterPojo> list = new ArrayList<>();
+                for (ParameterPojo parameter : lastTemplateParameters) {
+                    TemplateAndParameterPojo templateAndParameter = new TemplateAndParameterPojo();
                     templateAndParameter.setTemplateId(targetTemplate.getId());
                     templateAndParameter.setParameterId(parameter.getId());
                     list.add(templateAndParameter);
@@ -357,14 +357,14 @@ public class TemplateServiceImpl implements TemplateService {
         }
 
         // 获取目标模板的现有参数
-        List<Parameter> existingParameters = bd.getBusinessDatabase()
+        List<ParameterPojo> existingParameters = bd.getBusinessDatabase()
                 .viewQueryMode(true)
                 .view("selectParametersByTId")
                 .setVar("templateId", targetTemplate.getId())
-                .doQuery(Parameter.class);
+                .doQuery(ParameterPojo.class);
 
         // 构建现有参数的映射，以参数名、子系统和零部件组合作为键
-        Map<String, Parameter> existingParamMap = new HashMap<>();
+        Map<String, ParameterPojo> existingParamMap = new HashMap<>();
         if (existingParameters != null && !existingParameters.isEmpty()) {
             existingParamMap = existingParameters.stream()
                     .collect(Collectors.toMap(
@@ -377,14 +377,14 @@ public class TemplateServiceImpl implements TemplateService {
         }
 
         // 处理参数新增和更新
-        List<TemplateAndParameter> relationsToAdd = new ArrayList<>();
-        List<RevisionRecord> revisionRecords = new ArrayList<>();
+        List<TemplateAndParameterPojo> relationsToAdd = new ArrayList<>();
+        List<RevisionRecordPojo> revisionRecords = new ArrayList<>();
 
-        for (Parameter newParam : dataList) {
+        for (ParameterPojo newParam : dataList) {
             String key = newParam.getParameterName() + "|" +
                     (newParam.getSubsystemName() != null ? newParam.getSubsystemName() : "") + "|" +
                     (newParam.getPartsName() != null ? newParam.getPartsName() : "");
-            Parameter existingParam = existingParamMap.get(key);
+            ParameterPojo existingParam = existingParamMap.get(key);
             if (existingParam != null) {
                 newParam.setId(existingParam.getId());
                 String datils = getParameterChange(existingParam, newParam);
@@ -394,7 +394,7 @@ public class TemplateServiceImpl implements TemplateService {
 
                 // 记录修改记录
                 if (!datils.isEmpty()) {
-                    revisionRecords.add(new RevisionRecord(
+                    revisionRecords.add(new RevisionRecordPojo(
                             targetTemplate.getTemplateName(),
                             targetTemplate.getVersion(),
                             newParam.getParameterNumber(),
@@ -410,12 +410,12 @@ public class TemplateServiceImpl implements TemplateService {
                 newParam.setId(null);
                 bd.getBusinessDatabase().doInsert(newParam);
 
-                TemplateAndParameter relation = new TemplateAndParameter();
+                TemplateAndParameterPojo relation = new TemplateAndParameterPojo();
                 relation.setTemplateId(targetTemplate.getId());
                 relation.setParameterId(newParam.getId());
                 relationsToAdd.add(relation);
 
-                revisionRecords.add(new RevisionRecord(
+                revisionRecords.add(new RevisionRecordPojo(
                         targetTemplate.getTemplateName(),
                         targetTemplate.getVersion(),
                         newParam.getParameterNumber(),
@@ -466,28 +466,28 @@ public class TemplateServiceImpl implements TemplateService {
     }
 
     private void insertAndUpdateParameters(
-            List<Parameter> dataList, Template lastTemplate
+            List<ParameterPojo> dataList, TemplatePojo lastTemplate
     ) {
         // 获取原模板参数
-        List<Parameter> parameters = bd.getBusinessDatabase().viewQueryMode(true)
+        List<ParameterPojo> parameters = bd.getBusinessDatabase().viewQueryMode(true)
                 .view("selectParametersByTemplateId")
                 .setVar("template_id", lastTemplate.getId())
-                .doQuery(Parameter.class);
+                .doQuery(ParameterPojo.class);
 
         // 筛选变更和新增的参数
         ProcessResult processResult = processParameters(parameters, dataList);
-        List<Parameter> toAdd = processResult.getToAdd();
+        List<ParameterPojo> toAdd = processResult.getToAdd();
         List<ParameterChange> toUpdate = processResult.getToUpdate();
 
         if (!toAdd.isEmpty()) {
             // 保存参数
             bd.getBusinessDatabase().doBatchInsert(toAdd);
-            List<TemplateAndParameter> relations = new ArrayList<>();
+            List<TemplateAndParameterPojo> relations = new ArrayList<>();
 
             // 保存关联关系
             toAdd.forEach(parameter -> {
-                TemplateAndParameter relation = new TemplateAndParameter();
-                RevisionRecord record = new RevisionRecord();
+                TemplateAndParameterPojo relation = new TemplateAndParameterPojo();
+                RevisionRecordPojo record = new RevisionRecordPojo();
                 relation.setTemplateId(lastTemplate.getId());
                 relation.setParameterId(parameter.getId());
                 relations.add(relation);
@@ -495,9 +495,9 @@ public class TemplateServiceImpl implements TemplateService {
             bd.getBusinessDatabase().doBatchInsert(relations);
 
             // 保存修改记录
-            List<RevisionRecord> revisionRecords = toAdd.stream()
+            List<RevisionRecordPojo> revisionRecords = toAdd.stream()
                     .map(parameter -> {
-                        return new RevisionRecord(
+                        return new RevisionRecordPojo(
                                 lastTemplate.getTemplateName(),
                                 lastTemplate.getVersion(),
                                 parameter.getParameterNumber(),
@@ -523,7 +523,7 @@ public class TemplateServiceImpl implements TemplateService {
                         .doUpdate(parameterChange.getUpdated());
 
                 // 保存修改记录
-                RevisionRecord record = new RevisionRecord(
+                RevisionRecordPojo record = new RevisionRecordPojo(
                         lastTemplate.getTemplateName(),
                         lastTemplate.getVersion(),
                         parameterChange.getUpdated().getParameterNumber(),
@@ -539,7 +539,7 @@ public class TemplateServiceImpl implements TemplateService {
         }
     }
 
-    private String getParameterChange(Parameter originalParameter, Parameter updatedParameter) {
+    private String getParameterChange(ParameterPojo originalParameter, ParameterPojo updatedParameter) {
         return handleParameterChange("参数名", originalParameter.getParameterName(), updatedParameter.getParameterName()) +
                 handleParameterChange("参数类型", originalParameter.getParameterType(), updatedParameter.getParameterType()) +
                 handleParameterChange("子系统", originalParameter.getSubsystemName(), updatedParameter.getSubsystemName()) +
@@ -572,10 +572,10 @@ public class TemplateServiceImpl implements TemplateService {
 
     @Getter
     public static class ProcessResult {
-        private List<Parameter> toAdd;
+        private List<ParameterPojo> toAdd;
         private List<ParameterChange> toUpdate;
 
-        public ProcessResult(List<Parameter> toAdd, List<ParameterChange> toUpdate) {
+        public ProcessResult(List<ParameterPojo> toAdd, List<ParameterChange> toUpdate) {
             this.toAdd = toAdd;
             this.toUpdate = toUpdate;
         }
@@ -584,11 +584,11 @@ public class TemplateServiceImpl implements TemplateService {
 
     @Getter
     public static class ParameterChange {
-        private Parameter original;
-        private Parameter updated;
+        private ParameterPojo original;
+        private ParameterPojo updated;
         private String changeDescription;
 
-        public ParameterChange(Parameter original, Parameter updated, String changeDescription) {
+        public ParameterChange(ParameterPojo original, ParameterPojo updated, String changeDescription) {
             this.original = original;
             this.updated = updated;
             this.changeDescription = changeDescription;
@@ -596,31 +596,31 @@ public class TemplateServiceImpl implements TemplateService {
 
     }
 
-    public ProcessResult processParameters(List<Parameter> oldList, List<Parameter> newList) {
+    public ProcessResult processParameters(List<ParameterPojo> oldList, List<ParameterPojo> newList) {
         // 过滤掉newList中number为空的项
-        List<Parameter> validNewList = newList.stream()
+        List<ParameterPojo> validNewList = newList.stream()
                 .filter(p -> p.getParameterNumber() != null
                         && !p.getParameterNumber().toString().trim().isEmpty())
                 .collect(Collectors.toList());
 
-        List<Parameter> toAdd = new ArrayList<>();
+        List<ParameterPojo> toAdd = new ArrayList<>();
         List<ParameterChange> toUpdate = new ArrayList<>();
 
         // 创建旧列表中number到Parameter的映射
-        Map<Object, Parameter> oldMap = oldList.stream()
+        Map<Object, ParameterPojo> oldMap = oldList.stream()
                 .filter(p -> p.getParameterNumber() != null
                         && !p.getParameterNumber().toString().trim().isEmpty())
                 .collect(Collectors.toMap(
-                        Parameter::getParameterNumber,
+                        ParameterPojo::getParameterNumber,
                         p -> p,
                         (existing, replacement) -> existing));
 
         // 处理新列表中的每个参数
-        for (Parameter newParam : validNewList) {
+        for (ParameterPojo newParam : validNewList) {
             Integer number = newParam.getParameterNumber();
 
             if (oldMap.containsKey(number)) {
-                Parameter oldParam = oldMap.get(number);
+                ParameterPojo oldParam = oldMap.get(number);
                 String changeDescription = getParameterChange(oldParam, newParam);
                 ParameterChange change = new ParameterChange(oldParam, newParam, changeDescription);
                 toUpdate.add(change);
@@ -647,16 +647,16 @@ public class TemplateServiceImpl implements TemplateService {
             response.setDateHeader("Expires", 0);
 
             // 获取所有模板
-            List<Template> templates = bd.getBusinessDatabase()
+            List<TemplatePojo> templates = bd.getBusinessDatabase()
                     .eq("status", "COMPLETE")
-                    .doQuery(Template.class);
+                    .doQuery(TemplatePojo.class);
 
             if (templates.isEmpty()) {
                 try {
-                    List<Parameter> list = new ArrayList<>();
-                    list.add(new Parameter());
+                    List<ParameterPojo> list = new ArrayList<>();
+                    list.add(new ParameterPojo());
 
-                    EasyExcel.write(response.getOutputStream(), Parameter.class)
+                    EasyExcel.write(response.getOutputStream(), ParameterPojo.class)
                             .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                             .includeColumnFieldNames(getIncludeColumnFieldNames())
                             .sheet("xxx")
@@ -665,14 +665,14 @@ public class TemplateServiceImpl implements TemplateService {
                     throw new CommonException("导出Excel失败: " + e.getMessage());
                 }
             } else {
-                try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), Parameter.class)
+                try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ParameterPojo.class)
                         .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                         .includeColumnFieldNames(getIncludeColumnFieldNames())
                         .build()) {
 
-                    for (Template template : templates) {
-                        List<Parameter> parameters = new ArrayList<>();
-                        parameters.add(new Parameter());
+                    for (TemplatePojo template : templates) {
+                        List<ParameterPojo> parameters = new ArrayList<>();
+                        parameters.add(new ParameterPojo());
 
                         WriteSheet writeSheet = EasyExcel
                                 .writerSheet(template.getTemplateName())
diff --git a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java
index 314ce34..55016e7 100644
--- a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java
@@ -8,10 +8,10 @@ import com.xdap.self_development.common.BusinessDatabase;
 import com.xdap.self_development.controller.request.TodoReturnRequest;
 import com.xdap.self_development.controller.request.TodoTaskRequest;
 import com.xdap.self_development.controller.request.YcGetTodoTaskRequest;
-import com.xdap.self_development.enums.CurrentNodeEnum;
-import com.xdap.self_development.enums.DistributeStatusEnum;
-import com.xdap.self_development.pojo.*;
-import com.xdap.self_development.pojo.dto.*;
+import com.xdap.self_development.domain.enums.CurrentNodeEnum;
+import com.xdap.self_development.domain.enums.DistributeStatusEnum;
+import com.xdap.self_development.domain.pojo.*;
+import com.xdap.self_development.domain.dto.*;
 import com.xdap.self_development.service.DataEntryEngineModelService;
 import com.xdap.self_development.service.EngineParamDetailService;
 import com.xdap.self_development.service.TodoTaskService;
diff --git a/src/main/java/com/xdap/self_development/utils/FormulaValidator.java b/src/main/java/com/xdap/self_development/utils/FormulaValidatorUtils.java
similarity index 96%
rename from src/main/java/com/xdap/self_development/utils/FormulaValidator.java
rename to src/main/java/com/xdap/self_development/utils/FormulaValidatorUtils.java
index 5774dd1..0d7cf22 100644
--- a/src/main/java/com/xdap/self_development/utils/FormulaValidator.java
+++ b/src/main/java/com/xdap/self_development/utils/FormulaValidatorUtils.java
@@ -4,12 +4,12 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class FormulaValidator {
+public class FormulaValidatorUtils {
 
     // 定义支持的数学运算符
     private static final Set<Character> OPERATORS = new HashSet<>(Arrays.asList('+', '-', '*', '/'));
     // 定义支持的常量
-    private static final Set<String> CONSTANTS = new HashSet<>(Arrays.asList("π"));
+    private static final Set<String> CONSTANTS = new HashSet<>(Collections.singletonList("π"));
 
     /**
      * 详细验证公式合法性（基于运算逻辑）
@@ -143,18 +143,18 @@ public class FormulaValidator {
             if (i == 0) {
                 if (token.equals("-")) {
                     // 负号开头，检查下一个token是否为有效值
-                    if (tokens.size() < 2 || !isValidOperand(tokens.get(1)) && !tokens.get(1).equals("OPERAND_PLACEHOLDER")) {
+                    if (tokens.size() < 2 || isValidOperand(tokens.get(1)) && !tokens.get(1).equals("OPERAND_PLACEHOLDER")) {
                         throw new IllegalArgumentException(String.format("负号后必须跟有效参数/数字/常量 [错误片段：-%s][原始公式：%s]",
                                 tokens.size() >= 2 ? tokens.get(1) : "", originalFormula));
                     }
-                } else if (!isValidOperand(token)) {
+                } else if (isValidOperand(token)) {
                     throw new IllegalArgumentException(String.format("公式开头必须是参数/数字/常量，当前为无效字符：%s [错误片段：%s][原始公式：%s]",
                             token, currentFormula, originalFormula));
                 }
             } else {
                 // 偶数位必须是运算符，奇数位必须是操作数/占位符
                 if (i % 2 == 0) { // 操作数位置
-                    if (!isValidOperand(token)) {
+                    if (isValidOperand(token)) {
                         throw new IllegalArgumentException(String.format("运算符后必须跟有效参数/数字/常量，当前为无效字符：%s [错误片段：%s][原始公式：%s]",
                                 token, currentFormula, originalFormula));
                     }
@@ -244,7 +244,7 @@ public class FormulaValidator {
      */
     private static boolean isValidOperand(String operand) {
         if (operand == null || operand.isEmpty()) {
-            return false;
+            return true;
         }
 
         // 处理负号开头的情况
@@ -252,22 +252,22 @@ public class FormulaValidator {
 
         // 1. 常量π
         if (CONSTANTS.contains(checkOperand)) {
-            return true;
+            return false;
         }
 
         // 2. 纯数字
         if (checkOperand.matches("\\d+(\\.\\d+)?")) {
-            return true;
+            return false;
         }
 
         // 3. 中文参数名
-        // 正则说明：[\u4e00-\u9fa5] 中文 | [0-9] 数字 | [a-zA-Z] 字母 | [（）] 中文括号
+        // 正则说明：[一-龥] 中文 | [0-9] 数字 | [a-zA-Z] 字母 | [（）] 中文括号
         if (checkOperand.matches("[\\u4e00-\\u9fa50-9a-zA-Z（）]+")) {
             // 确保参数名至少包含一个中文
-            return checkOperand.matches(".*[\\u4e00-\\u9fa5]+.*");
+            return !checkOperand.matches(".*[\\u4e00-\\u9fa5]+.*");
         }
 
-        return false;
+        return true;
     }
 
     /**
diff --git a/src/main/java/com/xdap/self_development/utils/RedisLockUtil.java b/src/main/java/com/xdap/self_development/utils/RedisLockUtils.java
similarity index 97%
rename from src/main/java/com/xdap/self_development/utils/RedisLockUtil.java
rename to src/main/java/com/xdap/self_development/utils/RedisLockUtils.java
index 05e3148..b3d2b96 100644
--- a/src/main/java/com/xdap/self_development/utils/RedisLockUtil.java
+++ b/src/main/java/com/xdap/self_development/utils/RedisLockUtils.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 import java.util.concurrent.TimeUnit;
 
 @Component
-public class RedisLockUtil {
+public class RedisLockUtils {
 
     @Autowired
     private StringRedisTemplate redisTemplate;
diff --git a/src/main/resources/application-s.properties b/src/main/resources/application-s.properties
deleted file mode 100644
index fe86cfc..0000000
--- a/src/main/resources/application-s.properties
+++ /dev/null
@@ -1,270 +0,0 @@
-#xdap.singleAdminAppUrl=http://10.20.52.58:30607/xdap-app
-mpaas.logging.level=DEBUG
-mpaas.mode=DEV
-aliyun.oss.accessKeyId=LTAI4GEC6ssfFDuVDUL3TbLp
-aliyun.oss.accessKeySecret=ZpbgWTt2qfK68lQILqj0H3EdIun1Qf
-aliyun.oss.endpoint=http://oss-cn-shanghai.aliyuncs.com
-apaas.admin.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-apaas.admin.datasource.password=123456
-apaas.admin.datasource.type=mysql
-apaas.admin.datasource.url=jdbc:mysql://127.0.0.1:3306/test?serverTimezone=Asia/Shanghai&characterEncoding=utf-8
-apaas.admin.datasource.username=root
-apaas.bizevent.async=false
-apaas.cache.usemq=true
-apaas.deploy.type=null
-apaas.hikariConfig.maxLifetimeMs=28800000
-apaas.oauth.app.appOauthOAuthUserUrl=http://mpaas.app.yuchai.com/oauth2/oauth/user
-apaas.oauth.app.appOauthTokenUrl=http://mpaas.app.yuchai.com/oauth2/oauth/token
-apaas.oauth.app.appOauthUserSchemaJsonPath=$.userName
-apaas.single.app-group-app-ids=2b5b3de8-e7fd-406a-a59a-d5568457b1f4
-apaas.single.appId=771297120740179968
-apaas.single.datasource.mongoDbName=mongDB01
-apaas.single.datasource.mongoPoolConfig.maintenanceFrequency=600
-apaas.single.datasource.mongoPoolConfig.maintenanceInitialDelay=240
-apaas.single.datasource.mongoPoolConfig.maxConnectionIdleTime=3600
-apaas.single.datasource.mongoPoolConfig.maxConnectionLifeTime=3600
-apaas.single.datasource.mongoPoolConfig.maxSize=100
-apaas.single.datasource.mongoPoolConfig.maxWaitQueueSize=500
-apaas.single.datasource.mongoPoolConfig.maxWaitTime=120
-apaas.single.datasource.mongoPoolConfig.minSize=0
-apaas.single.datasource.mongoUrl=mongodb://localhost:27017/xdap_app_223770822127386625
-apaas.single.private=true
-apaas.single.tenantId=223770822127386625
-apaas.tenant.init.db.initial-pool-size=30
-apaas.tenant.init.db.max-pool-size=1000
-apaas.tenant.initDataModel=true
-apaasworkwechat.message.workWechatUrlPre=null
-apaasworkwechat.message.wxOAuth2url=https://open.weixin.qq.com/connect/oauth2/authorize?appid=${CORPID!""}&redirect_uri=${URL!""}callback%2Fwe-com%2Findex.html&response_type=code&scope=snsapi_privateinfo&state=${STATE!""}&agentid=${AGENTID!""}#wechat_redirect
-baidu.ocr.accessTokenKey=BAIDU_OCR_KEY
-baidu.ocr.accessTokenUrl=https://aip.baidubce.com/oauth/2.0/token?
-baidu.ocr.apiKey=HHRFL3VPtnj7Nle60ytbGMls
-baidu.ocr.appId=23499932
-baidu.ocr.basicGeneralUrl=https://aip.baidubce.com/rest/2.0/ocr/v1/accurate_basic
-baidu.ocr.businessCardUrl=https://aip.baidubce.com/rest/2.0/ocr/v1/business_card
-baidu.ocr.secretKey=VTvrrMjZZC1xtYfu82cfUhjeYgNTRIHe
-baidu.ocr.vatInvoiceUrl=https://aip.baidubce.com/rest/2.0/ocr/v1/vat_invoice
-deploy.backend.platform.host=10.20.52.11
-deploy.backend.platform.port=30607
-deploy.backend.singleapp.host=apaas-meim.app.yuchai.com
-deploy.front.platform.host=apaas-meim.app.yuchai.com
-deploy.front.platform.port=443
-deploy.front.singleapp.app.prefix=app/a5e8e08/ycgf-yf-rddata
-deploy.front.singleapp.host=apaas-meim.app.yuchai.com
-deploy.front.singleapp.m.prefix=m/a5e8e08/ycgf-yf-rddata
-deploy.front.workbench.host=apaas-meim.app.yuchai.com
-deploy.front.workbench.port=443
-deploy.powerjob.address=127.0.0.1:7700
-deploy.rabbit.host=8.130.180.9
-deploy.rabbit.password=password
-deploy.rabbit.port=5672
-deploy.rabbit.username=admin
-deploy.redis.host=8.130.180.9
-deploy.redis.password=lys5132
-deploy.redis.port=6379
-dingding.appAccessTokenUrl=https://oapi.dingtalk.com/gettoken
-dingding.authUrlPre=https://login.dingtalk.com/oauth2/auth?
-dingding.pageLink=null
-dingding.redirectUri=redirect_uri=https%3A%2F%2Fapaas-meim.app.yuchai.com%2Fapp%2Fa5e8e08%2Fycgf-yf-rddata%2Fcallback%2Fdingding%2Findex.html&response_type=code&prompt=consent&scope=openid
-dingding.sendMessageUrl=https://api.dingtalk.com/v1.0/robot/oToMessages/batchSend
-dingding.userAccessTokenUrl=https://api.dingtalk.com/v1.0/oauth2/userAccessToken
-dingding.userIdByMobileUrl=https://oapi.dingtalk.com/topapi/v2/user/getbymobile
-dingding.userInfoUrl=https://api.dingtalk.com/v1.0/contact/users/me
-download.config.downloadType=PERMANENT
-download.config.effectiveTime=168
-download.config.privateKeyHex=4b6b9fa1be0757bf4977344c634c4ac2b0c907cd3b225ea16b674b8348ffdcde
-download.config.publicKeyHex=04919f2130b035e29f079b4dace907e3cad716556f93574f1f2d61685f6a5ac251cba81822062353a07fd69f2c544f2263f217e04b3af327453c1f9157a434e0de
-feign.client.config.default.connect-timeout=20000
-feign.client.config.default.read-timeout=50000
-feign.hystrix.enabled=false
-feishu.feiShuRedirectUri=redirect_uri=https%3A%2F%2Fapaas-meim.app.yuchai.com%2Fapp%2Fa5e8e08%2Fycgf-yf-rddata%2Fcallback%2Ffeishu%2Findex.html
-feishu.feiShuUrlPre=https://open.feishu.cn/open-apis/authen/v1/index?
-feishu.getOpenIdUrl=https://open.feishu.cn/open-apis/user/v1/batch_get_id?mobiles=
-feishu.getTokenUrl=https://open.feishu.cn/open-apis/auth/v3/app_access_token/internal/
-fileformat.whiteList[0]=.jpg
-fileformat.whiteList[10]=.gif
-fileformat.whiteList[11]=.pdf
-fileformat.whiteList[12]=.txt
-fileformat.whiteList[13]=.zip
-fileformat.whiteList[14]=.rar
-fileformat.whiteList[15]=.mp3
-fileformat.whiteList[16]=.mp4
-fileformat.whiteList[17]=.avi
-fileformat.whiteList[18]=.mov
-fileformat.whiteList[19]=.md
-fileformat.whiteList[1]=.jpeg
-fileformat.whiteList[20]=.json
-fileformat.whiteList[21]=.7z
-fileformat.whiteList[22]=.tar
-fileformat.whiteList[23]=.gz
-fileformat.whiteList[24]=.csv
-fileformat.whiteList[25]=.xml
-fileformat.whiteList[26]=.jar
-fileformat.whiteList[27]=.log
-fileformat.whiteList[28]=.keystore
-fileformat.whiteList[29]=.xlsm
-fileformat.whiteList[2]=.jfif
-fileformat.whiteList[30]=.yml
-fileformat.whiteList[31]=.yaml
-fileformat.whiteList[32]=.properties
-fileformat.whiteList[33]=.xml
-fileformat.whiteList[34]=.dfy
-fileformat.whiteList[35]=.dfyx
-fileformat.whiteList[36]=.svg
-fileformat.whiteList[37]=.hex
-fileformat.whiteList[3]=.png
-fileformat.whiteList[4]=.xls
-fileformat.whiteList[5]=.xlsx
-fileformat.whiteList[6]=.doc
-fileformat.whiteList[7]=.docx
-fileformat.whiteList[8]=.ppt
-fileformat.whiteList[9]=.pptx
-i18n.backendProjects[0]=app
-i18n.backendProjects[1]=platform
-i18n.backendProjects[2]=workbench
-i18n.frontProjects[0]=app
-i18n.frontProjects[10]=xui
-i18n.frontProjects[1]=app-h5
-i18n.frontProjects[2]=common
-i18n.frontProjects[3]=platform-admin
-i18n.frontProjects[4]=workbench
-i18n.frontProjects[5]=workbench-h5
-i18n.frontProjects[6]=x-dcloud-business-event
-i18n.frontProjects[7]=x-dcloud-page-engine
-i18n.frontProjects[8]=x-dcloud-page-mobile
-i18n.frontProjects[9]=x-dcloud-page-web
-license.path=/data/resources/license.lic
-license.publicKeyStorePath=/data/resources/publicCerts.keystore
-logging.config=classpath:logback-spring.xml
-logging.file=log/xdap-app.log
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=*
-management.health.db.enabled=false
-mpaas.datasource[0].driver-class-name=com.mysql.cj.jdbc.Driver
-mpaas.datasource[0].maxPoolSize=1000
-mpaas.datasource[0].minPoolSize=50
-mpaas.datasource[0].name=xdap_app_223770822127386625
-mpaas.datasource[0].password=123456
-mpaas.datasource[0].type=mysql
-mpaas.datasource[0].url=jdbc:mysql://127.0.0.1:3306/yc_datasource_0?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf-8
-mpaas.datasource[0].username=root
-mpaas.datasource[1].name=test_demo
-mpaas.datasource[1].password=123456
-mpaas.datasource[1].type=mysql
-mpaas.datasource[1].url=jdbc:mysql://127.0.0.1:3306/yc_datasource_1?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf-8
-mpaas.datasource[1].username=root
-mpaas.datasource[2].name=template_db2
-mpaas.datasource[2].password=123456
-mpaas.datasource[2].type=mysql
-mpaas.datasource[2].url=jdbc:mysql://127.0.0.1:3306/yc_datasource_2?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf-8
-mpaas.datasource[2].username=root
-mpaas.datasource[3].name=yc_lrs_test_relsult
-mpaas.datasource[3].password=123456
-mpaas.datasource[3].type=mysql
-mpaas.datasource[3].url=jdbc:mysql://127.0.0.1:3306/yc_lrs_test_relsult?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf-8
-mpaas.datasource[3].username=root
-mpaas.query.bigdatathresholdvalue=100000
-mpaas.query.dbadatper=mysql
-mpaas.query.dbvendor=mysql
-mpaas.query.security.mode=custom
-mpaas.security=false
-powerjob.akka-port=27777
-powerjob.app-name=49b90be5-eebe-4359-a
-powerjob.enable-test-mode=false
-powerjob.server-address=127.0.0.1:7700
-powerjob.store-strategy=disk
-powerjob.worker.akka-port=27777
-powerjob.worker.app-name=49b90be5-eebe-4359-a
-powerjob.worker.enable-test-mode=true
-powerjob.worker.enabled=false
-powerjob.worker.server-address=127.0.0.1:7700
-powerjob.worker.store-strategy=disk
-server.compression.enabled=true
-server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,application/javascript,text/css
-server.compression.min-response-size=2048
-server.port=9091
-spring.application.name=a5e8e08-ycgf-yf-rddata
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.password=123456
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/activiti?serverTimezone=Asia/Shanghai&characterEncoding=utf-8
-spring.datasource.username=root
-spring.activiti.database-schema-update = true
-spring.activiti.do-history-used = true
-spring.activiti.history-level = full
-spring.activiti.check-process-definitions = true
-activiti.datasource.driverClassName=com.mysql.jdbc.Driver
-activiti.datasource.inIdle=5
-activiti.datasource.initialSize=5
-activiti.datasource.maxActive=50
-activiti.datasource.password=123456
-activiti.datasource.url=jdbc:mysql://127.0.0.1:3306/activiti_demo?serverTimezone=Asia/Shanghai&characterEncoding=utf-8
-activiti.datasource.username=root
-spring.cloud.nacos.config.enabled=false
-spring.cloud.nacos.config.refresh-enabled=false
-spring.cloud.nacos.discovery.enabled=false
-spring.cloud.nacos.discovery.instance-enabled=false
-spring.jackson.default-property-inclusion=non_null
-spring.rabbitmq.host=8.130.180.9
-spring.rabbitmq.password=password
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=admin
-spring.redis.database=0
-spring.redis.host=8.130.180.9
-spring.redis.password=lys5132
-spring.redis.jedis.pool.max-active=20
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.min-idle=0
-spring.redis.port=6379
-spring.redis.timeout=10000
-spring.servlet.multipart.max-file-size=150MB
-spring.servlet.multipart.max-request-size=200MB
-standard.plan.appTtlMillis=3600000
-standard.plan.userTtlMillis=7200000
-token.openTokenRefreshTtlMillis=1209600000
-token.openTokenTtlMillis=7200000
-token.refreshTtlMillis=1209600000
-token.ttlMillis=7200000
-xdap.adminUrl=gateway.yctp.yuchaidev.com/apaas/xdap-admin
-xdap.apaas.cache.run.init=true
-xdap.apaas.dbselectPriv=false
-xdap.apaas.decryptProperties=DO_ENCRYPT
-xdap.apaas.interface.encrypt.appEncryptionForceOpen=DISABLE
-xdap.apaas.interface.encrypt.appEncryptionStatus=DISABLE
-xdap.apaas.interface.encrypt.appEncryptionType=SM2
-xdap.apaas.interface.encrypt.encryptType=DISABLE
-xdap.apaas.interface.encrypt.privateKeyHex=4b6b9fa1be0757bf4977344c634c4ac2b0c907cd3b225ea16b674b8348ffdcde
-xdap.apaas.interface.encrypt.publicKeyHex=04919f2130b035e29f079b4dace907e3cad716556f93574f1f2d61685f6a5ac251cba81822062353a07fd69f2c544f2263f217e04b3af327453c1f9157a434e0de
-xdap.apaas.private=true
-xdap.apaas.zuc.iv=null
-xdap.apaas.zuc.k=null
-xdap.appUrl=http://127.0.0.1:${server.port:9091}/xdap-app
-xdap.avatar.adminBucketName=xdap-admin-dev
-xdap.avatar.adminPrefix=https://apaas-meim.app.yuchai.com/apaas/platform/xdap-admin/attachments/downloadFile?file=
-xdap.avatar.bucketName=xdap-app-dev
-xdap.avatar.enableDynamicsPrefix=false
-xdap.avatar.localPath=/data/resources/attachments/
-xdap.avatar.path=/resource/head_portrait/
-xdap.avatar.prefix=/xdap-app/attachments/downloadFile?file=
-xdap.gatewayUrl=gateway.yctp.yuchaidev.com/apaas/gateway
-xdap.header.accessControlAllowOrigin[0]=*
-xdap.invitation.prefix=http://k8s.definesys.com:31005/x-project-app/blank/invite?inviteCode=
-xdap.jobServerUrl=http://localhost:7700
-xdap.jobUrl=http://127.0.0.1:${server.port:9091}/xdap-job
-xdap.openappUrl=http://127.0.0.1:${server.port:9091}/xdap-app
-xdap.password.forceModify=DISABLE
-xdap.password.passwordValidateMessage=\u5bc6\u7801\u9700\u5305\u542b\u6570\u5b57\u3001\u5b57\u6bcd\u5927\u5c0f\u5199\u548c\u7279\u6b8a\u5b57\u7b26\uff0c\u4e0d\u5c11\u4e8e8\u4f4d
-xdap.password.passwordValidateRule=^.*(?=.{8,32})(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*?.() +-_~,=]).*$
-xdap.process.batchOption=20
-xdap.process.suspendTimeFlag=ENABLE
-xdap.resource.path=i18n/platform/platform_en_US.properties,i18n/platform/platform_zh_CN.properties,i18n/workbench/workbench_en_US.properties,i18n/workbench/workbench_zh_CN.properties,i18n/app/app_en_US.properties,i18n/app/app_zh_CN.properties,i18n/app/app_ja_JP.properties
-xdap.share.editAfterShareUrl=/xdap-app/formShareSkip/skip/shareUrl?shareId=
-xdap.share.frontSingleAppHost=https://apaas-meim.app.yuchai.com/app/a5e8e08/ycgf-yf-rddata/
-xdap.share.frontSingleMobileHost=https://apaas-meim.app.yuchai.com/m/a5e8e08/ycgf-yf-rddata/
-xdap.share.mobileSkipUrl=blank/public-form?shareId=
-xdap.share.pcSkipUrl=blank/public-form?shareId=
-xdap.skipDetailurl=https://apaas-meim.app.yuchai.com/app/a5e8e08/ycgf-yf-rddata/%s/app/app-page?appId=%s&formId=%s&title=%s&currentMenu=%s&documentId=%s
-xdap.skipurl=https://apaas-meim.app.yuchai.com/app/a5e8e08/ycgf-yf-rddata/%s/app/app-page?appId=%s&formId=%s&title=%s&currentMenu=%s
-xdap.snow.data-center-id=0
-xdap.snow.workId=192
-xdap.todocenter=https://apaas-meim.app.yuchai.com/workbench/app/%s/todoCenter/myTodo
-xdap.todourl=https://apaas-meim.app.yuchai.com/workbench/app/%s/todoCenter/myTodo/?formId=%s&documentId=%s&processId=%s
\ No newline at end of file
diff --git a/src/main/resources/sql.sql b/src/main/resources/sql.sql
deleted file mode 100644
index be80aba..0000000
--- a/src/main/resources/sql.sql
+++ /dev/null
@@ -1,545 +0,0 @@
--- 发起事项表
-CREATE TABLE `initiated_task`
-(
-    `id`                varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'ID',
-    `document_no`       varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '单据编号',
-    `process_title`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '流程主题',
-    `current_node`      varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '当前环节',
-    `current_processor` text COLLATE utf8mb4_bin COMMENT '当前处理人',
-    `status_code`       varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '状态代号',
-    `model_id`          varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '产品机型ID',
-    `model_name`        varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '产品型号名称',
-    `data_type`         varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '数据类型',
-    `version_number`    int                                                    DEFAULT NULL COMMENT '版本',
-    `is_delete`         int                                                    DEFAULT NULL COMMENT '删除标记0未删除，1 已删除',
-    `created_by_id`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '创建人ID',
-    `created_by`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '创建人',
-    `creation_date`     datetime                                               DEFAULT NULL COMMENT '创建时间',
-    `last_updated_by`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '最后更新人',
-    `last_update_date`  datetime                                               DEFAULT NULL COMMENT '最后更新时间',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_bin COMMENT ='发起事项表';
-
--- 已完成事项表
-CREATE TABLE `completed_task`
-(
-    `id`                varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'ID',
-    `document_no`       varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '单据编号',
-    `process_title`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '流程主题',
-    `current_node`      varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '当前环节',
-    `current_processor` text COLLATE utf8mb4_bin COMMENT '当前处理人',
-    `status_code`       varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '状态代号',
-    `model_id`          varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '产品机型ID',
-    `model_name`        varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '产品型号名称',
-    `data_type`         varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '数据类型（如玉柴）',
-    `version_number`    int                                                    DEFAULT NULL COMMENT '版本',
-    `owner_id`          varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '所属人',
-    `is_delete`         int                                                    DEFAULT NULL COMMENT '删除标记0未删除，1 已删除',
-    `created_by_id`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '创建人ID',
-    `created_by`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '创建人',
-    `creation_date`     datetime                                               DEFAULT NULL COMMENT '创建时间',
-    `last_updated_by`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  DEFAULT NULL COMMENT '最后更新人',
-    `last_update_date`  datetime                                               DEFAULT NULL COMMENT '最后更新时间',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_bin COMMENT ='已完成事项表';
-
-
-DROP TABLE IF EXISTS `yfsjglpt_model_approval_flow`;
--- yc_datasource_0.approval_config definition
-
-CREATE TABLE `approval_config`
-(
-    `id`               varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'ID',
-    `approval_id`      varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '流程ID',
-    `node_name`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '环节',
-    `assignees`        text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '处理人列表',
-    `node_order`       int                                                   DEFAULT NULL COMMENT '环节顺序',
-    `created_by`       varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建人',
-    `creation_date`    datetime                                              DEFAULT NULL COMMENT '创建时间',
-    `last_updated_by`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '最后更新人',
-    `last_update_date` datetime                                              DEFAULT NULL COMMENT '最后更新时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='流程配置表';
-
-
-CREATE TABLE `yfsjglpt_model_approval_flow`
-(
-    `id`                varchar(64) COLLATE utf8mb4_general_ci NOT NULL,
-    `process_title` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程标题',
-    `template_id`       varchar(64) COLLATE utf8mb4_general_ci NOT NULL COMMENT '关联模板ID',
-    `current_node`      varchar(20) COLLATE utf8mb4_general_ci          DEFAULT NULL COMMENT '当前节点(PROOFREAD, REVIEW, COUNTERSIGN, APPROVE)',
-    `flow_status`       varchar(20) COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程状态',
-    `proofread_users`   text COLLATE utf8mb4_general_ci        NOT NULL COMMENT '校对人员',
-    `review_users`      text COLLATE utf8mb4_general_ci        NOT NULL COMMENT '审核人员',
-    `countersign_users` text COLLATE utf8mb4_general_ci COMMENT '会签人员(可选)',
-    `approve_users`     text COLLATE utf8mb4_general_ci        NOT NULL COMMENT '批准人员',
-    `create_by`         varchar(64) COLLATE utf8mb4_general_ci NOT NULL,
-    `created_time`      timestamp                              NULL     DEFAULT CURRENT_TIMESTAMP,
-    `flow_type`         int(11)                                NOT NULL DEFAULT '1' COMMENT '流程类型:1模板审批流程,2对标审批流程',
-    `explanation`       varchar(255) COLLATE utf8mb4_general_ci         DEFAULT NULL,
-    `return_num` int(11) DEFAULT 0 COMMENT '退回次数',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT '流程表';
-
-
-DROP TABLE IF EXISTS `yfsjglpt_model_approval_record`;
-
-CREATE TABLE `yfsjglpt_model_approval_record`
-(
-    `id`            varchar(64) COLLATE utf8mb4_general_ci NOT NULL,
-    `flow_id`       varchar(64) COLLATE utf8mb4_general_ci NOT NULL,
-    `node`          varchar(20) COLLATE utf8mb4_general_ci NOT NULL,
-    `user_id`       varchar(64) COLLATE utf8mb4_general_ci NOT NULL COMMENT '处理人',
-    `opinion`       varchar(255) COLLATE utf8mb4_general_ci     DEFAULT NULL COMMENT '审批意见',
-    `result`        varchar(10) COLLATE utf8mb4_general_ci NOT NULL COMMENT '结果(PASS, REJECT)',
-    `approval_time` timestamp                              NULL DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT '流程节点表';
-
-
-DROP TABLE IF EXISTS `yfsjglpt_model_benchmarking_report`;
-
-CREATE TABLE `yfsjglpt_model_benchmarking_report`
-(
-    `id`                        varchar(64) COLLATE utf8mb4_general_ci  NOT NULL,
-    `title`                     varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题名称',
-    `manufacturer_name`         varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '厂家名称（全称）',
-    `model_name`                varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '产品型号（全称）',
-    `module`                    varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '领域/模块',
-    `manufacturer_abbreviation` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '厂家简称',
-    `model_abbreviation`        varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '产品型号简称',
-    `product_number`            varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '产品编号',
-    `plate`                     varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '板块',
-    `platform`                  varchar(100) COLLATE utf8mb4_general_ci      DEFAULT NULL COMMENT '平台',
-    `series`                    varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '系列',
-    `market_segment`            varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '细分市场',
-    `project_name`              varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目名称',
-    `project_number`            varchar(100) COLLATE utf8mb4_general_ci      DEFAULT NULL COMMENT '项目编号',
-    `upload_time`               timestamp                               NULL DEFAULT CURRENT_TIMESTAMP COMMENT '上传时间',
-    `create_by`                 varchar(64) COLLATE utf8mb4_general_ci  NOT NULL COMMENT '上传人',
-    `file_path`                 varchar(500) COLLATE utf8mb4_general_ci      DEFAULT NULL COMMENT '文件地址',
-    `status`                    varchar(20) COLLATE utf8mb4_general_ci       DEFAULT 'DRAFT' COMMENT '状态 DRAFT(草稿)、APPROVING（审批中）、COMPLETE(已完成)、RETURNED(已撤回)、REJECTED(已拒绝)',
-    `is_delete` int(11) DEFAULT 0 COMMENT '删除标志',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='对标报告表';
-
-
-DROP TABLE IF EXISTS `yfsjglpt_model_parameter`;
-
-CREATE TABLE `yfsjglpt_model_parameter`
-(
-    `id`                varchar(64) COLLATE utf8mb4_general_ci  NOT NULL,
-    `parameter_number`  int(11)                                 DEFAULT NULL COMMENT '序号',
-    `subsystem_name`    varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '子系统',
-    `parameter_type`    varchar(30) COLLATE utf8mb4_general_ci  DEFAULT NULL COMMENT '类型',
-    `parts_name`        varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '零部件名称',
-    `parameter_name`    varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '参数名称',
-    `unit`              varchar(10) COLLATE utf8mb4_general_ci  DEFAULT NULL COMMENT '单位',
-    `parameter_source`  varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '参数计划来源',
-    `number_or_formula` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '当前可适用的分类属性表编号（需要修订）或公式',
-    `department`        varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '填写部门',
-    `remarks`           varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
-    `created_by`        varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建者',
-    PRIMARY KEY (`id`),
-    KEY `idx_subsystem_name` (`subsystem_name`),
-    KEY `idx_type` (`parameter_type`),
-    KEY `idx_parts_name` (`parts_name`),
-    KEY `idx_parameter_name` (`parameter_name`),
-    KEY `idx_department` (`department`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='参数表';
-
-
-DROP TABLE IF EXISTS `yfsjglpt_model_parameter_and_template`;
-
-CREATE TABLE `yfsjglpt_model_parameter_and_template`
-(
-    `id`           varchar(64) COLLATE utf8mb4_general_ci NOT NULL,
-    `parameter_id` varchar(64) COLLATE utf8mb4_general_ci NOT NULL,
-    `template_id`  varchar(64) COLLATE utf8mb4_general_ci NOT NULL,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `uk_template_parameter` (`template_id`, `parameter_id`),
-    KEY `idx_parameter_id` (`parameter_id`),
-    KEY `idx_template_id` (`template_id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='模板参数关联表';
-
-DROP TABLE IF EXISTS `yfsjglpt_model_template`;
-
-CREATE TABLE `yfsjglpt_model_template`
-(
-    `id`             varchar(64) COLLATE utf8mb4_general_ci  NOT NULL,
-    `template_name`  varchar(100) COLLATE utf8mb4_general_ci NOT NULL,
-    `version`        int(11)                                 NOT NULL DEFAULT '1',
-    `status`         varchar(20) COLLATE utf8mb4_general_ci  NOT NULL DEFAULT '草稿' COMMENT '草稿, 已发布, 审核中',
-    `created_time`   timestamp                               NULL     DEFAULT CURRENT_TIMESTAMP,
-    `published_time` timestamp                               NULL     DEFAULT NULL,
-    `order_num`      int                                     NOT NULL DEFAULT '1',
-    `create_by`      varchar(10) COLLATE utf8mb4_general_ci  NOT NULL,
-    `return_num` int(11) DEFAULT 0 COMMENT '退回次数',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `uk_template_version` (`template_name`, `version`),
-    KEY `idx_template_name` (`template_name`),
-    KEY `idx_status` (`status`),
-    KEY `idx_created_time` (`created_time`),
-    KEY `idx_create_by` (`create_by`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='模板表';
-
-
-
-DROP TABLE IF EXISTS `yfsjglpt_model_revision_record`;
-
-CREATE TABLE `yfsjglpt_model_revision_record`
-(
-    `id`               varchar(64) COLLATE utf8mb4_general_ci  NOT NULL,
-    `template_name`    varchar(100) COLLATE utf8mb4_general_ci NOT NULL,
-    `version`          varchar(10) COLLATE utf8mb4_general_ci  NOT NULL DEFAULT '1',
-    `parameter_number` int(11)                                          DEFAULT NULL COMMENT '序号',
-    `modify_details`   text COLLATE utf8mb4_general_ci,
-    `template_id`      varchar(64) COLLATE utf8mb4_general_ci  NOT NULL,
-    `pre_template_id`  varchar(64) COLLATE utf8mb4_general_ci           DEFAULT NULL,
-    `create_time`      timestamp                               NULL     DEFAULT CURRENT_TIMESTAMP,
-    `parameter_id`     varchar(64) COLLATE utf8mb4_general_ci  NOT NULL,
-    `return_num` int(11) DEFAULT 0 COMMENT '退回次数',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='变更记录表';
-
-
-
-DROP TABLE IF EXISTS `yfsjglpt_model_responsible_person`;
-CREATE TABLE `yfsjglpt_model_responsible_person`
-(
-    `id`            varchar(50) COLLATE utf8mb4_general_ci                        NOT NULL COMMENT 'ID',
-    `department_id` varchar(128) COLLATE utf8mb4_general_ci                       NOT NULL COMMENT '填写部门id',
-    `user_id`       varchar(50) COLLATE utf8mb4_general_ci                        NOT NULL COMMENT '责任人id',
-    `department`    varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '部门名',
-    `subsystem`     varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '子系统',
-    `parts_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '零部件名称',
-    `person_level`  int(11)                                                       NOT NULL DEFAULT '1' COMMENT '1：责任人；2：填写人',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='责任人表';
-
-DROP TABLE IF EXISTS yfsjglpt_common_parameter;
-CREATE TABLE yfsjglpt_common_parameter
-(
-    `id`          varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID',
-    `common_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '常用名称',
-    `common_type` int COLLATE utf8mb4_general_ci                               NOT NULL COMMENT '常用类型',
-    `create_by`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='常用参数表';
-
-DROP TABLE IF EXISTS yfsjglpt_model_common_parameters;
--- 新增机型参数常用参数表
-CREATE TABLE yfsjglpt_model_common_parameters
-(
-    `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID',
-    `parameter_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数ID',
-    `common_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '常用id',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='机型参数常用参数表';
-
-DROP TABLE IF EXISTS yfsjglpt_analysis_common_parameters;
--- 新增分析常用参数表
-CREATE TABLE yfsjglpt_analysis_common_parameters
-(
-    `id`               varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID',
-    `model_name`       varchar(100) COLLATE utf8mb4_general_ci                      NOT NULL COMMENT '产品型号',
-    `plate`            varchar(100) COLLATE utf8mb4_general_ci                      NOT NULL COMMENT '板块',
-    `platform`         varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台',
-    `series`           varchar(100) COLLATE utf8mb4_general_ci                      NOT NULL COMMENT '系列',
-    `project_name`     varchar(100) COLLATE utf8mb4_general_ci                      NOT NULL COMMENT '项目名称',
-    `project_number`   varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目编号',
-    `emission`         bigint COLLATE utf8mb4_general_ci       DEFAULT NULL COMMENT '排放',
-    `displacement_min` bigint COLLATE utf8mb4_general_ci       DEFAULT NULL COMMENT '排放下限',
-    `displacement_max` bigint COLLATE utf8mb4_general_ci       DEFAULT NULL COMMENT '排放上限',
-    `combustion_type`  varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '燃烧类型',
-    `common_id`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '常用id',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='统计分析常用参数表';
-
-
--- 角色表
-DROP TABLE IF EXISTS yfsjglpt_model_roles;
-CREATE TABLE yfsjglpt_model_roles
-(
-    `id`            VARCHAR(64)  NOT NULL COMMENT 'ID',
-    `role_name`     VARCHAR(128) NOT NULL COMMENT '角色名称',
-    `role_code`     VARCHAR(128) COMMENT '角色代号',
-    `role_description` VARCHAR(128) COMMENT '角色描述',
-    `is_enabled`    INT(128) DEFAULT 1 COMMENT '是否启用',
-    `created_by`    VARCHAR(64) COMMENT '创建人',
-    `creation_date` DATETIME COMMENT '创建时间',
-    `last_updated_by` VARCHAR(64) COMMENT '最后更新人',
-    `last_update_date` DATETIME COMMENT '最后更新时间',
-    PRIMARY KEY (`id`)
-) COMMENT '角色表';
-
--- 菜单权限
-
-DROP TABLE IF EXISTS yfsjglpt_model_menu_dictionary;
-CREATE TABLE yfsjglpt_model_menu_dictionary
-(
-    `id`            VARCHAR(64) NOT NULL COMMENT 'ID',
-    `parent_id`     VARCHAR(64) COMMENT '上级ID',
-    `menu_name`     VARCHAR(64) COMMENT '菜单名称',
-    `menu_code`     VARCHAR(64) COMMENT '菜单代码',
-    `menu_desc`     VARCHAR(128) COMMENT '菜单描述',
-    `is_enable`     INT DEFAULT 1 COMMENT '是否可用',
-    `created_by`    VARCHAR(64) COMMENT '创建人',
-    `creation_date` DATETIME COMMENT '创建时间',
-    `last_updated_by` VARCHAR(64) COMMENT '最后更新人',
-    `last_update_date` DATETIME COMMENT '最后更新时间',
-    PRIMARY KEY (`id`)
-) COMMENT '菜单字典表';
-
-
--- 菜单参数关联表(权限路径表)
-DROP TABLE IF EXISTS yfsjglpt_model_menu_parameter;
-CREATE TABLE yfsjglpt_model_menu_parameter
-(
-    `id`            VARCHAR(64) NOT NULL COMMENT 'ID',
-    `menu_id`       VARCHAR(128) COMMENT '菜单ID',
-    `subsystem`     VARCHAR(64) COMMENT '子系统',
-    `parameter_id`  VARCHAR(64) COMMENT '参数ID',
-    `parameter_per` INT COMMENT '参数权限;1：查看；2：编辑',
-    `created_by`    VARCHAR(64) COMMENT '创建人',
-    `creation_date` DATETIME COMMENT '创建时间',
-    `last_updated_by` VARCHAR(64) COMMENT '最后更新人',
-    `last_update_date` DATETIME COMMENT '最后更新时间',
-    PRIMARY KEY (`id`)
-) COMMENT '菜单参数关联表(权限路径表)';
-
--- 部门或用户关联角色表
-DROP TABLE IF EXISTS yfsjglpt_model_dep_user_role;
-CREATE TABLE yfsjglpt_model_dep_user_role
-(
-    `id`            VARCHAR(64) NOT NULL COMMENT 'ID',
-    `user_or_dep`   VARCHAR(64) COMMENT '用户或部门ID',
-    `role_id`       VARCHAR(64) COMMENT '角色ID',
-    `is_dep`        INT COMMENT '是否是部门;0：个人；1：部门',
-    `is_enable`     INT COMMENT '是否启用;0：未启用；1：启用',
-    `created_by`    VARCHAR(64) COMMENT '创建人',
-    `creation_date` DATETIME COMMENT '创建时间',
-    `last_updated_by` VARCHAR(64) COMMENT '最后更新人',
-    `last_update_date` DATETIME COMMENT '最后更新时间',
-    PRIMARY KEY (`id`)
-) COMMENT '部门或用户关联角色表';
-
-
--- 角色权限关联表
-DROP TABLE IF EXISTS yc_datasource_0.yfsjglpt_model_role_permission;
-CREATE TABLE yc_datasource_0.yfsjglpt_model_role_permission
-(
-    `id`            VARCHAR(64) NOT NULL COMMENT 'ID',
-    `role_id`       VARCHAR(64) COMMENT '角色ID',
-    `per_id`        VARCHAR(64) COMMENT '权限路径ID',
-    `is_enable`     INT DEFAULT 1 COMMENT '是否启用;0：未启用；1：启用',
-    `created_by`    VARCHAR(64) COMMENT '创建人',
-    `creation_date` DATETIME COMMENT '创建时间',
-    `last_updated_by` VARCHAR(64) COMMENT '最后更新人',
-    `last_update_date` DATETIME COMMENT '最后更新时间',
-    PRIMARY KEY (`id`)
-) COMMENT '角色权限关联表';
-
-Drop Table if exists ads_prd_f_yfsjglpt_fdjlbjcjb;
-CREATE TABLE ads_prd_f_yfsjglpt_fdjlbjcjb(
-                                             ztj          VARCHAR(50) COMMENT '状态机',
-                                             lbjth        VARCHAR(255) COMMENT '零部件图号',
-                                             lbjmc        VARCHAR(255) COMMENT '零部件名称'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-    COMMENT='发动机零部件层级表';
-drop table if exists ads_prd_f_tc_flsxb;
-create table ads_prd_f_tc_flsxb(
-                                   PITEM_ID  VARCHAR(100) comment '图号',
-                                   PITEM_REVISION VARCHAR(100) comment '版本号',
-                                   IDATTRTBUTEHAME VARCHAR(100) comment '零部件属性',
-                                   ATTRIBFIELDHAME VARCHAR(100) comment '映射字段名',
-                                   FIELDVALUE VARCHAR(100) comment '零部件属性值'
-) comment 'tc分类属性表';
-
--- test.data_entry_engine_model definition
-drop table if exists data_entry_engine_model;
-CREATE TABLE `data_entry_engine_model` (
-    `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'ID',
-    `yc_or_oth` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '本品或竞品',
-    `model_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '产品型号（全称）',
-    `model_name_simple` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '产品型号简称',
-    `product_number` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '产品编号',
-    `plate` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '板块',
-    `platform` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '平台',
-    `series` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '系列',
-    `market_segment` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '细分市场',
-    `project_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '项目名称',
-    `project_number` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '项目编号',
-    `brand` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '品牌',
-    `production_date` date DEFAULT NULL COMMENT '生产日期',
-    `parameter_num` int(11) DEFAULT NULL COMMENT '标准参数数量',
-    `maintained_parameter_num` int(11) DEFAULT NULL COMMENT '已维护参数数量',
-    `responsible_person_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '责任人表ID',
-    `distribute_status` tinyint(4) DEFAULT NULL COMMENT '分发状态',
-    `version_number` int(11) DEFAULT NULL COMMENT '版本',
-    `is_delete` tinyint(4) DEFAULT NULL COMMENT '是否删除',
-    `created_by` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建人',
-    `creation_date` datetime DEFAULT NULL COMMENT '创建时间',
-    `last_updated_by` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '最后更新人',
-    `last_update_date` datetime DEFAULT NULL COMMENT '最后更新时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='发动机型号数据表';
-
-
--- test.engine_param_detail definition
-drop table if exists engine_param_detail;
-CREATE TABLE `engine_param_detail` (
-    `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'ID',
-    `parameter_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '参数模板表id',
-    `engine_model_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '发动机型号表id',
-    `subsystem_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '子系统',
-    `parameter_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '类型',
-    `parameter_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '参数名称',
-    `parameter_value` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '参数值',
-    `responsible_person_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '责任人',
-    `department` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '填写部门',
-    `filled_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '填写人',
-    `major_version` int(11) DEFAULT NULL COMMENT '大版本（审核通过后变更的）',
-    `minor_version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '小版本（控制是否可以审核）',
-    `version_status` int(11) DEFAULT NULL COMMENT '版本状态(0已通过，1草稿，审核中，3已撤回，4拒绝)',
-    `approval_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '关联的审批流程',
-    `before_param_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '上个版本参数ID',
-    `is_delete` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '是否删除',
-    `operation` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '参数的操作（新增，修改，删除）',
-    `created_by` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建人',
-    `created_date` datetime DEFAULT NULL COMMENT '创建时间',
-    `last_updated_by` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '最后更新人',
-    `last_updated_date` datetime DEFAULT NULL COMMENT '最后更新时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='参数详情';
-
-drop table if exists data_change_comment;
-CREATE TABLE data_change_comment (
-     id VARCHAR(255) PRIMARY KEY COMMENT 'ID',
-     param_detail_id VARCHAR(255) COMMENT '',
-     engine_model_id VARCHAR(255) COMMENT '',
-     subsystem_name VARCHAR(255) COMMENT '',
-     parameter_type VARCHAR(255) COMMENT '',
-     parts_name VARCHAR(255) COMMENT '零部件',
-     parameter_name VARCHAR(255) COMMENT '',
-     parameter_value VARCHAR(255) COMMENT '审批中的值',
-     change_comment VARCHAR(255) COMMENT '变动说明',
-     unit VARCHAR(255) COMMENT '变动说明',
-     created_by VARCHAR(255) COMMENT '创建人',
-     creation_date DATETIME COMMENT '创建时间',
-     last_updated_by VARCHAR(255) COMMENT '最后更新人',
-     last_update_date DATETIME COMMENT '最后更新时间'
-) COMMENT '数据变更评论表';
-
-drop table if exists engine_review_list;
-CREATE TABLE engine_review_list (
-                                    id VARCHAR(255) PRIMARY KEY COMMENT 'ID',
-                                    process_topic VARCHAR(255) COMMENT '流程主题',
-                                    yc_or_oth VARCHAR(255) COMMENT '本品或竞品',
-                                    model_id VARCHAR(255) COMMENT '机型ID',
-                                    model_name VARCHAR(255) COMMENT '产品型号',
-                                    status_code INT COMMENT '状态代号',
-                                    subsystem_name VARCHAR(255) COMMENT '子系统',
-                                    applicant VARCHAR(255) COMMENT '申请人ID',
-                                    status_description VARCHAR(255) COMMENT '当前状态',
-                                    approver_persons VARCHAR(255) COMMENT '当前审批人',
-                                    node_name VARCHAR(255) COMMENT '当前节点',
-                                    review_comment TEXT COMMENT '提交说明',
-                                    created_by VARCHAR(255) COMMENT '创建人',
-                                    creation_date DATETIME COMMENT '创建时间',
-                                    last_updated_by VARCHAR(255) COMMENT '最后更新人',
-                                    last_update_date DATETIME COMMENT '最后更新时间',
-                                    return_num INT COMMENT '退回标记',
-                                    pre_node INT COMMENT '前一个节点'
-) COMMENT '发动机评审列表表';
-
-drop table if exists param_approval_record;
-CREATE TABLE param_approval_record (
-                                       id VARCHAR(255) PRIMARY KEY COMMENT 'ID',
-                                       approval_id VARCHAR(255) COMMENT '流程ID',
-                                       node_name VARCHAR(255) COMMENT '环节名称',
-                                       assignee VARCHAR(255) COMMENT '处理人',
-                                       operator VARCHAR(255) COMMENT '操作',
-                                       operate_time DATETIME COMMENT '操作时间',
-                                       approval_comment TEXT COMMENT '审批说明',
-                                       node_order INT COMMENT '环节顺序',
-                                       created_by VARCHAR(255) COMMENT '创建人',
-                                       creation_date DATETIME COMMENT '创建时间',
-                                       last_updated_by VARCHAR(255) COMMENT '最后更新人',
-                                       last_update_date DATETIME COMMENT '最后更新时间',
-                                       approval_level INT COMMENT ''
-) COMMENT '参数审批记录表';
-
-DELETE
-FROM yfsjglpt_model_template;
-DELETE
-FROM yfsjglpt_model_parameter_and_template;
-DELETE
-FROM yfsjglpt_model_parameter;
-DELETE
-FROM yfsjglpt_model_revision_record;
-DELETE
-FROM yfsjglpt_model_benchmarking_report;
-
-DELETE
-FROM yfsjglpt_model_approval_flow;
-DELETE
-FROM yfsjglpt_model_approval_record;
-
-DELETE
-FROM yfsjglpt_model_responsible_person;
-
-DELETE
-FROM yfsjglpt_model_common_parameters;
-
-DELETE
-FROM yfsjglpt_common_parameter;
-DELETE
-FROM yfsjglpt_analysis_common_parameters;
-
-
-
-delete
-from data_entry_engine_model;
-delete
-from engine_param_detail;
-delete
-from todo_task;
-delete
-from initiated_task;
-delete
-from completed_task;
-delete
-from data_change_comment;
-delete
-from approval_config;
-delete
-from engine_review_list;
-delete
-from param_approval_record;
\ No newline at end of file