diff --git a/script/sql/vincent/V1.10.1-数据编目-达梦.sql b/script/sql/vincent/V1.10.1-数据编目-达梦.sql index 000ffe3a..c0714e39 100644 --- a/script/sql/vincent/V1.10.1-数据编目-达梦.sql +++ b/script/sql/vincent/V1.10.1-数据编目-达梦.sql @@ -1,8 +1,8 @@ CREATE TABLE SZ_SFJ_ZFJDM_XZJC_INFO ( ID BIGINT NOT NULL IDENTITY(1,1) COMMENT '主键,自增ID', YWID VARCHAR(64) NOT NULL COMMENT '业务ID', - BJQYMC VARCHAR(128) DEFAULT NULL COMMENT '被检查企业名称', - BJQYTYSHXYDM VARCHAR(32) DEFAULT NULL COMMENT '被检查企业统一社会信用代码', + BJQQYMC VARCHAR(128) DEFAULT NULL COMMENT '被检查企业名称', + BJQQYTYSHXYDM VARCHAR(32) DEFAULT NULL COMMENT '被检查企业统一社会信用代码', SSQYBM VARCHAR(64) DEFAULT NULL COMMENT '所属区域编码', SSQYMC VARCHAR(64) DEFAULT NULL COMMENT '所属区域名称', JCSX VARCHAR(512) DEFAULT NULL COMMENT '检查事项', @@ -16,7 +16,7 @@ CREATE TABLE SZ_SFJ_ZFJDM_XZJC_INFO ( WTJCBMMC VARCHAR(128) DEFAULT NULL COMMENT '委托检查部门名称', SFSM TINYINT DEFAULT NULL COMMENT '是否扫码:0是,1否', WSMYY VARCHAR(256) DEFAULT NULL COMMENT '未扫码原因:0其他|1企业原因|2系统原因|3扫码未能显示企业信息|9补录', - QTYYXXQ VARCHAR(512) DEFAULT NULL COMMENT '其他原因详情', + QTYXXQ VARCHAR(512) DEFAULT NULL COMMENT '其他原因详情', ZFRYXM VARCHAR(64) DEFAULT NULL COMMENT '执法人员姓名', XZZFZH VARCHAR(64) DEFAULT NULL COMMENT '行政执法证号', QTZFRYXM VARCHAR(64) DEFAULT NULL COMMENT '其他执法人员姓名', @@ -36,7 +36,7 @@ CREATE TABLE SZ_SFJ_ZFJDM_XZJC_INFO ( ) COMMENT='深圳市涉企行政执法扫码入企登记信息'; -- 索引 -CREATE INDEX IDX_BJQY_CREDIT ON SZ_SFJ_ZFJDM_XZJC_INFO(BJQYTYSHXYDM); +CREATE INDEX IDX_BJQY_CREDIT ON SZ_SFJ_ZFJDM_XZJC_INFO(BJQQYTYSHXYDM); CREATE INDEX IDX_RQSJ ON SZ_SFJ_ZFJDM_XZJC_INFO(RQSJ); -- YWID 唯一:同一业务ID只保留一行(先查后写的防重兜底) CREATE UNIQUE INDEX UK_YWID ON SZ_SFJ_ZFJDM_XZJC_INFO(YWID); diff --git a/script/sql/vincent/V1.10.1_20261013_tgk.sql b/script/sql/vincent/V1.10.1_20261013_tgk.sql index d240cd27..367a0ef4 100644 --- a/script/sql/vincent/V1.10.1_20261013_tgk.sql +++ b/script/sql/vincent/V1.10.1_20261013_tgk.sql @@ -3,8 +3,8 @@ DROP TABLE IF EXISTS `SZSFJ_ZFJDM_XZJC_INFO`; CREATE TABLE `SZSFJ_ZFJDM_XZJC_INFO` ( `ID` bigint NOT NULL AUTO_INCREMENT COMMENT '主键,自增ID', `YWID` varchar(64) NOT NULL COMMENT '业务ID', - `BJQYMC` varchar(128) DEFAULT NULL COMMENT '被检查企业名称', - `BJQYTYSHXYDM` varchar(32) DEFAULT NULL COMMENT '被检查企业统一社会信用代码', + `BJQQYMC` varchar(128) DEFAULT NULL COMMENT '被检查企业名称', + `BJQQYTYSHXYDM` varchar(32) DEFAULT NULL COMMENT '被检查企业统一社会信用代码', `SSQYBM` varchar(64) DEFAULT NULL COMMENT '所属区域编码', `SSQYMC` varchar(64) DEFAULT NULL COMMENT '所属区域名称', `JCSX` varchar(512) DEFAULT NULL COMMENT '检查事项', @@ -18,7 +18,7 @@ CREATE TABLE `SZSFJ_ZFJDM_XZJC_INFO` ( `WTJCBMMC` varchar(128) DEFAULT NULL COMMENT '委托检查部门名称', `SFSM` tinyint DEFAULT NULL COMMENT '是否扫码:0是,1否', `WSMYY` varchar(256) DEFAULT NULL COMMENT '未扫码原因:0其他|1企业原因|2系统原因|3扫码未能显示企业信息|9补录', - `QTYYXXQ` varchar(512) DEFAULT NULL COMMENT '其他原因详情', + `QTYXXQ` varchar(512) DEFAULT NULL COMMENT '其他原因详情', `ZFRYXM` varchar(64) DEFAULT NULL COMMENT '执法人员姓名', `XZZFZH` varchar(64) DEFAULT NULL COMMENT '行政执法证号', `QTZFRYXM` varchar(64) DEFAULT NULL COMMENT '其他执法人员姓名', @@ -37,13 +37,13 @@ CREATE TABLE `SZSFJ_ZFJDM_XZJC_INFO` ( `remark` varchar(256) DEFAULT NULL COMMENT '备注', PRIMARY KEY (`ID`), UNIQUE KEY `uk_ywid` (`YWID`), - KEY `idx_bjqy_credit` (`BJQYTYSHXYDM`), + KEY `idx_bjqy_credit` (`BJQQYTYSHXYDM`), KEY `idx_rqsj` (`RQSJ`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='深圳市涉企行政执法扫码入企登记信息'; INSERT INTO sys_job (job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark) -VALUES ('行政检查信息共享同步(tgk到gxk)', +VALUES ('省数据编码-行政执法扫码入企登记信息共享(局)', 'DEFAULT', 'xzjcInfoShareJob.execute()', '0 30 2 * * ?', @@ -52,3 +52,50 @@ VALUES ('行政检查信息共享同步(tgk到gxk)', '0', -- status: 正常 'admin', NOW(), ''); + +-- 已部署环境增量变更: +-- ALTER TABLE SZSFJ_ZFJDM_XZJC_INFO CHANGE COLUMN QTYYXXQ QTYXXQ varchar(512) DEFAULT NULL COMMENT '其他原因详情'; + + + +DROP TABLE IF EXISTS `SZ_SFJ_ZFJDM_XZJC_INFO`; + +CREATE TABLE `SZ_SFJ_ZFJDM_XZJC_INFO` ( + `ID` bigint NOT NULL AUTO_INCREMENT COMMENT '主键,自增ID', + `YWID` varchar(64) NOT NULL COMMENT '业务ID', + `BJQQYMC` varchar(128) DEFAULT NULL COMMENT '被检查企业名称', + `BJQQYTYSHXYDM` varchar(32) DEFAULT NULL COMMENT '被检查企业统一社会信用代码', + `SSQYBM` varchar(64) DEFAULT NULL COMMENT '所属区域编码', + `SSQYMC` varchar(64) DEFAULT NULL COMMENT '所属区域名称', + `JCSX` varchar(512) DEFAULT NULL COMMENT '检查事项', + `RQSJ` datetime DEFAULT NULL COMMENT '入企时间', + `ZFYJ` varchar(512) DEFAULT NULL COMMENT '执法依据', + `JCLB` varchar(2) DEFAULT NULL COMMENT '检查类别:1行政检查|2行政处罚|3行政许可|4行政强制|5行政征收|6行政给付|7行政确认|8行政登记|9行政裁决|10文书送达', + `JCYY` varchar(2) DEFAULT NULL COMMENT '检查原因:01日常检查|02投诉举报|03上级交办|04部门移送|05重点领域治理部署|06专项行动|09其它', + `SFLHJC` tinyint DEFAULT NULL COMMENT '是否联合检查:0否,1是', + `LHJCBH` varchar(50) DEFAULT NULL COMMENT '联合检查编号', + `SFWTJC` tinyint DEFAULT NULL COMMENT '是否委托检查:0否,1是', + `WTJCBMMC` varchar(128) DEFAULT NULL COMMENT '委托检查部门名称', + `SFSM` tinyint DEFAULT NULL COMMENT '是否扫码:0是,1否', + `WSMYY` varchar(256) DEFAULT NULL COMMENT '未扫码原因:0其他|1企业原因|2系统原因|3扫码未能显示企业信息|9补录', + `QTYXXQ` varchar(512) DEFAULT NULL COMMENT '其他原因详情', + `ZFRYXM` varchar(64) DEFAULT NULL COMMENT '执法人员姓名', + `XZZFZH` varchar(64) DEFAULT NULL COMMENT '行政执法证号', + `QTZFRYXM` varchar(64) DEFAULT NULL COMMENT '其他执法人员姓名', + `QTXZZFZH` varchar(64) DEFAULT NULL COMMENT '其他行政执法证号', + `ZFDWID` varchar(64) DEFAULT NULL COMMENT '执法单位ID', + `ZFDWMC` varchar(64) DEFAULT NULL COMMENT '执法单位名称', + `ZFBMMC` varchar(64) DEFAULT NULL COMMENT '执法部门名称', + `SFSC` tinyint DEFAULT 0 COMMENT '是否删除:0否,1是', + `YWCJSJ` datetime DEFAULT NULL COMMENT '业务创建时间', + `YWXGSJ` datetime DEFAULT NULL COMMENT '业务修改时间', + `add_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `cd_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `cd_operation` varchar(4) DEFAULT NULL COMMENT '增量标识:I|插入,U|更新,D|删除', + `cd_batch` varchar(32) DEFAULT NULL COMMENT '批次号', + `remark` varchar(256) DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`ID`), + UNIQUE KEY `uk_ywid` (`YWID`), + KEY `idx_bjqy_credit` (`BJQQYTYSHXYDM`), + KEY `idx_rqsj` (`RQSJ`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='深圳市涉企行政执法扫码入企登记信息'; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/XzjcInfoSyncBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/XzjcInfoSyncBo.java index 72f2d370..252021a8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/XzjcInfoSyncBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/XzjcInfoSyncBo.java @@ -15,11 +15,11 @@ public class XzjcInfoSyncBo { /** 业务ID(YWID) */ private String ywid; - /** 被检查企业名称(BJQYMC) */ - private String bjqymc; + /** 被检查企业名称(BJQQYMC) */ + private String bjqqymc; - /** 被检查企业统一社会信用代码(BJQYTYSHXYDM) */ - private String bjqytyshxydm; + /** 被检查企业统一社会信用代码(BJQQYTYSHXYDM) */ + private String bjqqytyshxydm; /** 所属区域编码-执法单位所属区编码, sys_dept.area_node → dashboard_area_info.code(SSQYBM) */ private String ssqybm; @@ -60,8 +60,8 @@ public class XzjcInfoSyncBo { /** 未扫码原因:0其他|1企业原因|2系统原因|3扫码未能显示企业信息|9补录(WSMYY) */ private String wsmyy; - /** 其他原因详情(QTYYXXQ) */ - private String qtyyxxq; + /** 其他原因详情(QTYXXQ) */ + private String qtyxxq; /** 执法人员姓名(ZFRYXM) */ private String zfryxm; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/XzjcInfoSyncServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/XzjcInfoSyncServiceImpl.java index 03927f7f..8982d41b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/XzjcInfoSyncServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/XzjcInfoSyncServiceImpl.java @@ -183,8 +183,8 @@ public class XzjcInfoSyncServiceImpl implements IXzjcInfoSyncService { XzjcInfoSyncBo bo = new XzjcInfoSyncBo(); bo.setYwid(str(row.get("id"))); - bo.setBjqymc(fit(row.get("enterprise_name"), 128)); - bo.setBjqytyshxydm(fit(row.get("enterprise_number"), 32)); + bo.setBjqqymc(fit(row.get("enterprise_name"), 128)); + bo.setBjqqytyshxydm(fit(row.get("enterprise_number"), 32)); bo.setSsqybm(fit(row.get("ssqybm"), 64)); bo.setSsqymc(fit(row.get("ssqymc"), 64)); bo.setJcsx(fit(coalesce(row, "law_enforcement_item_text", "law_enforcement_item"), 512)); @@ -198,7 +198,7 @@ public class XzjcInfoSyncServiceImpl implements IXzjcInfoSyncService { bo.setWtjcbmmc(fit(row.get("entrust_dept_name"), 128)); bo.setSfsm(toLong(row.get("enforce")) == null ? null : toLong(row.get("enforce")).intValue()); bo.setWsmyy(fit(row.get("check_css"), 256)); - bo.setQtyyxxq(fit(row.get("other_reasons"), 512)); + bo.setQtyxxq(fit(row.get("other_reasons"), 512)); bo.setZfryxm(fit(row.get("law_enforcer"), 64)); bo.setXzzfzh(fit(row.get("law_enforcer_id"), 64)); bo.setQtzfryxm(fit(row.get("law_enforcer_two"), 64)); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/XzjcInfoShareGxkMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/XzjcInfoShareGxkMapper.xml index b248927c..62fa226e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/XzjcInfoShareGxkMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/XzjcInfoShareGxkMapper.xml @@ -17,14 +17,14 @@ INSERT INTO SZ_SFJ_ZFJDM_XZJC_INFO - (YWID, BJQYMC, BJQYTYSHXYDM, SSQYBM, SSQYMC, JCSX, RQSJ, ZFYJ, JCLB, JCYY, - SFLHJC, LHJCBH, SFWTJC, WTJCBMMC, SFSM, WSMYY, QTYYXXQ, + (YWID, BJQQYMC, BJQQYTYSHXYDM, SSQYBM, SSQYMC, JCSX, RQSJ, ZFYJ, JCLB, JCYY, + SFLHJC, LHJCBH, SFWTJC, WTJCBMMC, SFSM, WSMYY, QTYXXQ, ZFRYXM, XZZFZH, QTZFRYXM, QTXZZFZH, ZFDWID, ZFDWMC, ZFBMMC, SFSC, YWCJSJ, YWXGSJ, CD_OPERATION, CD_BATCH) VALUES - (#{item.ywid}, #{item.bjqymc}, #{item.bjqytyshxydm}, #{item.ssqybm}, #{item.ssqymc}, #{item.jcsx}, #{item.rqsj}, + (#{item.ywid}, #{item.bjqqymc}, #{item.bjqqytyshxydm}, #{item.ssqybm}, #{item.ssqymc}, #{item.jcsx}, #{item.rqsj}, #{item.zfyj}, #{item.jclb}, #{item.jcyy}, #{item.sflhjc}, #{item.lhjcbh}, - #{item.sfwtjc}, #{item.wtjcbmmc}, #{item.sfsm}, #{item.wsmyy}, #{item.qtyyxxq}, + #{item.sfwtjc}, #{item.wtjcbmmc}, #{item.sfsm}, #{item.wsmyy}, #{item.qtyxxq}, #{item.zfryxm}, #{item.xzzfzh}, #{item.qtzfryxm}, #{item.qtxzzfzh}, #{item.zfdwid}, #{item.zfdwmc}, #{item.zfbmmc}, #{item.sfsc}, #{item.ywcjsj}, #{item.ywxgsj}, #{item.cdOperation}, #{item.cdBatch}) @@ -33,8 +33,8 @@ UPDATE SZ_SFJ_ZFJDM_XZJC_INFO - SET BJQYMC = #{item.bjqymc}, - BJQYTYSHXYDM = #{item.bjqytyshxydm}, + SET BJQQYMC = #{item.bjqqymc}, + BJQQYTYSHXYDM = #{item.bjqqytyshxydm}, SSQYBM = #{item.ssqybm}, SSQYMC = #{item.ssqymc}, JCSX = #{item.jcsx}, @@ -48,7 +48,7 @@ WTJCBMMC = #{item.wtjcbmmc}, SFSM = #{item.sfsm}, WSMYY = #{item.wsmyy}, - QTYYXXQ = #{item.qtyyxxq}, + QTYXXQ = #{item.qtyxxq}, ZFRYXM = #{item.zfryxm}, XZZFZH = #{item.xzzfzh}, QTZFRYXM = #{item.qtzfryxm}, diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/XzjcInfoShareMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/XzjcInfoShareMapper.xml index e4a685eb..f7e0d9d6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/XzjcInfoShareMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/XzjcInfoShareMapper.xml @@ -6,8 +6,8 @@