添加窗口文件字段

base-manager/db/add.sql

 
 -- ----------------------------
-2023-2-21
+-- 2023-2-21
 -- ----------------------------
 ALTER TABLE mortals_sys_window ADD COLUMN `duty` tinyint (1)  default 0   COMMENT '无人值守(1.是，0.否)' AFTER hongqi;
 ALTER TABLE mortals_sys_window ADD COLUMN `dutyContent` varchar (256) default ""  COMMENT '显示内容' AFTER duty;
@@ -21,7 +21,7 @@ ALTER TABLE mortals_sys_workman ADD COLUMN  `operatorId` varchar (128) default "
 
 
 -- ----------------------------
-2023-3-28
+-- 2023-3-28
 -- ----------------------------
 ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `fieldTypeValue` varchar (255) default ""  COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
 ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `defaultValue` varchar (255) default ""  COMMENT '字段默认值' AFTER fieldValue;
@@ -44,14 +44,14 @@ ALTER TABLE mortals_sys_site_matter ADD COLUMN   `hot` tinyint(2)    DEFAULT '0'
 ALTER TABLE mortals_sys_site_matter ADD COLUMN   `display` tinyint(2)    DEFAULT '1'  COMMENT '显示(0.否,1.是)' AFTER hot;
 
 -- ----------------------------
-2023-4-23
+-- 2023-4-23
 -- ----------------------------
 ALTER TABLE mortals_sys_site_theme_matter ADD COLUMN   `hot` tinyint(2)    DEFAULT '0'  COMMENT '热门(0.否,1.是)' AFTER userType;
 ALTER TABLE mortals_sys_site_theme_matter ADD COLUMN   `display` tinyint(2)    DEFAULT '1'  COMMENT '显示(0.否,1.是)' AFTER hot;
 
 
 -- ----------------------------
-2023-4-25
+-- 2023-4-25
 -- ----------------------------
 -- ----------------------------
 -- 站点大厅信息表
@@ -100,14 +100,14 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '大厅窗口-菜单管理-维
 
 
 -- ----------------------------
-2023-5-04
+-- 2023-5-04
 -- ----------------------------
 ALTER TABLE mortals_sys_window ADD COLUMN `nameDesc` varchar (256)  default "" COMMENT '名称描述' AFTER englishName;
 ALTER TABLE mortals_sys_window ADD COLUMN `englishNameDesc` varchar (256)  default "" COMMENT '英文名称描述' AFTER nameDesc;
 
 
 -- ----------------------------
-2023-5-06
+-- 2023-5-06
 -- ----------------------------
 -- ----------------------------
 -- 设备表
@@ -282,3 +282,10 @@ ALTER TABLE mortals_sys_site ADD COLUMN  `complaintHotline` varchar(64)      COM
 -- ----------------------------
 ALTER TABLE mortals_sys_workman ADD COLUMN  `deleted` tinyint(2)    DEFAULT '0'  COMMENT '是否删除（0.否，1.是）' AFTER modelIds;
 
+
+
+-- ----------------------------
+-- 2025-3-14
+-- ----------------------------
+ALTER TABLE mortals_sys_window ADD COLUMN `fileName` varchar (256)  default "" COMMENT '附件名称' AFTER englishNameDesc;
+ALTER TABLE mortals_sys_window ADD COLUMN `filePath` varchar (256)  default "" COMMENT '附件地址' AFTER fileName;

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -1424,18 +1424,19 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
                     //基本属性
                     sb.append(matterEntity.getMatterName()).append("-基本信息,");
