From ea74cebeff3ff9f0e0a23c3c1acf5c1e1be1bbc2 Mon Sep 17 00:00:00 2001 From: zjh <15615273395@163.com> Date: Wed, 21 Jan 2026 10:26:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActivitiProcessController.java | 16 +- .../controller/AnalysisCommonController.java | 6 +- .../BenchmarkingReportController.java | 11 +- .../controller/CommonParameterController.java | 4 +- .../controller/DataEntryController.java | 8 +- .../DataEntryEngineModelController.java | 4 +- .../EngineParamDetailController.java | 16 +- .../controller/ParameterController.java | 6 +- .../controller/PermissionController.java | 12 +- .../ResponsiblePersonController.java | 8 +- .../controller/TcDataQueryController.java | 2 +- .../TemplateApprovalController.java | 9 +- .../controller/TemplateController.java | 8 +- .../controller/TodoTaskController.java | 10 +- .../controller/YcTaskResultController.java | 6 +- .../controller/form/ApprovalPersonForm.java | 3 - .../controller/form/ApprovalUserNodeDTO.java | 1 - .../controller/form/ModelCommonItem.java | 2 +- .../form/ModelCommonParameterInsertForm.java | 3 +- .../form/ModelCommonParameterUpdateForm.java | 3 +- .../form/RestartReportApprovalForm.java | 2 +- .../form/SaveBenchmarkingReportForm.java | 2 +- .../controller/form/StartApprovalRequest.java | 2 +- .../form/UpdateBenchmarkingReportForm.java | 3 - .../controller/form/UpdateNodeForm.java | 2 +- .../request/ApprovalNodeRequest.java | 4 +- .../dto/ActivitiDataAndRecordDTO.java | 4 +- .../{pojo => domain}/dto/ActivitiDataDTO.java | 2 +- .../{feign => domain}/dto/AppTokenDTO.java | 2 +- .../{pojo => domain}/dto/ApprovalNodeDTO.java | 2 +- .../dto/ApprovalNodesDTO.java | 2 +- .../dto/DataEntryEngineModelDto.java | 4 +- .../dto/EngineParamDetailDTO.java | 2 +- .../{feign => domain}/dto/FileDataDTO.java | 2 +- .../{feign => domain}/dto/FileUploadDTO.java | 2 +- .../dto/HandleApprovalDTO.java | 2 +- .../{pojo => domain}/dto/PageResultDTO.java | 2 +- .../{pojo => domain}/dto/ShowActivitiDTO.java | 2 +- .../{feign => domain}/dto/UserTokenDT0.java | 2 +- .../dto/YcTodoTaskCommonResultDTO.java | 2 +- .../dto/YcTodoTaskResultDTO.java | 2 +- .../{ => domain}/enums/ApprovalOrderEnum.java | 2 +- .../{ => domain}/enums/CurrentNodeEnum.java | 8 +- .../enums/DistributeStatusEnum.java | 2 +- .../domain/enums/ParamOperationEnum.java | 10 + .../enums/ParamPermissionEnum.java | 2 +- .../enums/ParamValueVersionEnum.java | 2 +- .../enums/ParameterOperationEnum.java} | 8 +- .../pojo/AnalysisCommonParametersPojo.java} | 4 +- .../{ => domain}/pojo/ApprovalConfigPojo.java | 2 +- .../pojo/ApprovalFlowPojo.java} | 4 +- .../pojo/ApprovalRecordPojo.java} | 6 +- .../pojo/ApprovalXdapUsersPojo.java} | 4 +- .../pojo/BenchmarkingReportPojo.java} | 4 +- .../pojo/ClassificationAttributePojo.java} | 4 +- .../pojo/CommonParameterPojo.java} | 4 +- .../{ => domain}/pojo/CompletedTaskPojo.java | 2 +- .../pojo/DataChangeCommentPojo.java | 2 +- .../pojo/DataEntryEngineModelPojo.java | 2 +- .../pojo/EngineParamDetailPojo.java | 2 +- .../pojo/EnginePartsCollectionPojo.java} | 4 +- .../pojo/EngineReviewListPojo.java | 2 +- .../pojo/GlobalParameterPojo.java} | 4 +- .../{ => domain}/pojo/InitiatedTaskPojo.java | 2 +- .../pojo/ModelCommonParametersPojo.java} | 4 +- .../pojo/ModelDepUserRolePojo.java | 2 +- .../pojo/ModelMenuDictionaryPojo.java | 2 +- .../pojo/ModelMenuParameterPojo.java | 2 +- .../pojo/ModelRolePermissionPojo.java | 4 +- .../{ => domain}/pojo/ModelRolesPojo.java | 2 +- .../pojo/ParamApprovalRecordPojo.java | 2 +- .../pojo/ParameterPojo.java} | 10 +- .../pojo/ResponsiblePersonPojo.java} | 4 +- .../pojo/RevisionRecordPojo.java} | 14 +- .../pojo/TemplateAndParameterPojo.java} | 4 +- .../pojo/TemplatePojo.java} | 10 +- .../{ => domain}/pojo/TodoTaskPojo.java | 2 +- .../view/AnalysisModelParamterView.java | 4 +- .../AnalysisModelParamterViewAndParam.java | 3 +- .../view/ApprovalFlowNodeView.java | 2 +- .../view/CalculationParameterView.java | 2 +- .../view/DepartmentUserView.java | 2 +- .../{pojo => domain}/view/FlowNode.java | 2 +- .../domain/view/MenuListView.java | 16 + .../{pojo => domain}/view/MenuParamView.java | 4 +- .../{pojo => domain}/view/ParameterItem.java | 2 +- .../{pojo => domain}/view/ParametersView.java | 2 +- .../view/TemplateChangeView.java | 2 +- .../view/TemplateInfoView.java | 2 +- .../view/TodoAndReportListView.java | 6 +- .../view/TodoAndReportView.java | 2 +- .../view/TodoAndTemplateView.java | 7 +- .../{pojo => domain}/view/XdapUserView.java | 2 +- .../self_development/enums/IsDeleteEnum.java | 14 - .../enums/ParamOperation.java | 10 - .../feign/ApaasMyTokenFeign.java | 7 +- .../interceptor/CustomRequestInterceptor.java | 51 -- .../listener/EngineModelListener.java | 14 +- .../listener/EngineParamDetailListener.java | 10 +- .../listener/PersonReadListener.java | 10 +- .../listener/SheetDataListener.java | 8 +- .../pojo/AnalysisCommonParametersPojo.java | 35 -- .../pojo/dto/ActivitiRecordDTO.java | 41 -- .../pojo/dto/EngineParamDTO.java | 16 - .../pojo/view/ApprovalNodeView.java | 23 - .../pojo/view/MenuListView.java | 22 - .../pojo/view/TCParameterValueView.java | 5 - .../pojo/view/TcQueryView.java | 21 - .../pojo/view/UserRoleAndPermissionView.java | 17 - .../ParameterValueCalculationTimer.java | 19 +- .../service/ActivitiProcessService.java | 7 +- .../AnalysisCommonParametersService.java | 6 +- .../service/BenchmarkingReportService.java | 29 +- .../service/CommonParameterService.java | 4 +- .../service/DataEntryEngineModelService.java | 9 +- .../service/DataEntryService.java | 8 +- .../service/EngineParamDetailService.java | 10 +- .../service/EngineReviewListService.java | 4 +- .../service/ModelMenuPermissionService.java | 5 +- .../service/ModelRoleService.java | 7 +- .../service/ParameterService.java | 18 +- .../service/ResponsiblePerService.java | 18 +- .../service/ResponsiblePersonService.java | 10 +- .../service/TcDataQueryService.java | 8 +- .../service/TemplateApprovalService.java | 29 +- .../service/TemplateService.java | 14 +- .../service/TodoTaskService.java | 9 +- .../impl/ActivitiProcessServiceImpl.java | 44 +- .../AnalysisCommonParametersServiceImpl.java | 17 +- .../impl/BenchmarkingReportServiceImpl.java | 224 +++---- .../impl/CommonParameterServiceImpl.java | 98 ++-- .../impl/DataEntryEngineModelServiceImpl.java | 38 +- .../service/impl/DataEntryServiceImpl.java | 50 +- .../impl/EngineParamDetailServiceImpl.java | 154 +++-- .../impl/EngineReviewListServiceImpl.java | 12 +- .../impl/ModelMenuPermissionServiceImpl.java | 4 +- .../service/impl/ModelRoleServiceImpl.java | 19 +- .../service/impl/ParameterServiceImpl.java | 150 ++--- .../impl/ResponsiblePerServiceImpl.java | 50 +- .../impl/ResponsiblePersonServiceImpl.java | 66 +-- .../service/impl/TcDataQueryServiceImpl.java | 195 +++---- .../impl/TemplateApprovalServiceImpl.java | 240 ++++---- .../service/impl/TemplateServiceImpl.java | 196 +++---- .../service/impl/TodoTaskServiceImpl.java | 8 +- ...idator.java => FormulaValidatorUtils.java} | 22 +- ...RedisLockUtil.java => RedisLockUtils.java} | 2 +- src/main/resources/application-s.properties | 270 --------- src/main/resources/sql.sql | 545 ------------------ 148 files changed, 1105 insertions(+), 2212 deletions(-) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/ActivitiDataAndRecordDTO.java (85%) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/ActivitiDataDTO.java (92%) rename src/main/java/com/xdap/self_development/{feign => domain}/dto/AppTokenDTO.java (85%) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/ApprovalNodeDTO.java (79%) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/ApprovalNodesDTO.java (86%) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/DataEntryEngineModelDto.java (95%) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/EngineParamDetailDTO.java (96%) rename src/main/java/com/xdap/self_development/{feign => domain}/dto/FileDataDTO.java (87%) rename src/main/java/com/xdap/self_development/{feign => domain}/dto/FileUploadDTO.java (75%) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/HandleApprovalDTO.java (79%) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/PageResultDTO.java (79%) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/ShowActivitiDTO.java (72%) rename src/main/java/com/xdap/self_development/{feign => domain}/dto/UserTokenDT0.java (66%) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/YcTodoTaskCommonResultDTO.java (96%) rename src/main/java/com/xdap/self_development/{pojo => domain}/dto/YcTodoTaskResultDTO.java (95%) rename src/main/java/com/xdap/self_development/{ => domain}/enums/ApprovalOrderEnum.java (95%) rename src/main/java/com/xdap/self_development/{ => domain}/enums/CurrentNodeEnum.java (69%) rename src/main/java/com/xdap/self_development/{ => domain}/enums/DistributeStatusEnum.java (95%) create mode 100644 src/main/java/com/xdap/self_development/domain/enums/ParamOperationEnum.java rename src/main/java/com/xdap/self_development/{ => domain}/enums/ParamPermissionEnum.java (94%) rename src/main/java/com/xdap/self_development/{ => domain}/enums/ParamValueVersionEnum.java (95%) rename src/main/java/com/xdap/self_development/{utils/ParameterOperation.java => domain/enums/ParameterOperationEnum.java} (70%) rename src/main/java/com/xdap/self_development/{pojo/AnalysisCommonParameters.java => domain/pojo/AnalysisCommonParametersPojo.java} (90%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/ApprovalConfigPojo.java (96%) rename src/main/java/com/xdap/self_development/{pojo/ApprovalFlow.java => domain/pojo/ApprovalFlowPojo.java} (91%) rename src/main/java/com/xdap/self_development/{pojo/ApprovalRecord.java => domain/pojo/ApprovalRecordPojo.java} (80%) rename src/main/java/com/xdap/self_development/{pojo/ApprovalXdapUsers.java => domain/pojo/ApprovalXdapUsersPojo.java} (72%) rename src/main/java/com/xdap/self_development/{pojo/BenchmarkingReport.java => domain/pojo/BenchmarkingReportPojo.java} (94%) rename src/main/java/com/xdap/self_development/{pojo/ClassificationAttribute.java => domain/pojo/ClassificationAttributePojo.java} (82%) rename src/main/java/com/xdap/self_development/{pojo/CommonParameter.java => domain/pojo/CommonParameterPojo.java} (83%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/CompletedTaskPojo.java (97%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/DataChangeCommentPojo.java (96%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/DataEntryEngineModelPojo.java (98%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/EngineParamDetailPojo.java (97%) rename src/main/java/com/xdap/self_development/{pojo/EnginePartsCollection.java => domain/pojo/EnginePartsCollectionPojo.java} (82%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/EngineReviewListPojo.java (97%) rename src/main/java/com/xdap/self_development/{pojo/GlobalParameter.java => domain/pojo/GlobalParameterPojo.java} (88%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/InitiatedTaskPojo.java (97%) rename src/main/java/com/xdap/self_development/{pojo/ModelCommonParameters.java => domain/pojo/ModelCommonParametersPojo.java} (94%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/ModelDepUserRolePojo.java (95%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/ModelMenuDictionaryPojo.java (95%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/ModelMenuParameterPojo.java (96%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/ModelRolePermissionPojo.java (93%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/ModelRolesPojo.java (95%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/ParamApprovalRecordPojo.java (97%) rename src/main/java/com/xdap/self_development/{pojo/Parameter.java => domain/pojo/ParameterPojo.java} (92%) rename src/main/java/com/xdap/self_development/{pojo/ResponsiblePerson.java => domain/pojo/ResponsiblePersonPojo.java} (91%) rename src/main/java/com/xdap/self_development/{pojo/RevisionRecord.java => domain/pojo/RevisionRecordPojo.java} (74%) rename src/main/java/com/xdap/self_development/{pojo/TemplateAndParameter.java => domain/pojo/TemplateAndParameterPojo.java} (82%) rename src/main/java/com/xdap/self_development/{pojo/Template.java => domain/pojo/TemplatePojo.java} (93%) rename src/main/java/com/xdap/self_development/{ => domain}/pojo/TodoTaskPojo.java (97%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/AnalysisModelParamterView.java (79%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/AnalysisModelParamterViewAndParam.java (62%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/ApprovalFlowNodeView.java (92%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/CalculationParameterView.java (96%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/DepartmentUserView.java (95%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/FlowNode.java (92%) create mode 100644 src/main/java/com/xdap/self_development/domain/view/MenuListView.java rename src/main/java/com/xdap/self_development/{pojo => domain}/view/MenuParamView.java (86%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/ParameterItem.java (72%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/ParametersView.java (95%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/TemplateChangeView.java (95%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/TemplateInfoView.java (76%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/TodoAndReportListView.java (91%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/TodoAndReportView.java (97%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/TodoAndTemplateView.java (95%) rename src/main/java/com/xdap/self_development/{pojo => domain}/view/XdapUserView.java (92%) delete mode 100644 src/main/java/com/xdap/self_development/enums/IsDeleteEnum.java delete mode 100644 src/main/java/com/xdap/self_development/enums/ParamOperation.java delete mode 100644 src/main/java/com/xdap/self_development/interceptor/CustomRequestInterceptor.java delete mode 100644 src/main/java/com/xdap/self_development/pojo/AnalysisCommonParametersPojo.java delete mode 100644 src/main/java/com/xdap/self_development/pojo/dto/ActivitiRecordDTO.java delete mode 100644 src/main/java/com/xdap/self_development/pojo/dto/EngineParamDTO.java delete mode 100644 src/main/java/com/xdap/self_development/pojo/view/ApprovalNodeView.java delete mode 100644 src/main/java/com/xdap/self_development/pojo/view/MenuListView.java delete mode 100644 src/main/java/com/xdap/self_development/pojo/view/TCParameterValueView.java delete mode 100644 src/main/java/com/xdap/self_development/pojo/view/TcQueryView.java delete mode 100644 src/main/java/com/xdap/self_development/pojo/view/UserRoleAndPermissionView.java rename src/main/java/com/xdap/self_development/utils/{FormulaValidator.java => FormulaValidatorUtils.java} (96%) rename src/main/java/com/xdap/self_development/utils/{RedisLockUtil.java => RedisLockUtils.java} (97%) delete mode 100644 src/main/resources/application-s.properties delete mode 100644 src/main/resources/sql.sql 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 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 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 list = commonParameterService.getAnalysisCommonParameter(userId); + List 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