From 863805a3e5c70f00aac33c48d0bbfa394dcbbc18 Mon Sep 17 00:00:00 2001 From: tianxinlei Date: Thu, 21 May 2026 16:44:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=85=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 14 ++++++++++++ pom.xml | 16 +++++++------- start/pom.xml | 8 +++---- .../list => safetyDutylist}/Application.java | 4 ++-- start/src/main/resources/nacos.yml | 4 ++-- start/src/main/resources/sdk.yml | 2 +- web-adapter/pom.xml | 8 +++---- .../job/FeedbackExceptionCheckJob.java | 6 ++--- .../job/TaskStatusUpdateJob.java | 6 ++--- .../web/tasklist/FeedbackController.java | 8 +++---- .../web/tasklist/StatisticsController.java | 8 +++---- .../web/tasklist/TaskDetailController.java | 12 +++++----- .../web/tasklist/TaskListController.java | 8 +++---- web-app/pom.xml | 8 +++---- .../tasklist/TaskListCoConvertor.java | 6 ++--- .../query/tasklist/FeedbackQueryExe.java | 18 +++++++-------- .../query/tasklist/StatisticsQueryExe.java | 22 +++++++++---------- .../query/tasklist/TaskDetailQueryExe.java | 20 ++++++++--------- .../query/tasklist/TaskListQueryExe.java | 18 +++++++-------- .../command/tasklist/FeedbackAddExe.java | 22 +++++++++---------- .../tasklist/FeedbackExceptionCheckExe.java | 18 +++++++-------- .../command/tasklist/TaskDetailCloseExe.java | 10 ++++----- .../command/tasklist/TaskDetailSaveExe.java | 14 ++++++------ .../tasklist/TaskDetailUpdateScoreExe.java | 8 +++---- .../command/tasklist/TaskListAddExe.java | 20 ++++++++--------- .../command/tasklist/TaskListCloseExe.java | 14 ++++++------ .../command/tasklist/TaskListIssueExe.java | 10 ++++----- .../command/tasklist/TaskListRemoveExe.java | 4 ++-- .../tasklist/TaskListStatusUpdateExe.java | 12 +++++----- .../command/tasklist/TaskListSwitchExe.java | 14 ++++++------ .../command/tasklist/TaskListUpdateExe.java | 20 ++++++++--------- .../service/tasklist/TaskListServiceImpl.java | 12 +++++----- web-client/pom.xml | 6 ++--- .../api/tasklist/TaskListServiceI.java | 6 ++--- .../config/ThreadPoolAsyncConfig.java | 2 +- .../tasklist/CorpStatisticsCO.java | 2 +- .../tasklist/EvaluationListCO.java | 2 +- .../dto/clientobject/tasklist/FeedbackCO.java | 2 +- .../tasklist/FeedbackExceptionCO.java | 2 +- .../clientobject/tasklist/FeedbackInfoCO.java | 2 +- .../tasklist/FeedbackPeriodGroupCO.java | 2 +- .../tasklist/IssueStatisticsCO.java | 2 +- .../clientobject/tasklist/TaskDetailCO.java | 2 +- .../tasklist/TaskDetailFullCO.java | 2 +- .../tasklist/TaskDetailInfoCO.java | 2 +- .../dto/clientobject/tasklist/TaskListCO.java | 2 +- .../tasklist/TaskListStatisticsCO.java | 2 +- .../dto/tasklist/CorpStatisticsQry.java | 2 +- .../dto/tasklist/EvaluationListQry.java | 2 +- .../dto/tasklist/FeedbackAddCmd.java | 2 +- .../tasklist/FeedbackExceptionPageQry.java | 2 +- .../dto/tasklist/FeedbackListQry.java | 2 +- .../dto/tasklist/FeedbackPageQry.java | 2 +- .../dto/tasklist/FeedbackPeriodGroupQry.java | 2 +- .../dto/tasklist/IssueStatisticsQry.java | 2 +- .../dto/tasklist/TaskDetailAddCmd.java | 2 +- .../dto/tasklist/TaskDetailCloseCmd.java | 2 +- .../dto/tasklist/TaskDetailPageQry.java | 2 +- .../dto/tasklist/TaskDetailSaveCmd.java | 2 +- .../tasklist/TaskDetailUpdateScoreCmd.java | 2 +- .../dto/tasklist/TaskListAddCmd.java | 2 +- .../dto/tasklist/TaskListCloseCmd.java | 2 +- .../dto/tasklist/TaskListIssueCmd.java | 2 +- .../dto/tasklist/TaskListPageQry.java | 2 +- .../dto/tasklist/TaskListStatisticsQry.java | 2 +- .../dto/tasklist/TaskListSwitchCmd.java | 2 +- .../dto/tasklist/TaskListUpdateCmd.java | 2 +- web-domain/pom.xml | 4 ++-- .../domain/enums/ExceptionTypeEnum.java | 2 +- .../domain/enums/FeedbackCycleEnum.java | 2 +- .../domain/enums/FeedbackStatusEnum.java | 2 +- .../domain/enums/MenuEnum.java | 2 +- .../domain/enums/SwitchFlagEnum.java | 2 +- .../domain/enums/TaskLevelEnum.java | 2 +- .../domain/enums/TaskStatusEnum.java | 2 +- .../tasklist/FeedbackExceptionGateway.java | 4 ++-- .../gateway/tasklist/FeedbackGateway.java | 4 ++-- .../gateway/tasklist/TaskDetailGateway.java | 4 ++-- .../gateway/tasklist/TaskListGateway.java | 4 ++-- .../domain/model/tasklist/FeedbackE.java | 2 +- .../model/tasklist/FeedbackExceptionE.java | 2 +- .../domain/model/tasklist/TaskDetailE.java | 3 +-- .../domain/model/tasklist/TaskListE.java | 2 +- .../domain/util/FeedbackCycleUtil.java | 2 +- web-infrastructure/pom.xml | 6 ++--- .../FeedbackExceptionGatewayImpl.java | 10 ++++----- .../tasklist/FeedbackGatewayImpl.java | 10 ++++----- .../tasklist/TaskDetailGatewayImpl.java | 10 ++++----- .../tasklist/TaskListGatewayImpl.java | 10 ++++----- .../dataobject/tasklist/CorpStatisticsDO.java | 2 +- .../dataobject/tasklist/EvaluationListDO.java | 2 +- .../dataobject/tasklist/FeedbackDO.java | 2 +- .../tasklist/FeedbackExceptionDO.java | 2 +- .../tasklist/IssueStatisticsDO.java | 2 +- .../dataobject/tasklist/TaskDetailDO.java | 2 +- .../dataobject/tasklist/TaskListDO.java | 2 +- .../tasklist/FeedbackExceptionMapper.java | 4 ++-- .../mapper/tasklist/FeedbackMapper.java | 4 ++-- .../mapper/tasklist/TaskDetailMapper.java | 4 ++-- .../mapper/tasklist/TaskListMapper.java | 10 ++++----- .../FeedbackExceptionRepositoryImpl.java | 8 +++---- .../impl/tasklist/FeedbackRepositoryImpl.java | 8 +++---- .../tasklist/TaskDetailRepositoryImpl.java | 8 +++---- .../impl/tasklist/TaskListRepositoryImpl.java | 16 +++++++------- .../tasklist/FeedbackExceptionRepository.java | 4 ++-- .../tasklist/FeedbackRepository.java | 4 ++-- .../tasklist/TaskDetailRepository.java | 4 ++-- .../tasklist/TaskListRepository.java | 10 ++++----- .../list => safetyDutyList}/utils/Query.java | 2 +- .../tasklist/FeedbackExceptionMapper.xml | 14 ++++++------ .../mapper/tasklist/FeedbackMapper.xml | 12 +++++----- .../mapper/tasklist/TaskDetailMapper.xml | 12 +++++----- .../mapper/tasklist/TaskListMapper.xml | 22 +++++++++---------- 113 files changed, 358 insertions(+), 345 deletions(-) create mode 100644 .gitignore rename start/src/main/java/com/zcloud/{safety/accountability/list => safetyDutylist}/Application.java (73%) rename web-adapter/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/job/FeedbackExceptionCheckJob.java (91%) rename web-adapter/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/job/TaskStatusUpdateJob.java (91%) rename web-adapter/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/web/tasklist/FeedbackController.java (88%) rename web-adapter/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/web/tasklist/StatisticsController.java (83%) rename web-adapter/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/web/tasklist/TaskDetailController.java (80%) rename web-adapter/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/web/tasklist/TaskListController.java (88%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/convertor/tasklist/TaskListCoConvertor.java (76%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/query/tasklist/FeedbackQueryExe.java (83%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/query/tasklist/StatisticsQueryExe.java (73%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/query/tasklist/TaskDetailQueryExe.java (82%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/query/tasklist/TaskListQueryExe.java (86%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/FeedbackAddExe.java (69%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/FeedbackExceptionCheckExe.java (92%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/TaskDetailCloseExe.java (69%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/TaskDetailSaveExe.java (76%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/TaskDetailUpdateScoreExe.java (83%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/TaskListAddExe.java (61%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/TaskListCloseExe.java (73%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/TaskListIssueExe.java (84%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/TaskListRemoveExe.java (77%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/TaskListStatusUpdateExe.java (86%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/TaskListSwitchExe.java (63%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/command/tasklist/TaskListUpdateExe.java (61%) rename web-app/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/service/tasklist/TaskListServiceImpl.java (93%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/api/tasklist/TaskListServiceI.java (96%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/config/ThreadPoolAsyncConfig.java (97%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/CorpStatisticsCO.java (91%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/EvaluationListCO.java (88%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/FeedbackCO.java (96%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/FeedbackExceptionCO.java (96%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/FeedbackInfoCO.java (95%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/FeedbackPeriodGroupCO.java (93%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/IssueStatisticsCO.java (88%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/TaskDetailCO.java (95%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/TaskDetailFullCO.java (96%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/TaskDetailInfoCO.java (94%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/TaskListCO.java (97%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/clientobject/tasklist/TaskListStatisticsCO.java (93%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/CorpStatisticsQry.java (86%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/EvaluationListQry.java (89%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/FeedbackAddCmd.java (95%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/FeedbackExceptionPageQry.java (91%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/FeedbackListQry.java (90%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/FeedbackPageQry.java (91%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/FeedbackPeriodGroupQry.java (90%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/IssueStatisticsQry.java (86%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskDetailAddCmd.java (94%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskDetailCloseCmd.java (90%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskDetailPageQry.java (93%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskDetailSaveCmd.java (94%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskDetailUpdateScoreCmd.java (94%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskListAddCmd.java (97%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskListCloseCmd.java (91%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskListIssueCmd.java (96%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskListPageQry.java (93%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskListStatisticsQry.java (82%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskListSwitchCmd.java (92%) rename web-client/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/dto/tasklist/TaskListUpdateCmd.java (97%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/enums/ExceptionTypeEnum.java (92%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/enums/FeedbackCycleEnum.java (93%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/enums/FeedbackStatusEnum.java (91%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/enums/MenuEnum.java (94%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/enums/SwitchFlagEnum.java (86%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/enums/TaskLevelEnum.java (92%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/enums/TaskStatusEnum.java (92%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/gateway/tasklist/FeedbackExceptionGateway.java (91%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/gateway/tasklist/FeedbackGateway.java (91%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/gateway/tasklist/TaskDetailGateway.java (92%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/gateway/tasklist/TaskListGateway.java (91%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/model/tasklist/FeedbackE.java (93%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/model/tasklist/FeedbackExceptionE.java (93%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/model/tasklist/TaskDetailE.java (93%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/model/tasklist/TaskListE.java (94%) rename web-domain/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/domain/util/FeedbackCycleUtil.java (99%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/gatewayimpl/tasklist/FeedbackExceptionGatewayImpl.java (90%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/gatewayimpl/tasklist/FeedbackGatewayImpl.java (85%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/gatewayimpl/tasklist/TaskDetailGatewayImpl.java (91%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/gatewayimpl/tasklist/TaskListGatewayImpl.java (91%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/dataobject/tasklist/CorpStatisticsDO.java (91%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/dataobject/tasklist/EvaluationListDO.java (87%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/dataobject/tasklist/FeedbackDO.java (96%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/dataobject/tasklist/FeedbackExceptionDO.java (96%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/dataobject/tasklist/IssueStatisticsDO.java (87%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/dataobject/tasklist/TaskDetailDO.java (97%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/dataobject/tasklist/TaskListDO.java (97%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/mapper/tasklist/FeedbackExceptionMapper.java (91%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/mapper/tasklist/FeedbackMapper.java (82%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/mapper/tasklist/TaskDetailMapper.java (91%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/mapper/tasklist/TaskListMapper.java (71%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/repository/impl/tasklist/FeedbackExceptionRepositoryImpl.java (86%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/repository/impl/tasklist/FeedbackRepositoryImpl.java (79%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/repository/impl/tasklist/TaskDetailRepositoryImpl.java (86%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java (82%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/repository/tasklist/FeedbackExceptionRepository.java (91%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/repository/tasklist/FeedbackRepository.java (80%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/repository/tasklist/TaskDetailRepository.java (90%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/persistence/repository/tasklist/TaskListRepository.java (69%) rename web-infrastructure/src/main/java/com/zcloud/{safety/accountability/list => safetyDutyList}/utils/Query.java (96%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8c09cf5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +# 忽略编译输出文件夹 +target/ + +# 忽略 IDEA 配置文件 +.idea/ +*.iml +*.iws +*.ipr + +# 忽略日志 +*.log + +# 忽略系统文件 +.DS_Store \ No newline at end of file diff --git a/pom.xml b/pom.xml index 346d1e8..5d1bfa3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ jjb-saas-parent 2.2.0-SNAPSHOT - com.zcloud.safety.accountability.list - zcloud_gbs_safety_accountability_list + com.zcloud.safetyDutyList + zcloud_gbs_safetyDutyList pom 1.0-SNAPSHOT - zcloud_gbs_safety_accountability_list + zcloud_gbs_safetyDutyList UTF-8 UTF-8 @@ -30,27 +30,27 @@ - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-adapter ${project.version} - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-client ${project.version} - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-app ${project.version} - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-domain ${project.version} - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-infrastructure ${project.version} diff --git a/start/pom.xml b/start/pom.xml index c010a99..09373a6 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - com.zcloud.safety.accountability.list - zcloud_gbs_safety_accountability_list + com.zcloud.safetyDutyList + zcloud_gbs_safetyDutyList 1.0-SNAPSHOT ../pom.xml @@ -14,7 +14,7 @@ - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-adapter @@ -39,7 +39,7 @@ org.springframework.boot spring-boot-maven-plugin - com.zcloud.safety.accountability.list.Application + com.zcloud.safetyDutyList.Application diff --git a/start/src/main/java/com/zcloud/safety/accountability/list/Application.java b/start/src/main/java/com/zcloud/safetyDutylist/Application.java similarity index 73% rename from start/src/main/java/com/zcloud/safety/accountability/list/Application.java rename to start/src/main/java/com/zcloud/safetyDutylist/Application.java index 693f9e7..8202b90 100644 --- a/start/src/main/java/com/zcloud/safety/accountability/list/Application.java +++ b/start/src/main/java/com/zcloud/safetyDutylist/Application.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list; +package com.zcloud.safetyDutyList; import com.jjb.saas.base.starter.bootstart.JJBSpringbootApplication; import org.springframework.boot.SpringApplication; @@ -9,7 +9,7 @@ import org.springframework.boot.SpringApplication; */ @JJBSpringbootApplication( scanBasePackages = {"com.zcloud","com.jjb"}, - mapperPackages = {"com.zcloud.safety.accountability.list.persistence.mapper"} + mapperPackages = {"com.zcloud.safetyDutyList.persistence.mapper"} ) public class Application { diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index 5dceb84..ca5ebae 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -2,9 +2,9 @@ nacos: url: 192.168.20.100:30290 namespace: jjb-dragon application: - name: jjb-saas-zcloud-safety-accountability-list + name: jjb-saas-zcloud-safetyDutyList version: - gateway: safetyAccountabilityList + gateway: safetyDutyList cn-name: 安全责任清单 spring: application: diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index 7601d66..e7ac2f2 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -1,6 +1,6 @@ sdk: server: - app-key: 0fde29723e51420d82b7047feaad98c9 + app-key: 002db3f140fe47d1b2754856c5172bd5 client: gateway: url: ${common.gateway.network.http.external} diff --git a/web-adapter/pom.xml b/web-adapter/pom.xml index 1ea13df..05e49e2 100644 --- a/web-adapter/pom.xml +++ b/web-adapter/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - com.zcloud.safety.accountability.list - zcloud_gbs_safety_accountability_list + com.zcloud.safetyDutyList + zcloud_gbs_safetyDutyList 1.0-SNAPSHOT ../pom.xml @@ -19,11 +19,11 @@ - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-app - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-client diff --git a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/job/FeedbackExceptionCheckJob.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/job/FeedbackExceptionCheckJob.java similarity index 91% rename from web-adapter/src/main/java/com/zcloud/safety/accountability/list/job/FeedbackExceptionCheckJob.java rename to web-adapter/src/main/java/com/zcloud/safetyDutyList/job/FeedbackExceptionCheckJob.java index a88e265..a27ce4c 100644 --- a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/job/FeedbackExceptionCheckJob.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/job/FeedbackExceptionCheckJob.java @@ -1,10 +1,10 @@ -package com.zcloud.safety.accountability.list.job; +package com.zcloud.safetyDutyList.job; import com.jjb.saas.framework.job.Job; import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; -import com.zcloud.safety.accountability.list.api.tasklist.TaskListServiceI; +import com.zcloud.safetyDutyList.api.tasklist.TaskListServiceI; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -41,7 +41,7 @@ public class FeedbackExceptionCheckJob implements Job { */ @Override @JobRegister(cron = "0 0 0 1 * ?", jobDesc = "安全责任清单-反馈异常检测", triggerStatus = 1) - @XxlJob("com.zcloud.safety.accountability.list.job.FeedbackExceptionCheckJob") + @XxlJob("com.zcloud.safetyDutyList.job.FeedbackExceptionCheckJob") public ReturnT execute(String param) { log.info("【安全责任清单】开始执行反馈异常检测定时任务"); try { diff --git a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/job/TaskStatusUpdateJob.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/job/TaskStatusUpdateJob.java similarity index 91% rename from web-adapter/src/main/java/com/zcloud/safety/accountability/list/job/TaskStatusUpdateJob.java rename to web-adapter/src/main/java/com/zcloud/safetyDutyList/job/TaskStatusUpdateJob.java index 91bbacd..c1ffa02 100644 --- a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/job/TaskStatusUpdateJob.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/job/TaskStatusUpdateJob.java @@ -1,10 +1,10 @@ -package com.zcloud.safety.accountability.list.job; +package com.zcloud.safetyDutyList.job; import com.jjb.saas.framework.job.Job; import com.jjb.saas.framework.job.annotation.JobRegister; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; -import com.zcloud.safety.accountability.list.api.tasklist.TaskListServiceI; +import com.zcloud.safetyDutyList.api.tasklist.TaskListServiceI; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -41,7 +41,7 @@ public class TaskStatusUpdateJob implements Job { */ @Override @JobRegister(cron = "0 0 0 1 * ?", jobDesc = "安全责任清单-更新清单和任务状态", triggerStatus = 1) - @XxlJob("com.zcloud.safety.accountability.list.job.TaskStatusUpdateJob") + @XxlJob("com.zcloud.safetyDutyList.job.TaskStatusUpdateJob") public ReturnT execute(String param) { log.info("【安全责任清单】开始执行更新清单和任务状态定时任务"); try { diff --git a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/FeedbackController.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java similarity index 88% rename from web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/FeedbackController.java rename to web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java index a818622..7296716 100644 --- a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/FeedbackController.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/FeedbackController.java @@ -1,11 +1,11 @@ -package com.zcloud.safety.accountability.list.web.tasklist; +package com.zcloud.safetyDutyList.web.tasklist; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.safety.accountability.list.api.tasklist.TaskListServiceI; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.*; -import com.zcloud.safety.accountability.list.dto.tasklist.*; +import com.zcloud.safetyDutyList.api.tasklist.TaskListServiceI; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*; +import com.zcloud.safetyDutyList.dto.tasklist.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/StatisticsController.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/StatisticsController.java similarity index 83% rename from web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/StatisticsController.java rename to web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/StatisticsController.java index f5e81ef..b2c028b 100644 --- a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/StatisticsController.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/StatisticsController.java @@ -1,10 +1,10 @@ -package com.zcloud.safety.accountability.list.web.tasklist; +package com.zcloud.safetyDutyList.web.tasklist; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; -import com.zcloud.safety.accountability.list.api.tasklist.TaskListServiceI; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.*; -import com.zcloud.safety.accountability.list.dto.tasklist.*; +import com.zcloud.safetyDutyList.api.tasklist.TaskListServiceI; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*; +import com.zcloud.safetyDutyList.dto.tasklist.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/TaskDetailController.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java similarity index 80% rename from web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/TaskDetailController.java rename to web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java index a79ebe1..7c25d20 100644 --- a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/TaskDetailController.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java @@ -1,13 +1,13 @@ -package com.zcloud.safety.accountability.list.web.tasklist; +package com.zcloud.safetyDutyList.web.tasklist; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.safety.accountability.list.api.tasklist.TaskListServiceI; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.TaskDetailCO; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.TaskDetailFullCO; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.TaskDetailInfoCO; -import com.zcloud.safety.accountability.list.dto.tasklist.*; +import com.zcloud.safetyDutyList.api.tasklist.TaskListServiceI; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.TaskDetailCO; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.TaskDetailFullCO; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.TaskDetailInfoCO; +import com.zcloud.safetyDutyList.dto.tasklist.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/TaskListController.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskListController.java similarity index 88% rename from web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/TaskListController.java rename to web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskListController.java index aece675..58e813f 100644 --- a/web-adapter/src/main/java/com/zcloud/safety/accountability/list/web/tasklist/TaskListController.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskListController.java @@ -1,11 +1,11 @@ -package com.zcloud.safety.accountability.list.web.tasklist; +package com.zcloud.safetyDutyList.web.tasklist; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.safety.accountability.list.api.tasklist.TaskListServiceI; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.TaskListCO; -import com.zcloud.safety.accountability.list.dto.tasklist.*; +import com.zcloud.safetyDutyList.api.tasklist.TaskListServiceI; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.TaskListCO; +import com.zcloud.safetyDutyList.dto.tasklist.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/web-app/pom.xml b/web-app/pom.xml index 6839954..d4bb57a 100644 --- a/web-app/pom.xml +++ b/web-app/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - com.zcloud.safety.accountability.list - zcloud_gbs_safety_accountability_list + com.zcloud.safetyDutyList + zcloud_gbs_safetyDutyList 1.0-SNAPSHOT ../pom.xml @@ -14,11 +14,11 @@ - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-client - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-infrastructure diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/convertor/tasklist/TaskListCoConvertor.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/convertor/tasklist/TaskListCoConvertor.java similarity index 76% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/convertor/tasklist/TaskListCoConvertor.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/convertor/tasklist/TaskListCoConvertor.java index d1a97b6..e6b8737 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/convertor/tasklist/TaskListCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/convertor/tasklist/TaskListCoConvertor.java @@ -1,7 +1,7 @@ -package com.zcloud.safety.accountability.list.command.convertor.tasklist; +package com.zcloud.safetyDutyList.command.convertor.tasklist; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.*; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.*; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.*; import org.mapstruct.Mapper; import java.util.List; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/FeedbackQueryExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java similarity index 83% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/FeedbackQueryExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java index c03eab8..1eefdf8 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/FeedbackQueryExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java @@ -1,16 +1,16 @@ -package com.zcloud.safety.accountability.list.command.query.tasklist; +package com.zcloud.safetyDutyList.command.query.tasklist; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.enums.FeedbackCycleEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.FeedbackGateway; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.FeedbackE; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.*; -import com.zcloud.safety.accountability.list.dto.tasklist.FeedbackListQry; -import com.zcloud.safety.accountability.list.dto.tasklist.FeedbackPeriodGroupQry; +import com.zcloud.safetyDutyList.domain.enums.FeedbackCycleEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.FeedbackE; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*; +import com.zcloud.safetyDutyList.dto.tasklist.FeedbackListQry; +import com.zcloud.safetyDutyList.dto.tasklist.FeedbackPeriodGroupQry; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/StatisticsQueryExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/StatisticsQueryExe.java similarity index 73% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/StatisticsQueryExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/StatisticsQueryExe.java index fe0b13a..3ac6e24 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/StatisticsQueryExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/StatisticsQueryExe.java @@ -1,17 +1,17 @@ -package com.zcloud.safety.accountability.list.command.query.tasklist; +package com.zcloud.safetyDutyList.command.query.tasklist; import com.alibaba.cola.dto.PageResponse; import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.CorpStatisticsCO; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.EvaluationListCO; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.IssueStatisticsCO; -import com.zcloud.safety.accountability.list.dto.tasklist.CorpStatisticsQry; -import com.zcloud.safety.accountability.list.dto.tasklist.EvaluationListQry; -import com.zcloud.safety.accountability.list.dto.tasklist.IssueStatisticsQry; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.CorpStatisticsDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.EvaluationListDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.IssueStatisticsDO; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.TaskListRepository; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.CorpStatisticsCO; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.EvaluationListCO; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.IssueStatisticsCO; +import com.zcloud.safetyDutyList.dto.tasklist.CorpStatisticsQry; +import com.zcloud.safetyDutyList.dto.tasklist.EvaluationListQry; +import com.zcloud.safetyDutyList.dto.tasklist.IssueStatisticsQry; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.CorpStatisticsDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.EvaluationListDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.IssueStatisticsDO; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskListRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/TaskDetailQueryExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/TaskDetailQueryExe.java similarity index 82% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/TaskDetailQueryExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/TaskDetailQueryExe.java index d140cec..8329b17 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/TaskDetailQueryExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/TaskDetailQueryExe.java @@ -1,18 +1,18 @@ -package com.zcloud.safety.accountability.list.command.query.tasklist; +package com.zcloud.safetyDutyList.command.query.tasklist; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.safety.accountability.list.command.convertor.tasklist.TaskListCoConvertor; -import com.zcloud.safety.accountability.list.domain.enums.*; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.FeedbackExceptionGateway; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.*; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskDetailPageQry; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.FeedbackExceptionDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.TaskDetailDO; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.FeedbackExceptionRepository; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.TaskDetailRepository; +import com.zcloud.safetyDutyList.command.convertor.tasklist.TaskListCoConvertor; +import com.zcloud.safetyDutyList.domain.enums.*; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackExceptionGateway; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*; +import com.zcloud.safetyDutyList.dto.tasklist.TaskDetailPageQry; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.FeedbackExceptionDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.TaskDetailDO; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.FeedbackExceptionRepository; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskDetailRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/TaskListQueryExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/TaskListQueryExe.java similarity index 86% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/TaskListQueryExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/TaskListQueryExe.java index bbf819b..362a3ef 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/query/tasklist/TaskListQueryExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/TaskListQueryExe.java @@ -1,18 +1,18 @@ -package com.zcloud.safety.accountability.list.command.query.tasklist; +package com.zcloud.safetyDutyList.command.query.tasklist; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.safety.accountability.list.command.convertor.tasklist.TaskListCoConvertor; -import com.zcloud.safety.accountability.list.domain.enums.*; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.*; -import com.zcloud.safety.accountability.list.dto.tasklist.*; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.*; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.TaskListRepository; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.FeedbackRepository; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.FeedbackExceptionRepository; +import com.zcloud.safetyDutyList.command.convertor.tasklist.TaskListCoConvertor; +import com.zcloud.safetyDutyList.domain.enums.*; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*; +import com.zcloud.safetyDutyList.dto.tasklist.*; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.*; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskListRepository; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.FeedbackRepository; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.FeedbackExceptionRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/FeedbackAddExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java similarity index 69% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/FeedbackAddExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java index ee1c940..0d18802 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/FeedbackAddExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java @@ -1,16 +1,16 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.enums.FeedbackStatusEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.FeedbackGateway; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskListGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.FeedbackE; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskListE; -import com.zcloud.safety.accountability.list.domain.util.FeedbackCycleUtil; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.FeedbackCO; -import com.zcloud.safety.accountability.list.dto.tasklist.FeedbackAddCmd; +import com.zcloud.safetyDutyList.domain.enums.FeedbackStatusEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.FeedbackE; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE; +import com.zcloud.safetyDutyList.domain.util.FeedbackCycleUtil; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.FeedbackCO; +import com.zcloud.safetyDutyList.dto.tasklist.FeedbackAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/FeedbackExceptionCheckExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackExceptionCheckExe.java similarity index 92% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/FeedbackExceptionCheckExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackExceptionCheckExe.java index 160564c..64c01b8 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/FeedbackExceptionCheckExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackExceptionCheckExe.java @@ -1,13 +1,13 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; -import com.zcloud.safety.accountability.list.domain.enums.ExceptionTypeEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.FeedbackExceptionGateway; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.FeedbackGateway; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.FeedbackE; -import com.zcloud.safety.accountability.list.domain.model.tasklist.FeedbackExceptionE; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.domain.util.FeedbackCycleUtil; +import com.zcloud.safetyDutyList.domain.enums.ExceptionTypeEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackExceptionGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.FeedbackE; +import com.zcloud.safetyDutyList.domain.model.tasklist.FeedbackExceptionE; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.domain.util.FeedbackCycleUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskDetailCloseExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailCloseExe.java similarity index 69% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskDetailCloseExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailCloseExe.java index 1e5d128..10b3350 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskDetailCloseExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailCloseExe.java @@ -1,10 +1,10 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.enums.TaskStatusEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskDetailCloseCmd; +import com.zcloud.safetyDutyList.domain.enums.TaskStatusEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.dto.tasklist.TaskDetailCloseCmd; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskDetailSaveExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailSaveExe.java similarity index 76% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskDetailSaveExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailSaveExe.java index 0de9910..2c325ba 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskDetailSaveExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailSaveExe.java @@ -1,12 +1,12 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.enums.TaskStatusEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskListGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.TaskDetailCO; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskDetailSaveCmd; +import com.zcloud.safetyDutyList.domain.enums.TaskStatusEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.TaskDetailCO; +import com.zcloud.safetyDutyList.dto.tasklist.TaskDetailSaveCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskDetailUpdateScoreExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailUpdateScoreExe.java similarity index 83% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskDetailUpdateScoreExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailUpdateScoreExe.java index 0b26085..77fb3e9 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskDetailUpdateScoreExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskDetailUpdateScoreExe.java @@ -1,9 +1,9 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskDetailUpdateScoreCmd; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.dto.tasklist.TaskDetailUpdateScoreCmd; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListAddExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListAddExe.java similarity index 61% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListAddExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListAddExe.java index 08b25a1..c080d7d 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListAddExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListAddExe.java @@ -1,15 +1,15 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.enums.SwitchFlagEnum; -import com.zcloud.safety.accountability.list.domain.enums.TaskStatusEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskListGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskListE; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.TaskListCO; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskDetailAddCmd; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskListAddCmd; +import com.zcloud.safetyDutyList.domain.enums.SwitchFlagEnum; +import com.zcloud.safetyDutyList.domain.enums.TaskStatusEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.TaskListCO; +import com.zcloud.safetyDutyList.dto.tasklist.TaskDetailAddCmd; +import com.zcloud.safetyDutyList.dto.tasklist.TaskListAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListCloseExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListCloseExe.java similarity index 73% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListCloseExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListCloseExe.java index 663d2c2..5b98e03 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListCloseExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListCloseExe.java @@ -1,12 +1,12 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.enums.TaskStatusEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskListGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskListE; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskListCloseCmd; +import com.zcloud.safetyDutyList.domain.enums.TaskStatusEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE; +import com.zcloud.safetyDutyList.dto.tasklist.TaskListCloseCmd; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListIssueExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListIssueExe.java similarity index 84% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListIssueExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListIssueExe.java index dd7b213..173e6b8 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListIssueExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListIssueExe.java @@ -1,10 +1,10 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.enums.SwitchFlagEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskListGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskListE; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskListIssueCmd; +import com.zcloud.safetyDutyList.domain.enums.SwitchFlagEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE; +import com.zcloud.safetyDutyList.dto.tasklist.TaskListIssueCmd; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListRemoveExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListRemoveExe.java similarity index 77% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListRemoveExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListRemoveExe.java index 26977d2..3ce8cdd 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListRemoveExe.java @@ -1,7 +1,7 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskListGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListStatusUpdateExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListStatusUpdateExe.java similarity index 86% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListStatusUpdateExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListStatusUpdateExe.java index 8624918..a15f948 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListStatusUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListStatusUpdateExe.java @@ -1,10 +1,10 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; -import com.zcloud.safety.accountability.list.domain.enums.TaskStatusEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskListGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskListE; +import com.zcloud.safetyDutyList.domain.enums.TaskStatusEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListSwitchExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListSwitchExe.java similarity index 63% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListSwitchExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListSwitchExe.java index a858390..67c1b8d 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListSwitchExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListSwitchExe.java @@ -1,12 +1,12 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.enums.SwitchFlagEnum; -import com.zcloud.safety.accountability.list.domain.enums.TaskStatusEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskListGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskListE; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskListSwitchCmd; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.TaskListRepository; +import com.zcloud.safetyDutyList.domain.enums.SwitchFlagEnum; +import com.zcloud.safetyDutyList.domain.enums.TaskStatusEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE; +import com.zcloud.safetyDutyList.dto.tasklist.TaskListSwitchCmd; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskListRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListUpdateExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListUpdateExe.java similarity index 61% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListUpdateExe.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListUpdateExe.java index a32885a..24b72ee 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/command/tasklist/TaskListUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/TaskListUpdateExe.java @@ -1,15 +1,15 @@ -package com.zcloud.safety.accountability.list.command.tasklist; +package com.zcloud.safetyDutyList.command.tasklist; import com.alibaba.cola.exception.BizException; -import com.zcloud.safety.accountability.list.domain.enums.TaskStatusEnum; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskListGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskListE; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.TaskListCO; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskDetailAddCmd; -import com.zcloud.safety.accountability.list.dto.tasklist.TaskListUpdateCmd; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.TaskListRepository; +import com.zcloud.safetyDutyList.domain.enums.TaskStatusEnum; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.TaskListCO; +import com.zcloud.safetyDutyList.dto.tasklist.TaskDetailAddCmd; +import com.zcloud.safetyDutyList.dto.tasklist.TaskListUpdateCmd; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskListRepository; import lombok.AllArgsConstructor; import org.apache.xpath.operations.Bool; import org.springframework.beans.BeanUtils; diff --git a/web-app/src/main/java/com/zcloud/safety/accountability/list/service/tasklist/TaskListServiceImpl.java b/web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java similarity index 93% rename from web-app/src/main/java/com/zcloud/safety/accountability/list/service/tasklist/TaskListServiceImpl.java rename to web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java index 220c61d..95af698 100644 --- a/web-app/src/main/java/com/zcloud/safety/accountability/list/service/tasklist/TaskListServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/safetyDutyList/service/tasklist/TaskListServiceImpl.java @@ -1,14 +1,14 @@ -package com.zcloud.safety.accountability.list.service.tasklist; +package com.zcloud.safetyDutyList.service.tasklist; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.safety.accountability.list.api.tasklist.TaskListServiceI; -import com.zcloud.safety.accountability.list.command.query.tasklist.*; -import com.zcloud.safety.accountability.list.command.tasklist.*; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.*; -import com.zcloud.safety.accountability.list.dto.tasklist.*; +import com.zcloud.safetyDutyList.api.tasklist.TaskListServiceI; +import com.zcloud.safetyDutyList.command.query.tasklist.*; +import com.zcloud.safetyDutyList.command.tasklist.*; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*; +import com.zcloud.safetyDutyList.dto.tasklist.*; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-client/pom.xml b/web-client/pom.xml index 275072c..273c3db 100644 --- a/web-client/pom.xml +++ b/web-client/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - com.zcloud.safety.accountability.list - zcloud_gbs_safety_accountability_list + com.zcloud.safetyDutyList + zcloud_gbs_safetyDutyList 1.0-SNAPSHOT ../pom.xml @@ -14,7 +14,7 @@ - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-domain diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/api/tasklist/TaskListServiceI.java b/web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java similarity index 96% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/api/tasklist/TaskListServiceI.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java index 20a9885..3def094 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/api/tasklist/TaskListServiceI.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/api/tasklist/TaskListServiceI.java @@ -1,11 +1,11 @@ -package com.zcloud.safety.accountability.list.api.tasklist; +package com.zcloud.safetyDutyList.api.tasklist; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.safety.accountability.list.dto.clientobject.tasklist.*; -import com.zcloud.safety.accountability.list.dto.tasklist.*; +import com.zcloud.safetyDutyList.dto.clientobject.tasklist.*; +import com.zcloud.safetyDutyList.dto.tasklist.*; /** * 安全责任清单服务接口 diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/config/ThreadPoolAsyncConfig.java b/web-client/src/main/java/com/zcloud/safetyDutyList/config/ThreadPoolAsyncConfig.java similarity index 97% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/config/ThreadPoolAsyncConfig.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/config/ThreadPoolAsyncConfig.java index fe97f4c..d804668 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/config/ThreadPoolAsyncConfig.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/config/ThreadPoolAsyncConfig.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.config; +package com.zcloud.safetyDutyList.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/CorpStatisticsCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/CorpStatisticsCO.java similarity index 91% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/CorpStatisticsCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/CorpStatisticsCO.java index cdef8b7..f455f72 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/CorpStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/CorpStatisticsCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/EvaluationListCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/EvaluationListCO.java similarity index 88% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/EvaluationListCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/EvaluationListCO.java index 8570f64..08c7c31 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/EvaluationListCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/EvaluationListCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackCO.java similarity index 96% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackCO.java index 0dafb39..63021fc 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackExceptionCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackExceptionCO.java similarity index 96% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackExceptionCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackExceptionCO.java index f7c874b..23f2fb3 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackExceptionCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackExceptionCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackInfoCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackInfoCO.java similarity index 95% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackInfoCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackInfoCO.java index a183214..e75e56a 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackInfoCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackInfoCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackPeriodGroupCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackPeriodGroupCO.java similarity index 93% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackPeriodGroupCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackPeriodGroupCO.java index e17dcd2..428fe24 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/FeedbackPeriodGroupCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/FeedbackPeriodGroupCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/IssueStatisticsCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/IssueStatisticsCO.java similarity index 88% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/IssueStatisticsCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/IssueStatisticsCO.java index 9b9506e..02c38a0 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/IssueStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/IssueStatisticsCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskDetailCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskDetailCO.java similarity index 95% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskDetailCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskDetailCO.java index 6d5597c..49c4911 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskDetailCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskDetailCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskDetailFullCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskDetailFullCO.java similarity index 96% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskDetailFullCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskDetailFullCO.java index 6e08779..14f26a6 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskDetailFullCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskDetailFullCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskDetailInfoCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskDetailInfoCO.java similarity index 94% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskDetailInfoCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskDetailInfoCO.java index 4053576..ae33504 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskDetailInfoCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskDetailInfoCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskListCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskListCO.java similarity index 97% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskListCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskListCO.java index 627fe4e..9315704 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskListCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskListCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskListStatisticsCO.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskListStatisticsCO.java similarity index 93% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskListStatisticsCO.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskListStatisticsCO.java index e09905a..39335c6 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/clientobject/tasklist/TaskListStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/clientobject/tasklist/TaskListStatisticsCO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.clientobject.tasklist; +package com.zcloud.safetyDutyList.dto.clientobject.tasklist; import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/CorpStatisticsQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/CorpStatisticsQry.java similarity index 86% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/CorpStatisticsQry.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/CorpStatisticsQry.java index 145de96..2835e1f 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/CorpStatisticsQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/CorpStatisticsQry.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/EvaluationListQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/EvaluationListQry.java similarity index 89% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/EvaluationListQry.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/EvaluationListQry.java index 29ec940..5fec147 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/EvaluationListQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/EvaluationListQry.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackAddCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackAddCmd.java similarity index 95% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackAddCmd.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackAddCmd.java index a43dc42..8f68ab1 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackAddCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackAddCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackExceptionPageQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackExceptionPageQry.java similarity index 91% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackExceptionPageQry.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackExceptionPageQry.java index 1a792eb..6ce6d39 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackExceptionPageQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackExceptionPageQry.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackListQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java similarity index 90% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackListQry.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java index 5b2af64..2022920 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackListQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackListQry.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackPageQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackPageQry.java similarity index 91% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackPageQry.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackPageQry.java index 4e48254..24f32b0 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackPageQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackPageQry.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackPeriodGroupQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackPeriodGroupQry.java similarity index 90% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackPeriodGroupQry.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackPeriodGroupQry.java index 07e1bf2..a2fbf8b 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/FeedbackPeriodGroupQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackPeriodGroupQry.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/IssueStatisticsQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/IssueStatisticsQry.java similarity index 86% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/IssueStatisticsQry.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/IssueStatisticsQry.java index e61acc3..1d91fa8 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/IssueStatisticsQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/IssueStatisticsQry.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailAddCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailAddCmd.java similarity index 94% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailAddCmd.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailAddCmd.java index 0783178..d27322e 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailAddCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailAddCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailCloseCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailCloseCmd.java similarity index 90% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailCloseCmd.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailCloseCmd.java index fc2fb1b..2915495 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailCloseCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailCloseCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailPageQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailPageQry.java similarity index 93% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailPageQry.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailPageQry.java index c27ee18..37d0f72 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailPageQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailPageQry.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailSaveCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailSaveCmd.java similarity index 94% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailSaveCmd.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailSaveCmd.java index 17a5e76..0dd4da6 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailSaveCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailSaveCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailUpdateScoreCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailUpdateScoreCmd.java similarity index 94% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailUpdateScoreCmd.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailUpdateScoreCmd.java index ef82b7d..c92b93e 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskDetailUpdateScoreCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailUpdateScoreCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListAddCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListAddCmd.java similarity index 97% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListAddCmd.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListAddCmd.java index 07936a2..52fe008 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListAddCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListAddCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListCloseCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListCloseCmd.java similarity index 91% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListCloseCmd.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListCloseCmd.java index 5b1ca7d..0865067 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListCloseCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListCloseCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListIssueCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListIssueCmd.java similarity index 96% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListIssueCmd.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListIssueCmd.java index 5e8838d..879d5eb 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListIssueCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListIssueCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListPageQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListPageQry.java similarity index 93% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListPageQry.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListPageQry.java index 17ec923..b4e0afc 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListPageQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListPageQry.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListStatisticsQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListStatisticsQry.java similarity index 82% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListStatisticsQry.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListStatisticsQry.java index b531d7a..e856e11 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListStatisticsQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListStatisticsQry.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListSwitchCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListSwitchCmd.java similarity index 92% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListSwitchCmd.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListSwitchCmd.java index 17685a2..f7a912e 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListSwitchCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListSwitchCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; diff --git a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListUpdateCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListUpdateCmd.java similarity index 97% rename from web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListUpdateCmd.java rename to web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListUpdateCmd.java index 28c44eb..e8d7808 100644 --- a/web-client/src/main/java/com/zcloud/safety/accountability/list/dto/tasklist/TaskListUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskListUpdateCmd.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.dto.tasklist; +package com.zcloud.safetyDutyList.dto.tasklist; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/web-domain/pom.xml b/web-domain/pom.xml index d48bd75..f98bd03 100644 --- a/web-domain/pom.xml +++ b/web-domain/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - com.zcloud.safety.accountability.list - zcloud_gbs_safety_accountability_list + com.zcloud.safetyDutyList + zcloud_gbs_safetyDutyList 1.0-SNAPSHOT ../pom.xml diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/ExceptionTypeEnum.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/ExceptionTypeEnum.java similarity index 92% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/ExceptionTypeEnum.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/ExceptionTypeEnum.java index 4531fe8..b5fa6a6 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/ExceptionTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/ExceptionTypeEnum.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.enums; +package com.zcloud.safetyDutyList.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/FeedbackCycleEnum.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/FeedbackCycleEnum.java similarity index 93% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/FeedbackCycleEnum.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/FeedbackCycleEnum.java index bd2f263..d290c37 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/FeedbackCycleEnum.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/FeedbackCycleEnum.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.enums; +package com.zcloud.safetyDutyList.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/FeedbackStatusEnum.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/FeedbackStatusEnum.java similarity index 91% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/FeedbackStatusEnum.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/FeedbackStatusEnum.java index 6a8f05d..b249531 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/FeedbackStatusEnum.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/FeedbackStatusEnum.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.enums; +package com.zcloud.safetyDutyList.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/MenuEnum.java similarity index 94% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/MenuEnum.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/MenuEnum.java index 4ce7ac4..a7173e0 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/MenuEnum.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/MenuEnum.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.enums; +package com.zcloud.safetyDutyList.domain.enums; import lombok.Getter; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/SwitchFlagEnum.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/SwitchFlagEnum.java similarity index 86% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/SwitchFlagEnum.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/SwitchFlagEnum.java index ce96e01..543da88 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/SwitchFlagEnum.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/SwitchFlagEnum.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.enums; +package com.zcloud.safetyDutyList.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/TaskLevelEnum.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/TaskLevelEnum.java similarity index 92% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/TaskLevelEnum.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/TaskLevelEnum.java index 2aae3b8..fb0dc19 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/TaskLevelEnum.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/TaskLevelEnum.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.enums; +package com.zcloud.safetyDutyList.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/TaskStatusEnum.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/TaskStatusEnum.java similarity index 92% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/TaskStatusEnum.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/TaskStatusEnum.java index a1bf796..1581ef1 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/enums/TaskStatusEnum.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/enums/TaskStatusEnum.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.enums; +package com.zcloud.safetyDutyList.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/FeedbackExceptionGateway.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/FeedbackExceptionGateway.java similarity index 91% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/FeedbackExceptionGateway.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/FeedbackExceptionGateway.java index 2f436cd..a6da151 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/FeedbackExceptionGateway.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/FeedbackExceptionGateway.java @@ -1,6 +1,6 @@ -package com.zcloud.safety.accountability.list.domain.gateway.tasklist; +package com.zcloud.safetyDutyList.domain.gateway.tasklist; -import com.zcloud.safety.accountability.list.domain.model.tasklist.FeedbackExceptionE; +import com.zcloud.safetyDutyList.domain.model.tasklist.FeedbackExceptionE; import java.util.List; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/FeedbackGateway.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/FeedbackGateway.java similarity index 91% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/FeedbackGateway.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/FeedbackGateway.java index 49ad217..fb433b8 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/FeedbackGateway.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/FeedbackGateway.java @@ -1,6 +1,6 @@ -package com.zcloud.safety.accountability.list.domain.gateway.tasklist; +package com.zcloud.safetyDutyList.domain.gateway.tasklist; -import com.zcloud.safety.accountability.list.domain.model.tasklist.FeedbackE; +import com.zcloud.safetyDutyList.domain.model.tasklist.FeedbackE; import java.util.List; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/TaskDetailGateway.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/TaskDetailGateway.java similarity index 92% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/TaskDetailGateway.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/TaskDetailGateway.java index ba74cbe..0f6f027 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/TaskDetailGateway.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/TaskDetailGateway.java @@ -1,6 +1,6 @@ -package com.zcloud.safety.accountability.list.domain.gateway.tasklist; +package com.zcloud.safetyDutyList.domain.gateway.tasklist; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; import java.util.List; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/TaskListGateway.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/TaskListGateway.java similarity index 91% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/TaskListGateway.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/TaskListGateway.java index 27a033e..ad5bb32 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/gateway/tasklist/TaskListGateway.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/gateway/tasklist/TaskListGateway.java @@ -1,6 +1,6 @@ -package com.zcloud.safety.accountability.list.domain.gateway.tasklist; +package com.zcloud.safetyDutyList.domain.gateway.tasklist; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskListE; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE; import java.util.List; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/FeedbackE.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/FeedbackE.java similarity index 93% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/FeedbackE.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/FeedbackE.java index 56d0b24..9e50d7c 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/FeedbackE.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/FeedbackE.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.model.tasklist; +package com.zcloud.safetyDutyList.domain.model.tasklist; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.gbscommon.utils.Tools; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/FeedbackExceptionE.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/FeedbackExceptionE.java similarity index 93% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/FeedbackExceptionE.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/FeedbackExceptionE.java index bce6ab9..e9cd95a 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/FeedbackExceptionE.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/FeedbackExceptionE.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.model.tasklist; +package com.zcloud.safetyDutyList.domain.model.tasklist; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.gbscommon.utils.Tools; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/TaskDetailE.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/TaskDetailE.java similarity index 93% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/TaskDetailE.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/TaskDetailE.java index 2a69cee..14bd274 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/TaskDetailE.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/TaskDetailE.java @@ -1,10 +1,9 @@ -package com.zcloud.safety.accountability.list.domain.model.tasklist; +package com.zcloud.safetyDutyList.domain.model.tasklist; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.gbscommon.utils.Tools; import lombok.Data; import org.springframework.util.ObjectUtils; - import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/TaskListE.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/TaskListE.java similarity index 94% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/TaskListE.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/TaskListE.java index 9521e07..2fdf81a 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/model/tasklist/TaskListE.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/model/tasklist/TaskListE.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.model.tasklist; +package com.zcloud.safetyDutyList.domain.model.tasklist; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.gbscommon.utils.Tools; diff --git a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/util/FeedbackCycleUtil.java b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/util/FeedbackCycleUtil.java similarity index 99% rename from web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/util/FeedbackCycleUtil.java rename to web-domain/src/main/java/com/zcloud/safetyDutyList/domain/util/FeedbackCycleUtil.java index ee94078..de8ea34 100644 --- a/web-domain/src/main/java/com/zcloud/safety/accountability/list/domain/util/FeedbackCycleUtil.java +++ b/web-domain/src/main/java/com/zcloud/safetyDutyList/domain/util/FeedbackCycleUtil.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.domain.util; +package com.zcloud.safetyDutyList.domain.util; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/web-infrastructure/pom.xml b/web-infrastructure/pom.xml index 3548501..6e0909a 100644 --- a/web-infrastructure/pom.xml +++ b/web-infrastructure/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - com.zcloud.safety.accountability.list - zcloud_gbs_safety_accountability_list + com.zcloud.safetyDutyList + zcloud_gbs_safetyDutyList 1.0-SNAPSHOT ../pom.xml @@ -19,7 +19,7 @@ - com.zcloud.safety.accountability.list + com.zcloud.safetyDutyList web-domain diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/FeedbackExceptionGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/FeedbackExceptionGatewayImpl.java similarity index 90% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/FeedbackExceptionGatewayImpl.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/FeedbackExceptionGatewayImpl.java index e047b69..9e73219 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/FeedbackExceptionGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/FeedbackExceptionGatewayImpl.java @@ -1,10 +1,10 @@ -package com.zcloud.safety.accountability.list.gatewayimpl.tasklist; +package com.zcloud.safetyDutyList.gatewayimpl.tasklist; import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.FeedbackExceptionGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.FeedbackExceptionE; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.FeedbackExceptionDO; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.FeedbackExceptionRepository; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackExceptionGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.FeedbackExceptionE; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.FeedbackExceptionDO; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.FeedbackExceptionRepository; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/FeedbackGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/FeedbackGatewayImpl.java similarity index 85% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/FeedbackGatewayImpl.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/FeedbackGatewayImpl.java index 3313914..93e5eae 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/FeedbackGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/FeedbackGatewayImpl.java @@ -1,10 +1,10 @@ -package com.zcloud.safety.accountability.list.gatewayimpl.tasklist; +package com.zcloud.safetyDutyList.gatewayimpl.tasklist; import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.FeedbackGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.FeedbackE; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.FeedbackDO; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.FeedbackRepository; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.FeedbackGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.FeedbackE; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.FeedbackDO; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.FeedbackRepository; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/TaskDetailGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/TaskDetailGatewayImpl.java similarity index 91% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/TaskDetailGatewayImpl.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/TaskDetailGatewayImpl.java index 792e183..3b83552 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/TaskDetailGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/TaskDetailGatewayImpl.java @@ -1,10 +1,10 @@ -package com.zcloud.safety.accountability.list.gatewayimpl.tasklist; +package com.zcloud.safetyDutyList.gatewayimpl.tasklist; import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskDetailGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskDetailE; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.TaskDetailDO; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.TaskDetailRepository; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskDetailGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskDetailE; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.TaskDetailDO; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskDetailRepository; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/TaskListGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/TaskListGatewayImpl.java similarity index 91% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/TaskListGatewayImpl.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/TaskListGatewayImpl.java index f200a60..94ff3ca 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/gatewayimpl/tasklist/TaskListGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/gatewayimpl/tasklist/TaskListGatewayImpl.java @@ -1,11 +1,11 @@ -package com.zcloud.safety.accountability.list.gatewayimpl.tasklist; +package com.zcloud.safetyDutyList.gatewayimpl.tasklist; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.safety.accountability.list.domain.gateway.tasklist.TaskListGateway; -import com.zcloud.safety.accountability.list.domain.model.tasklist.TaskListE; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.TaskListDO; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.TaskListRepository; +import com.zcloud.safetyDutyList.domain.gateway.tasklist.TaskListGateway; +import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.TaskListDO; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskListRepository; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/CorpStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/CorpStatisticsDO.java similarity index 91% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/CorpStatisticsDO.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/CorpStatisticsDO.java index 320d35c..8edb1ec 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/CorpStatisticsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/CorpStatisticsDO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.persistence.dataobject.tasklist; +package com.zcloud.safetyDutyList.persistence.dataobject.tasklist; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/EvaluationListDO.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/EvaluationListDO.java similarity index 87% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/EvaluationListDO.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/EvaluationListDO.java index f8d55d2..e6531b3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/EvaluationListDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/EvaluationListDO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.persistence.dataobject.tasklist; +package com.zcloud.safetyDutyList.persistence.dataobject.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/FeedbackDO.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/FeedbackDO.java similarity index 96% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/FeedbackDO.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/FeedbackDO.java index e7a0b9b..2bf1961 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/FeedbackDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/FeedbackDO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.persistence.dataobject.tasklist; +package com.zcloud.safetyDutyList.persistence.dataobject.tasklist; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/FeedbackExceptionDO.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/FeedbackExceptionDO.java similarity index 96% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/FeedbackExceptionDO.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/FeedbackExceptionDO.java index 6cfcde6..3a19db6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/FeedbackExceptionDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/FeedbackExceptionDO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.persistence.dataobject.tasklist; +package com.zcloud.safetyDutyList.persistence.dataobject.tasklist; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/IssueStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/IssueStatisticsDO.java similarity index 87% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/IssueStatisticsDO.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/IssueStatisticsDO.java index 3fa82e4..4c0850a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/IssueStatisticsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/IssueStatisticsDO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.persistence.dataobject.tasklist; +package com.zcloud.safetyDutyList.persistence.dataobject.tasklist; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/TaskDetailDO.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/TaskDetailDO.java similarity index 97% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/TaskDetailDO.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/TaskDetailDO.java index 5da442c..8af6295 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/TaskDetailDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/TaskDetailDO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.persistence.dataobject.tasklist; +package com.zcloud.safetyDutyList.persistence.dataobject.tasklist; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/TaskListDO.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/TaskListDO.java similarity index 97% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/TaskListDO.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/TaskListDO.java index f34878c..dfaba13 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/dataobject/tasklist/TaskListDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/dataobject/tasklist/TaskListDO.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.persistence.dataobject.tasklist; +package com.zcloud.safetyDutyList.persistence.dataobject.tasklist; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/FeedbackExceptionMapper.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/FeedbackExceptionMapper.java similarity index 91% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/FeedbackExceptionMapper.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/FeedbackExceptionMapper.java index c807865..61d2460 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/FeedbackExceptionMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/FeedbackExceptionMapper.java @@ -1,8 +1,8 @@ -package com.zcloud.safety.accountability.list.persistence.mapper.tasklist; +package com.zcloud.safetyDutyList.persistence.mapper.tasklist; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.FeedbackExceptionDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.FeedbackExceptionDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/FeedbackMapper.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/FeedbackMapper.java similarity index 82% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/FeedbackMapper.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/FeedbackMapper.java index c4ce1a7..0c4224e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/FeedbackMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/FeedbackMapper.java @@ -1,8 +1,8 @@ -package com.zcloud.safety.accountability.list.persistence.mapper.tasklist; +package com.zcloud.safetyDutyList.persistence.mapper.tasklist; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.FeedbackDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.FeedbackDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/TaskDetailMapper.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/TaskDetailMapper.java similarity index 91% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/TaskDetailMapper.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/TaskDetailMapper.java index 63846dc..635e07a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/TaskDetailMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/TaskDetailMapper.java @@ -1,8 +1,8 @@ -package com.zcloud.safety.accountability.list.persistence.mapper.tasklist; +package com.zcloud.safetyDutyList.persistence.mapper.tasklist; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.TaskDetailDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.TaskDetailDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/TaskListMapper.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/TaskListMapper.java similarity index 71% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/TaskListMapper.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/TaskListMapper.java index cd3e84b..1502cfc 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/mapper/tasklist/TaskListMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/mapper/tasklist/TaskListMapper.java @@ -1,11 +1,11 @@ -package com.zcloud.safety.accountability.list.persistence.mapper.tasklist; +package com.zcloud.safetyDutyList.persistence.mapper.tasklist; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.CorpStatisticsDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.EvaluationListDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.IssueStatisticsDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.TaskListDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.CorpStatisticsDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.EvaluationListDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.IssueStatisticsDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.TaskListDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/FeedbackExceptionRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/FeedbackExceptionRepositoryImpl.java similarity index 86% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/FeedbackExceptionRepositoryImpl.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/FeedbackExceptionRepositoryImpl.java index 98c813f..73b8254 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/FeedbackExceptionRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/FeedbackExceptionRepositoryImpl.java @@ -1,13 +1,13 @@ -package com.zcloud.safety.accountability.list.persistence.repository.impl.tasklist; +package com.zcloud.safetyDutyList.persistence.repository.impl.tasklist; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.Query; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.FeedbackExceptionDO; -import com.zcloud.safety.accountability.list.persistence.mapper.tasklist.FeedbackExceptionMapper; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.FeedbackExceptionRepository; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.FeedbackExceptionDO; +import com.zcloud.safetyDutyList.persistence.mapper.tasklist.FeedbackExceptionMapper; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.FeedbackExceptionRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/FeedbackRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/FeedbackRepositoryImpl.java similarity index 79% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/FeedbackRepositoryImpl.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/FeedbackRepositoryImpl.java index 9af581d..5f6229f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/FeedbackRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/FeedbackRepositoryImpl.java @@ -1,13 +1,13 @@ -package com.zcloud.safety.accountability.list.persistence.repository.impl.tasklist; +package com.zcloud.safetyDutyList.persistence.repository.impl.tasklist; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.Query; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.FeedbackDO; -import com.zcloud.safety.accountability.list.persistence.mapper.tasklist.FeedbackMapper; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.FeedbackRepository; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.FeedbackDO; +import com.zcloud.safetyDutyList.persistence.mapper.tasklist.FeedbackMapper; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.FeedbackRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/TaskDetailRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskDetailRepositoryImpl.java similarity index 86% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/TaskDetailRepositoryImpl.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskDetailRepositoryImpl.java index 04b849e..5e4139b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/TaskDetailRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskDetailRepositoryImpl.java @@ -1,13 +1,13 @@ -package com.zcloud.safety.accountability.list.persistence.repository.impl.tasklist; +package com.zcloud.safetyDutyList.persistence.repository.impl.tasklist; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.Query; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.TaskDetailDO; -import com.zcloud.safety.accountability.list.persistence.mapper.tasklist.TaskDetailMapper; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.TaskDetailRepository; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.TaskDetailDO; +import com.zcloud.safetyDutyList.persistence.mapper.tasklist.TaskDetailMapper; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskDetailRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java similarity index 82% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java index d017ea2..e378189 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/impl/tasklist/TaskListRepositoryImpl.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.persistence.repository.impl.tasklist; +package com.zcloud.safetyDutyList.persistence.repository.impl.tasklist; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.Query; -import com.zcloud.safety.accountability.list.domain.enums.MenuEnum; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.CorpStatisticsDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.EvaluationListDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.IssueStatisticsDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.TaskListDO; -import com.zcloud.safety.accountability.list.persistence.mapper.tasklist.TaskListMapper; -import com.zcloud.safety.accountability.list.persistence.repository.tasklist.TaskListRepository; +import com.zcloud.safetyDutyList.domain.enums.MenuEnum; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.CorpStatisticsDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.EvaluationListDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.IssueStatisticsDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.TaskListDO; +import com.zcloud.safetyDutyList.persistence.mapper.tasklist.TaskListMapper; +import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskListRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/FeedbackExceptionRepository.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/FeedbackExceptionRepository.java similarity index 91% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/FeedbackExceptionRepository.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/FeedbackExceptionRepository.java index 5fcc0e0..8c29324 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/FeedbackExceptionRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/FeedbackExceptionRepository.java @@ -1,8 +1,8 @@ -package com.zcloud.safety.accountability.list.persistence.repository.tasklist; +package com.zcloud.safetyDutyList.persistence.repository.tasklist; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.FeedbackExceptionDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.FeedbackExceptionDO; import java.util.List; import java.util.Map; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/FeedbackRepository.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/FeedbackRepository.java similarity index 80% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/FeedbackRepository.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/FeedbackRepository.java index 7dd6b50..561604b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/FeedbackRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/FeedbackRepository.java @@ -1,8 +1,8 @@ -package com.zcloud.safety.accountability.list.persistence.repository.tasklist; +package com.zcloud.safetyDutyList.persistence.repository.tasklist; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.FeedbackDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.FeedbackDO; import java.util.List; import java.util.Map; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/TaskDetailRepository.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/TaskDetailRepository.java similarity index 90% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/TaskDetailRepository.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/TaskDetailRepository.java index c146308..89aa266 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/TaskDetailRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/TaskDetailRepository.java @@ -1,8 +1,8 @@ -package com.zcloud.safety.accountability.list.persistence.repository.tasklist; +package com.zcloud.safetyDutyList.persistence.repository.tasklist; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.TaskDetailDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.TaskDetailDO; import java.util.List; import java.util.Map; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/TaskListRepository.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/TaskListRepository.java similarity index 69% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/TaskListRepository.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/TaskListRepository.java index c4e1449..3251e6b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/persistence/repository/tasklist/TaskListRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/persistence/repository/tasklist/TaskListRepository.java @@ -1,11 +1,11 @@ -package com.zcloud.safety.accountability.list.persistence.repository.tasklist; +package com.zcloud.safetyDutyList.persistence.repository.tasklist; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.CorpStatisticsDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.EvaluationListDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.IssueStatisticsDO; -import com.zcloud.safety.accountability.list.persistence.dataobject.tasklist.TaskListDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.CorpStatisticsDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.EvaluationListDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.IssueStatisticsDO; +import com.zcloud.safetyDutyList.persistence.dataobject.tasklist.TaskListDO; import java.util.List; import java.util.Map; diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/utils/Query.java b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/utils/Query.java similarity index 96% rename from web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/utils/Query.java rename to web-infrastructure/src/main/java/com/zcloud/safetyDutyList/utils/Query.java index 0fc4b8f..8634fbc 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/accountability/list/utils/Query.java +++ b/web-infrastructure/src/main/java/com/zcloud/safetyDutyList/utils/Query.java @@ -1,4 +1,4 @@ -package com.zcloud.safety.accountability.list.utils; +package com.zcloud.safetyDutyList.utils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; diff --git a/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackExceptionMapper.xml b/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackExceptionMapper.xml index 314e5a3..427be44 100644 --- a/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackExceptionMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackExceptionMapper.xml @@ -1,10 +1,10 @@ - + - + - SELECT fe.*, tl.task_list_name AS taskListName, td.execute_content AS executeContent, @@ -31,25 +31,25 @@ ORDER BY fe.create_time DESC - SELECT * FROM safety_accountability_feedback_exception WHERE task_detail_id = #{feedbackId} ORDER BY create_time DESC - SELECT * FROM safety_accountability_feedback_exception WHERE task_list_id = #{taskListId} ORDER BY create_time DESC - SELECT * FROM safety_accountability_feedback_exception WHERE task_detail_id = #{taskDetailId} ORDER BY create_time DESC - SELECT * FROM safety_accountability_feedback_exception WHERE feedback_exception_id = #{exceptionId} diff --git a/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackMapper.xml b/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackMapper.xml index 431e4ff..0bf2189 100644 --- a/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/tasklist/FeedbackMapper.xml @@ -1,10 +1,10 @@ - + - + - SELECT f.*, td.execute_content AS executeContent, tl.task_list_name AS taskListName, @@ -34,19 +34,19 @@ ORDER BY f.create_time DESC - SELECT * FROM safety_accountability_feedback WHERE task_list_id = #{taskListId} ORDER BY create_time DESC - SELECT * FROM safety_accountability_feedback WHERE task_detail_id = #{taskDetailId} ORDER BY create_time DESC - SELECT f.*, td.execute_content AS executeContent, tl.task_list_name AS taskListName, diff --git a/web-infrastructure/src/main/resources/mapper/tasklist/TaskDetailMapper.xml b/web-infrastructure/src/main/resources/mapper/tasklist/TaskDetailMapper.xml index 16e08ba..cef56bc 100644 --- a/web-infrastructure/src/main/resources/mapper/tasklist/TaskDetailMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/tasklist/TaskDetailMapper.xml @@ -1,10 +1,10 @@ - + - + - SELECT td.*, tl.task_list_name AS taskListName, tl.task_level AS taskLevel, @@ -32,13 +32,13 @@ ORDER BY td.id ASC - SELECT * FROM safety_accountability_task_detail WHERE task_list_id = #{taskListId} ORDER BY id ASC - SELECT td.*, tl.task_list_name AS taskListName, tl.task_level AS taskLevel, @@ -56,7 +56,7 @@ DELETE FROM safety_accountability_task_detail WHERE task_list_id = #{taskListId} - SELECT * FROM safety_accountability_task_detail WHERE task_status = 1 diff --git a/web-infrastructure/src/main/resources/mapper/tasklist/TaskListMapper.xml b/web-infrastructure/src/main/resources/mapper/tasklist/TaskListMapper.xml index fb226e3..b8150f5 100644 --- a/web-infrastructure/src/main/resources/mapper/tasklist/TaskListMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/tasklist/TaskListMapper.xml @@ -1,10 +1,10 @@ - + - + - SELECT tl.*, exec_dept.name AS executeDepartmentName, exec_user.name AS executeUserName, @@ -47,7 +47,7 @@ ORDER BY tl.create_time DESC - SELECT tl.*, exec_dept.name AS executeDepartmentName, exec_user.name AS executeUserName, @@ -70,7 +70,7 @@ WHERE tl.id = #{id} - SELECT tl.*, exec_dept.name AS executeDepartmentName, exec_user.name AS executeUserName, @@ -93,13 +93,13 @@ WHERE tl.task_list_id = #{taskListId} - SELECT * FROM safety_accountability_task_list WHERE task_list_id = #{taskListId} - SELECT tl.*, exec_dept.name AS executeDepartmentName, exec_user.name AS executeUserName, @@ -136,12 +136,12 @@ ORDER BY tl.create_time DESC - SELECT * FROM safety_accountability_task_list WHERE status = 1 AND issue_status = 1 AND (period_end_time IS NOT NULL AND period_end_time < NOW()) - SELECT tl.execute_corp_id AS corpId, ci.corp_name AS corpName, COUNT(*) AS totalTaskCount, @@ -157,7 +157,7 @@ ORDER BY tl.create_corp_id - SELECT tl.execute_corp_id AS corpId, ci.corp_name AS corpName, COUNT(*) AS listCount @@ -177,7 +177,7 @@ ORDER BY tl.execute_corp_id - SELECT tl.execute_corp_id AS corpId, ci.corp_name AS corpName, COUNT(*) AS issueCount