Merge branch 'dev-V1.10.0' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev-V1.10.0

script/sql/vincent/V1.2.0_法律法规.sql

@@ -0,0 +1,70 @@
+CREATE TABLE sxt_flfgxxb474136 (
+                                   LAW_NAME TEXT NULL COMMENT '名称',
+                                   TIMELINESS VARCHAR(8) NULL COMMENT '时效性',
+                                   WORD VARCHAR(400) NULL COMMENT '发文字号',
+                                   ORGAN TEXT NULL COMMENT '发布机关',
+                                   PROMULGATION DATETIME NULL COMMENT '颁布日期',
+                                   IMPLEMENTATION DATETIME NULL COMMENT '实施日期',
+                                   REMARK TEXT NULL COMMENT '备注',
+                                   SIGN_ID VARCHAR(80) NULL COMMENT '标识主键',
+                                   DATA_PLACE VARCHAR(200) NULL COMMENT '数据来源标识',
+                                   INS DECIMAL(22,0) NULL COMMENT '系统内部INS',
+                                   SEQ DECIMAL(22,0) NULL COMMENT '系统内部SEQ',
+                                   UPDATESTATUS DECIMAL(22,0) NULL COMMENT '系统内部UPDATESTATUS',
+                                   UPDATETIME DATETIME NULL COMMENT '系统内部UPDATETIME',
+                                   ID VARCHAR(200) NOT NULL COMMENT '非业务主键',
+                                   CD_BATCH VARCHAR(200) NULL COMMENT '批次号',
+                                   ADD_TIME DATETIME NULL COMMENT '新增时间',
+                                   CD_OPERATION VARCHAR(8) NULL COMMENT '增量标识',
+                                   CD_TIME DATETIME NULL COMMENT '最后变更时间',
+                                   BEIYONG1 TEXT NULL COMMENT '备用字段1',
+                                   BEIYONG2 TEXT NULL COMMENT '备用字段2',
+                                   PRIMARY KEY PK_FLFGXXB474136 (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='法规信息表';
+
+
+
+DROP TABLE IF EXISTS `sxt_flfgyjxx470745`;
+CREATE TABLE sxt_flfgyjxx470745 (
+                                    LAW_ID VARCHAR(144) NULL COMMENT '所属法律ID',
+                                    LAW_NAME VARCHAR(2000) NULL COMMENT '所属法律名称',
+                                    DETAIL_SERIES DECIMAL(5,0) NULL COMMENT '编',
+                                    DETAIL_CHAPTER DECIMAL(5,0) NULL COMMENT '章',
+                                    DETAIL_SECTION DECIMAL(5,0) NULL COMMENT '节',
+                                    DETAIL_STRIP DECIMAL(5,0) NULL COMMENT '条',
+                                    DETAIL_FUND DECIMAL(5,0) NULL COMMENT '款',
+                                    DETAIL_ITEM DECIMAL(5,0) NULL COMMENT '项',
+                                    CHAPTER_CAPTION VARCHAR(400) NULL COMMENT '章标题',
+                                    LAW_DETAIL_INDEX VARCHAR(80) NULL COMMENT '法律条文编号',
+                                    DETAIL_CATALOG DECIMAL(5,0) NULL COMMENT '目',
+                                    CONTENT_TEXT TEXT NULL COMMENT '内容',
+                                    SIGN_ID VARCHAR(200) NULL COMMENT '标识主键',
+                                    DATA_PLACE VARCHAR(80) NULL COMMENT '数据来源标识',
+                                    INS DECIMAL(22,0) NULL COMMENT '系统内部INS',
+                                    SEQ DECIMAL(22,0) NULL COMMENT '系统内部SEQ',
+                                    UPDATESTATUS DECIMAL(22,0) NULL COMMENT '系统内部UPDATESTATUS',
+                                    UPDATETIME DATETIME NULL COMMENT '系统内部UPDATETIME',
+                                    ID VARCHAR(200) NOT NULL COMMENT '非业务主键',
+                                    CD_BATCH VARCHAR(200) NULL COMMENT '批次号',
+                                    ADD_TIME DATETIME NULL COMMENT '新增时间',
+                                    CD_OPERATION VARCHAR(8) NULL COMMENT '增量标识',
+                                    CD_TIME DATETIME NULL COMMENT '最后变更时间',
+                                    BEIYONG1 VARCHAR(4000) NULL COMMENT '备用字段1',
+                                    BEIYONG2 VARCHAR(4000) NULL COMMENT '备用字段2',
+                                    PRIMARY KEY PK_FLFGYJXX470745 (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='法律条文详情表';
+
+
+ALTER TABLE sxt_flfgxxb474136
+    ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门',
+    ADD COLUMN create_by   varchar(50)  NULL COMMENT '创建者',
+    ADD COLUMN create_time datetime     NULL COMMENT '创建时间',
+    ADD COLUMN update_by   varchar(50)  NULL COMMENT '更新者',
+    ADD COLUMN update_time datetime     NULL COMMENT '更新时间';
+
+ALTER TABLE sxt_flfgyjxx470745
+    ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门',
+    ADD COLUMN create_by   varchar(50)  NULL COMMENT '创建者',
+    ADD COLUMN create_time datetime     NULL COMMENT '创建时间',
+    ADD COLUMN update_by   varchar(50)  NULL COMMENT '更新者',
+    ADD COLUMN update_time datetime     NULL COMMENT '更新时间';

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/SxtFlfgyjxx470745Controller.java

@@ -23,7 +23,7 @@ import com.zdxt.enforcementcode.service.ISxtFlfgyjxx470745Service;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
- * 法律法规想起
+ * 法律法规详情
  *
  * @author Lion Li
  * @date 2026-08-31

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/SxtFlfgxxb474136.java

@@ -119,10 +119,5 @@ public class SxtFlfgxxb474136 extends BaseEntity {
      */
     private String beiyong2;
 
-    /**
-     * 
-     */
-    private Date dmpShareCdTimeIdatat;
-
 
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/SxtFlfgyjxx470745.java

@@ -108,6 +108,11 @@ public class SxtFlfgyjxx470745 extends BaseEntity {
      */
     private Long updatestatus;
 
+    /**
+     *
+     */
+    private Date updatetime;
+
     /**
      *
      */
@@ -144,10 +149,6 @@ public class SxtFlfgyjxx470745 extends BaseEntity {
      */
     private String beiyong2;
 
-    /**
-     * 
-     */
-    private Date dmpShareCdTimeIdatat;
 
 
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java

@@ -208,10 +208,13 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService {
             case 3 -> "其他";
             default -> "";
         };
+        String checkTime = entity.getEnforceDate() + (StringUtils.isBlank(enforceTimeText) ? "" : " " + enforceTimeText);
         String content =
-            "您好! "+entity.getEnterpriseName()+", " +
+            "【深圳政务短信平台】尊敬的" + entity.getContactPerson() + "（先生/女士），您好！您收到一则行政检查预告消息。信息内容如下："
-                entity.getContactPerson()
+                + "企业名称：" + entity.getEnterpriseName()
-                +", 您有一条于: "+ entity.getEnforceDate() + enforceTimeText+" 的执法预约信息, 请查收";
+                + "；执法单位：" + entity.getBureauDeptName()
+                + "；检查时间：" + checkTime
+                + "。如需了解预告详情，请登录深i企，进入“执法监督码”查看，感谢您的理解！";
         zwSmsClient.asyncSendSms(entity.getContactPhone(), content);
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtFlfgxxb474136ServiceImpl.java

@@ -92,7 +92,6 @@ public class SxtFlfgxxb474136ServiceImpl implements ISxtFlfgxxb474136Service {
         lqw.eq(bo.getCdTime() != null, SxtFlfgxxb474136::getCdTime, bo.getCdTime());
         lqw.eq(StringUtils.isNotBlank(bo.getBeiyong1()), SxtFlfgxxb474136::getBeiyong1, bo.getBeiyong1());
         lqw.eq(StringUtils.isNotBlank(bo.getBeiyong2()), SxtFlfgxxb474136::getBeiyong2, bo.getBeiyong2());
-        lqw.eq(bo.getDmpShareCdTimeIdatat() != null, SxtFlfgxxb474136::getDmpShareCdTimeIdatat, bo.getDmpShareCdTimeIdatat());
         return lqw;
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtFlfgyjxx470745ServiceImpl.java

@@ -91,14 +91,14 @@ public class SxtFlfgyjxx470745ServiceImpl implements ISxtFlfgyjxx470745Service {
         lqw.eq(bo.getSeq() != null, SxtFlfgyjxx470745::getSeq, bo.getSeq());
         lqw.eq(bo.getUpdatestatus() != null, SxtFlfgyjxx470745::getUpdatestatus, bo.getUpdatestatus());
         //lqw.eq(bo.getUpdatetime() != null, SxtFlfgyjxx470745::getUpdatetime, bo.getUpdatetime());
-        lqw.orderByAsc(SxtFlfgyjxx470745::getId);
+        // 按 UPDATETIME 正向排序，ID 作为并列时的稳定排序
+        lqw.orderByAsc(SxtFlfgyjxx470745::getUpdatetime);
         lqw.eq(StringUtils.isNotBlank(bo.getCdBatch()), SxtFlfgyjxx470745::getCdBatch, bo.getCdBatch());
         lqw.eq(bo.getAddTime() != null, SxtFlfgyjxx470745::getAddTime, bo.getAddTime());
         lqw.eq(StringUtils.isNotBlank(bo.getCdOperation()), SxtFlfgyjxx470745::getCdOperation, bo.getCdOperation());
         lqw.eq(bo.getCdTime() != null, SxtFlfgyjxx470745::getCdTime, bo.getCdTime());
         lqw.eq(StringUtils.isNotBlank(bo.getBeiyong1()), SxtFlfgyjxx470745::getBeiyong1, bo.getBeiyong1());
         lqw.eq(StringUtils.isNotBlank(bo.getBeiyong2()), SxtFlfgyjxx470745::getBeiyong2, bo.getBeiyong2());
-        lqw.eq(bo.getDmpShareCdTimeIdatat() != null, SxtFlfgyjxx470745::getDmpShareCdTimeIdatat, bo.getDmpShareCdTimeIdatat());
         return lqw;
     }