From a26dde3a2ccd3816f85c1b6c0f8e398f71ae610d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 22 Nov 2022 16:41:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E5=90=8C?= =?UTF-8?q?=E6=AD=A5Processor=EF=BC=8C=E5=88=B0=E4=BA=86=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E5=88=86=E6=94=AF=E5=86=8D=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/processor/YanTaiNatSyncProcessor.java | 2 +- .../com/epmet/processor/YanTaiResiComparisonSyncProcessor.java | 2 +- .../java/com/epmet/processor/YanTaiVaccineSyncProcessor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java index 97c0dec750..f4baf4914e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java @@ -15,7 +15,7 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_NAT; * @Author wxz * @Date 2022/11/20 上午11:43 */ -@Component +//@Component @Slf4j public class YanTaiNatSyncProcessor extends AbstractDataSyncJobProcessor { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java index cbf0810580..f164093290 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; * @Author wxz * @Date 2022/11/15 下午5:54 */ -@Component +//@Component @Slf4j public class YanTaiResiComparisonSyncProcessor extends AbstractDataSyncJobProcessor { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java index a8427d8c8e..aa9b561949 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java @@ -15,7 +15,7 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_VACCINE; * @Author wxz * @Date 2022/11/20 上午11:55 */ -@Component +//@Component @Slf4j public class YanTaiVaccineSyncProcessor extends AbstractDataSyncJobProcessor { From 432009a3b6198e53fb0c689382a24dcbaee9b05b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 22 Nov 2022 17:04:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?sql=E4=B8=ADkey=E8=B6=85=E9=95=BF=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.91__data_sync_job_create.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.91__data_sync_job_create.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.91__data_sync_job_create.sql index e7ff4e1179..1cfa1ffca8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.91__data_sync_job_create.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.91__data_sync_job_create.sql @@ -4,9 +4,9 @@ CREATE TABLE `ic_sync_job` ( `ORG_ID` varchar(64) NOT NULL COMMENT '组织ID', `PID` varchar(255) NOT NULL COMMENT '组织ID的上级', `ORG_ID_PATH` varchar(1024) NOT NULL COMMENT '组织ID的所有上级，包括org_id', - `JOB_TYPE` varchar(255) NOT NULL COMMENT '任务类型，残疾：disability；死亡：death；核酸：nat；', + `JOB_TYPE` varchar(32) NOT NULL COMMENT '任务类型，残疾：disability；死亡：death；核酸：nat；', `OPERATOR_ID` varchar(255) NOT NULL COMMENT '操作员ID【staffId】', - `OPERATION_STATUS` varchar(255) DEFAULT NULL COMMENT '操作状态,等待中：waiting；进行中：processing；结束：finish', + `OPERATION_STATUS` varchar(32) DEFAULT NULL COMMENT '操作状态,等待中：waiting；进行中：processing；结束：finish', `PROCESSOR_IP` varchar(15) DEFAULT NULL COMMENT '处理器实例ip', `DEL_FLAG` int(11) NOT NULL, `REVISION` int(11) NOT NULL COMMENT '乐观锁', From eecc42b0986847fd17effe2dca5fa2e8e847b819 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 23 Nov 2022 11:12:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?/data/aggregator/org/staff-select-list?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=9A=84=E4=B8=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dataaggre/controller/GovOrgController.java | 2 +- .../com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java | 1 + .../src/main/resources/mapper/epmetuser/CustomerStaffDao.xml | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index bbf8011130..67fd1c711d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -189,7 +189,7 @@ public class GovOrgController { /** * 组织下的工作人员 下拉框 - * + * 2022.11.23调整：已经禁用的人，不展示 * @param tokenDto * @param agencyId * @return diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java index 39f67d2af1..2319248c83 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java @@ -75,6 +75,7 @@ public interface CustomerStaffDao extends BaseDao { /** * 根据staffId查询姓名、手机号 + * 禁用的不展示 * @param staffIds * @return */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml index 9ac36b2509..2ee923a736 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml @@ -140,6 +140,7 @@ AND USER_ID = #{staffId} +