-                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
+                    sb.append("事项名称:").append(matterEntity.getMatterName());
                     Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
                     StringBuilder sb1 = new StringBuilder();
 
                     for (Map.Entry<String, String> entry : baseInfoMap.entrySet()) {
-                        if (sb1.length() > 300) {
+                        if (sb1.length() > 280) {
                             sb.append(sb1);
                             sb.append("\n");
                             sb1 = new StringBuilder();
                             sb.append(matterEntity.getMatterName()).append("-基本信息,");
+                            sb.append("事项名称:").append(matterEntity.getMatterName());
                         }
-                        sb1.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append("  ");
+                        sb1.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append(";");
                     }
                     sb.append(sb1);
 
@@ -1450,7 +1451,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                             if (!"材料名称".equals(entry.getKey())) {
                                 continue;
                             }
-                            sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append("  ");
+                            sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append(";");
                         }
       /*                  List<MatterDatumFileEntity> datumFileEntities = (List<MatterDatumFileEntity>) sqclMap.get("blankList");
                         for (MatterDatumFileEntity datumFileEntity : datumFileEntities) {
@@ -1461,25 +1462,25 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                     //更新受理条件
                     sb.append("\n");
                     sb.append(matterEntity.getMatterName()).append("-受理条件,");
-                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
+                    sb.append("事项名称:").append(matterEntity.getMatterName());
                     Map<String, String> sltjMap = MatterDetailHtmlParseUtil.getSltjMapByHtml(dom);
                     String sltjStr = sltjMap.getOrDefault("sltj", "  ");
                     sb.append(sltjStr);
                     //更新办理流程
                     sb.append("\n");
                     sb.append(matterEntity.getMatterName()).append("-办理流程,");
-                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
+                    sb.append("事项名称:").append(matterEntity.getMatterName());
                     List<Map<String, Object>> bllcMapList = MatterDetailHtmlParseUtil.getbllcMapByHtml(dom);
                     for (Map<String, Object> bllcMap : bllcMapList) {
                         for (Map.Entry<String, Object> entry : bllcMap.entrySet()) {
-                            sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue().toString(), ",", "，")).append("  ");
+                            sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue().toString(), ",", "，")).append(";");
                         }
                     }
 
                     //更新收费标准
                     sb.append("\n");
                     sb.append(matterEntity.getMatterName()).append("-收费标准,");
-                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
+                    sb.append("事项名称:").append(matterEntity.getMatterName());
                     Map<String, String> sfbzMap = MatterDetailHtmlParseUtil.getSfbzMapByHtml(dom);
 
                     String sfbzStr = sfbzMap.getOrDefault("sfbz", "  ");
@@ -1505,26 +1506,27 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                     //中介服务
                     sb.append("\n");
                     sb.append(matterEntity.getMatterName()).append("-中介服务,");
-                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
+                    sb.append("事项名称:").append(matterEntity.getMatterName());
                     Map<String, String> zjfwMap = MatterDetailHtmlParseUtil.getZjfwMapByHtml(dom);
                     for (Map.Entry<String, String> entry : zjfwMap.entrySet()) {
-                        sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append("  ");
+                        sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append(";");
                     }
                     //常见问题
                     sb.append("\n");
                     sb.append(matterEntity.getMatterName()).append("-常见问题,");
-                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
+                    sb.append("事项名称:").append(matterEntity.getMatterName());
                     StringBuilder sb3 = new StringBuilder();
                     List<Map<String, Object>> cjwtMapList = MatterDetailHtmlParseUtil.getCjwtMapByHtml(dom);
                     for (Map<String, Object> bllcMap : cjwtMapList) {
                         for (Map.Entry<String, Object> entry : bllcMap.entrySet()) {
-                            if (sb3.length() > 360) {
+                            if (sb3.length() > 280) {
                                 sb.append(sb3);
                                 sb.append("\n");
                                 sb3 = new StringBuilder();
                                 sb.append(matterEntity.getMatterName()).append("-常见问题,");
+                                sb.append("事项名称:").append(matterEntity.getMatterName());
                             }
-                            sb3.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue().toString(), ",", "，")).append("  ");
+                            sb3.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue().toString(), ",", "，")).append(";");
 
                         }
                     }

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -208,19 +208,6 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         String busiDesc = "生成文本" + this.getModuleDesc();
         int code = VALUE_RESULT_SUCCESS;
         try {
-
-            /*    Runnable runnable = new Runnable() {
-             *//**
-             *
-             *//*
-                @Override
-                public void run() {
-                    matterService.genMatterTxt(query, getContext());
-                }
-            };
-
-            ThreadPool.getInstance().execute(runnable);*/
-
             this.service.genMatterTxt(query, getContext());
             model.put(MESSAGE_INFO, busiDesc + "成功");
 

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java

 package com.mortals.xhx.module.window.model;
 import java.util.List;
 import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
