添加事项备注字段

base-manager/db/add.sql

@@ -321,4 +321,11 @@ CREATE TABLE `mortals_sys_matter_channel`  (
   `updateTime` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_matterId`(`matterId`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '办理渠道';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '办理渠道';
\ No newline at end of file
+
+
+
+-- ----------------------------
+-- 2025-3-19
+-- ----------------------------
+ALTER TABLE mortals_sys_matter ADD COLUMN `remark` varchar(512)      COMMENT '备注信息';
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java

@@ -35,7 +35,7 @@ public class SyncTreeSiteThread implements Runnable {
     public void run() {
 
         try {
-            Thread.sleep(5000);
+            Thread.sleep(3000);
         } catch (InterruptedException e) {
         }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java

@@ -331,14 +331,13 @@ public class MatterEntity extends MatterVo {
     /**
      * 事项扩展信息
      */
-    private List<MatterExtEntity> matterExtList=new ArrayList<>();;
-    public List<MatterExtEntity> getMatterExtList(){
-        return matterExtList;
-    }
 
-    public void setMatterExtList(List<MatterExtEntity> matterExtList){
-        this.matterExtList = matterExtList;
-    }
+    /**
+     * 备注信息
+     */
+    private String remark;
+
+    private List<MatterExtEntity> matterExtList=new ArrayList<>();;
     @Override
     public int hashCode() {
         return Objects.hash(this.areaCode, this.matterNo);
@@ -509,5 +508,6 @@ public class MatterEntity extends MatterVo {
         this.netApplyUrl = "";
         this.areaName = "";
         this.areaLevel = 0;
+        this.remark="";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
  * 基础事项查询对象
  *
  * @author zxfei
- * @date 2025-03-17
+ * @date 2025-03-19
  */
 public class MatterQuery extends MatterEntity {
     /** 开始 序号，主键，自增长 */
@@ -510,6 +510,11 @@ public class MatterQuery extends MatterEntity {
     /** 区域等级(1.省，2.地市州，3.区县，4.街道，5.社区)排除列表 */
     private List <Integer> areaLevelNotList;
 
+    /** 备注信息 */
+    private List<String> remarkList;
+
+    /** 备注信息排除列表 */
+    private List <String> remarkNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<MatterQuery> orConditionList;
 
@@ -3551,6 +3556,38 @@ public class MatterQuery extends MatterEntity {
     }
 
 
+    /**
+     * 获取 备注信息
+     * @return remarkList
+     */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+     * 设置 备注信息
+     * @param remarkList
+     */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+     * 获取 备注信息
+     * @return remarkNotList
+     */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+     * 设置 备注信息
+     * @param remarkNotList
+     */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -5333,6 +5370,25 @@ public class MatterQuery extends MatterEntity {
         return this;
     }
 
+
+    /**
+     * 设置 备注信息
+     * @param remark
+     */
+    public MatterQuery remark(String remark){
+        setRemark(remark);
+        return this;
+    }
+
+    /**
+     * 设置 备注信息
+     * @param remarkList
+     */
+    public MatterQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

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

@@ -198,31 +198,31 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
     @Override
     protected int infoAfter(Long id, Map<String, Object> model, MatterEntity entity, Context context) throws AppException {
 
-        List<MatterAcceptEntity> matterAcceptEntities = matterAcceptService.find(new MatterAcceptQuery().matterId(entity.getId()));
-        entity.setMatterAcceptList(matterAcceptEntities);
+        if (!ObjectUtils.isEmpty(entity)) {
+            List<MatterAcceptEntity> matterAcceptEntities = matterAcceptService.find(new MatterAcceptQuery().matterId(entity.getId()));
+            entity.setMatterAcceptList(matterAcceptEntities);
 
-        List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(entity.getId()));
-        entity.setMatterDatumList(matterDatumEntities);
+            List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(entity.getId()));
+            entity.setMatterDatumList(matterDatumEntities);
 
-        List<MatterChannelEntity> matterChannelEntities = matterChannelService.find(new MatterChannelQuery().matterId(entity.getId()));
-        entity.setMatterChannelList(matterChannelEntities);
+            List<MatterChannelEntity> matterChannelEntities = matterChannelService.find(new MatterChannelQuery().matterId(entity.getId()));
+            entity.setMatterChannelList(matterChannelEntities);
 
-        List<MatterChargesEntity> matterChargesEntities = matterChargesService.find(new MatterChargesQuery().matterId(entity.getId()));
-        entity.setMatterChargesList(matterChargesEntities);
+            List<MatterChargesEntity> matterChargesEntities = matterChargesService.find(new MatterChargesQuery().matterId(entity.getId()));
+            entity.setMatterChargesList(matterChargesEntities);
 
-        List<MatterFlowlimitEntity> matterFlowlimitEntities = matterFlowlimitService.find(new MatterFlowlimitQuery().matterId(entity.getId()));
-        entity.setMatterFlowlimitList(matterFlowlimitEntities);
+            List<MatterFlowlimitEntity> matterFlowlimitEntities = matterFlowlimitService.find(new MatterFlowlimitQuery().matterId(entity.getId()));
+            entity.setMatterFlowlimitList(matterFlowlimitEntities);
 
-        List<MatterIntermediaryEntity> matterIntermediaryEntities = matterIntermediaryService.find(new MatterIntermediaryQuery().matterId(entity.getId()));
-        entity.setMatterIntermediaryList(matterIntermediaryEntities);
-
-        List<MatterQuestionEntity> matterQuestionEntities = matterQuestionService.find(new MatterQuestionQuery().matterId(entity.getId()));
-        entity.setMatterQuestionList(matterQuestionEntities);
-
-        List<MatterSetbaseEntity> matterSetbaseEntities = matterSetbaseService.find(new MatterSetbaseQuery().matterId(entity.getId()));
-        entity.setMatterSetbaseList(matterSetbaseEntities);
+            List<MatterIntermediaryEntity> matterIntermediaryEntities = matterIntermediaryService.find(new MatterIntermediaryQuery().matterId(entity.getId()));
+            entity.setMatterIntermediaryList(matterIntermediaryEntities);
 
+            List<MatterQuestionEntity> matterQuestionEntities = matterQuestionService.find(new MatterQuestionQuery().matterId(entity.getId()));
+            entity.setMatterQuestionList(matterQuestionEntities);
 
+            List<MatterSetbaseEntity> matterSetbaseEntities = matterSetbaseService.find(new MatterSetbaseQuery().matterId(entity.getId()));
+            entity.setMatterSetbaseList(matterSetbaseEntities);
+        }
         return super.infoAfter(id, model, entity, context);
     }
 

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -146,7 +146,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":73
+  "id":72
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -297,4 +297,7 @@ Content-Type: application/json
 {}
 
 
+###cest
+GET http://61.157.227.62:11072/basics_api/base/matter/interinfo?id=1571
+