Merge remote-tracking branch 'origin/master'

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysnotice/PushNoticeAppVo.java

@@ -14,7 +14,7 @@ public class PushNoticeAppVo {
 
     private String modulePluginName;
 
-    private Integer moduleVersion;
+    private int moduleVersion;
 
     private String json;
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysnotice/SysNoticeMapper.xml

@@ -18,7 +18,7 @@
     </select>
 
     <select id="getLists" resultType="com.yxt.anrui.portal.api.sysnotice.SysNoticeListVo">
-        select sid, title, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, pcUrl, appUrl
+        select sid, title, DATE_FORMAT(createTime, '%Y-%m-%d') as createTime, pcUrl
         from sys_notice
         where state = 1
           and (validityDate is null or validityDate = '' or validityDate > NOW())

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysnotice/SysNoticeService.java

@@ -95,6 +95,7 @@ public class SysNoticeService extends MybatisBaseService<SysNoticeMapper, SysNot
             Map<String, Object> maps = new HashMap<>();
             maps.put("sid", sysNotice.getSid());
             sysNotice.setArgs_json(JSONObject.toJSONString(maps));
+            sysNotice.setCreateType("0");
             baseMapper.insert(sysNotice);
         } else {
             SysNotice sysNotice = fetchBySid(sid);
@@ -108,6 +109,7 @@ public class SysNoticeService extends MybatisBaseService<SysNoticeMapper, SysNot
             Map<String, Object> maps = new HashMap<>();
             maps.put("sid", sysNotice.getSid());
             sysNotice.setArgs_json(JSONObject.toJSONString(maps));
+            sysNotice.setCreateType("0");
             List<UrlQuery> filss = dto.getFilesList();
             filss.removeAll(Collections.singleton(null));
             if (!filss.isEmpty()) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java

@@ -485,7 +485,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 pushNoticeQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
                 pushNoticeQuery.setSid(businessSid);
                 pushNoticeQuery.setCreateTime(DateUtil.today());
-                pushNoticeQuery.setPcUrl("");
+                pushNoticeQuery.setPcUrl("riskcenter/#/notificationannouncement/relation/secondarysaleannouncement");
                 DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                 String closeDates = "";
                 try {

doc/databases/portal_tables.sql

@@ -841,9 +841,44 @@ CREATE TABLE `sys_notice`
     `topping`      varchar(500)         DEFAULT NULL COMMENT '是否置顶',
     `content`      text                 DEFAULT NULL COMMENT '内容',
     `files`        text                 DEFAULT NULL COMMENT '附件',
+    `pcUrl`        text                 DEFAULT NULL COMMENT 'PC地址',
+    `appUrl`       text                 DEFAULT NULL COMMENT 'app地址',
+    `createType`   varchar(200)         DEFAULT NULL COMMENT '生成类型：0添加，1自动',
+    `moduleAction` varchar(500)         DEFAULT NULL COMMENT '移动端页面地址',
+    `app_type`     varchar(500)         DEFAULT NULL COMMENT '0.内置Activity  1.内置WebView  2.RePlugin插件',
+    `args_json`    varchar(500)         DEFAULT NULL COMMENT '参数',
+    `moduleSid`    varchar(500)         DEFAULT NULL COMMENT '插件sid',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 18
   DEFAULT CHARSET = utf8 COMMENT ='通知公告';
 
+
+DROP TABLE IF EXISTS `sys_appendix`;
+CREATE TABLE `sys_appendix`
+(
+    `id`          int(11)     NOT NULL AUTO_INCREMENT,
+    `sid`         varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion` int(11)     NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
+    `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+    `modifyTime`  timestamp   NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+    `isEnable`    int(11)     NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
+    `state`       int(11)              DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(11)              DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注信息',
+    `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建者',
+    `updateBySid` varchar(64)          DEFAULT NULL COMMENT '更新者',
+    `fileName`    text                 DEFAULT NULL COMMENT '文件名',
+    `fileType`    varchar(500)         DEFAULT NULL COMMENT '文件类型',
+    `name`        varchar(500)         DEFAULT NULL COMMENT '上传人姓名',
+    `linkSid`     varchar(500)         DEFAULT NULL COMMENT '关联业务对象sid',
+    `attachType`  varchar(500)         DEFAULT NULL COMMENT '附件类型',
+    `fileSize`    varchar(200)         DEFAULT NULL COMMENT '文件大小',
+    `filePath`    text                 DEFAULT NULL COMMENT '文件的相对路径',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 18
+  DEFAULT CHARSET = utf8 COMMENT ='附件表';
+