添加大厅与窗口关联

base-manager/doc/api.md

@@ -12424,7 +12424,7 @@ dict|object|字典对象
 
 ### 根据大厅查询所属业务列表
 
-**请求URL:** window/hall/getBusinessByHall
+**请求URL:** site/hall/getBusinessByHall
 
 **请求方式:** POST
 

base-manager/src/main/java/com/mortals/xhx/daemon/task/StatSiteDeptMatterTaskImpl.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.daemon.task;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
@@ -37,7 +38,7 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService {
         log.info("开始同步事项列表！");
         List<DeptEntity> deptEntities = deptService.find(new DeptQuery());
         for (DeptEntity deptEntity : deptEntities) {
-            int total = matterService.count(new MatterQuery().deptCode(deptEntity.getDeptNumber()), null);
+            int total = matterService.count(new MatterQuery().source(SourceEnum.政务网.getValue()).deptCode(deptEntity.getDeptNumber()), null);
             if (total > 0) {
                 DeptEntity deptQuery = new DeptEntity();
                 deptQuery.setTotal(total);
@@ -46,7 +47,6 @@ public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService {
                 condition.setId(deptEntity.getId());
                 deptService.getDao().update(deptQuery, condition);
 
-                // deptService.update(deptEntity, null);
             }
 
         }

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java

@@ -291,7 +291,7 @@ public class SiteMatterEntity extends SiteMatterVo {
 
         this.eventTypeShow = null;
 
-        this.source = null;
+        this.source = 0;
 
         this.deptCode = null;
 

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

@@ -22,7 +22,7 @@ Content-Type: application/json
 {
   "siteId": 1,
   "page": 1,
-  "size": 100
+  "size": 2
 }
 
 ###微官网事项列表

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

@@ -6,7 +6,8 @@ Content-Type: application/json
 {
     "siteId":1,
     "page":1,
-  "matterName":"加处罚款",
+  "deptCode":"214125125245",
+  "display": 1,
     "size":10
 }