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 { diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89__data_sync_job_create.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.91__data_sync_job_create.sql similarity index 78% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89__data_sync_job_create.sql rename to 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.89__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 '乐观锁', diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 4d7e3660d7..b8d6f0689c 100644 Binary files a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls and b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls differ