@@ -10,7 +13,7 @@ import lombok.Data;
  * 站点部门窗口实体对象
  *
  * @author zxfei
- * @date 2023-05-04
+ * @date 2025-03-14
  */
 @Data
 public class WindowEntity extends WindowVo {
@@ -31,53 +34,31 @@ public class WindowEntity extends WindowVo {
     /**
      * 部门名称
      */
-    @Excel(name = "部门名称")
     private String deptName;
     /**
      * 窗口名称
      */
-    @Excel(name = "窗口名称")
     private String name;
     /**
      * 英语窗口名
      */
-    @Excel(name = "窗口英语名")
     private String englishName;
     /**
      * 区域
      */
-    @Excel(name = "区域")
     private String region;
     /**
      * 英语区域
      */
-    @Excel(name = "英语区域")
     private String englishRegion;
     /**
      * 窗口编号
      */
-    @Excel(name = "窗口编号")
     private String fromnum;
     /**
      * 红旗窗口 (1.是，0.否)
      */
-    @Excel(name = "红旗窗口",combo={"是","否"}, readConverterExp = "1=是,0=否")
     private Integer hongqi;
-    /**
-     * 无人值守(1.是)
-     */
-    @Excel(name = "无人值守",combo={"是","否"}, readConverterExp = "1=是,0=否")
-    private Integer duty;
-    /**
-     * 显示内容
-     */
-    @Excel(name = "显示内容")
-    private String dutyContent;
-    /**
-     * 显示英文
-     */
-    @Excel(name = "显示英文")
-    private String dutyEnglish;
     /**
      * 备注
      */
@@ -85,23 +66,39 @@ public class WindowEntity extends WindowVo {
     /**
      * 楼栋
      */
-    @Excel(name = "楼栋",cellType= Excel.ColumnType.NUMERIC)
     private Integer building;
     /**
      * 楼层
      */
-    @Excel(name = "楼层",cellType= Excel.ColumnType.NUMERIC)
     private Integer level;
     /**
      * 名称描述
      */
-    @Excel(name = "名称描述")
     private String nameDesc;
     /**
      * 英文名称描述
      */
-    @Excel(name = "英文名称描述")
     private String englishNameDesc;
+    /**
+     * 附件名称
+     */
+    private String fileName;
+    /**
+     * 附件地址
+     */
+    private String filePath;
+    /**
+     * 无人值守(1.是，)
+     */
+    private Integer duty;
+    /**
+     * 显示内容
+     */
+    private String dutyContent;
+    /**
+     * 显示英文
+     */
+    private String dutyEnglish;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -119,41 +116,25 @@ public class WindowEntity extends WindowVo {
     }
 
     public void initAttrValue(){
-
         this.siteId = null;
-
         this.siteName = "";
-
         this.deptId = null;
-
         this.deptName = "";
-
         this.name = "";
-
         this.englishName = "";
-
         this.region = "";
-
         this.englishRegion = "";
-
         this.fromnum = "";
-
         this.hongqi = 1;
-
-        this.duty = 0;
-
-        this.dutyContent = "";
-
-        this.dutyEnglish = "";
-
         this.summary = "";
-
         this.building = 1;
-
         this.level = 1;
-
         this.nameDesc = "";
-
         this.englishNameDesc = "";
+        this.fileName = "";
+        this.filePath = "";
+        this.duty = 0;
+        this.dutyContent = "";
+        this.dutyEnglish = "";
     }
 }
\ No newline at end of file