添加微官网列表接口

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

@@ -20,9 +20,9 @@ public class MatterInfo {
     private Long id;
 
     /**
-     * 办理站点
+     * 办理地点
      */
-    private String siteName;
+    private String operateSite;
 
     /**
      * 办理部门

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

@@ -215,19 +215,15 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     @Override
     public Result<MatterInfo> findMicroList(MatterQuery matterQuery, PageInfo pageInfo, Context context) throws AppException {
         Result<MatterInfo> matterInfoResult = new Result<>();
-        if (!ObjectUtils.isEmpty(matterQuery.getSiteId())) {
-            SiteEntity siteCache = siteService.getCache(matterQuery.getSiteId().toString());
-            matterQuery.setSiteId(null);
-            Result<MatterEntity> matterEntityResult = this.find(matterQuery, pageInfo, context);
-            List<MatterInfo> matterInfoList = matterEntityResult.getList().stream().map(item -> {
-                MatterInfo matterInfo = new MatterInfo();
-                BeanUtils.copyProperties(item, matterInfo, BeanUtil.getNullPropertyNames(item));
-                matterInfo.setSiteName(siteCache == null ? "" : siteCache.getSiteName());
-                return matterInfo;
-            }).collect(Collectors.toList());
-            matterInfoResult.setList(matterInfoList);
-            matterInfoResult.setPageInfo(pageInfo);
-        }
+        Result<MatterEntity> matterEntityResult = this.find(matterQuery, pageInfo, context);
+        List<MatterInfo> matterInfoList = matterEntityResult.getList().stream().map(item -> {
+            MatterInfo matterInfo = new MatterInfo();
+            BeanUtils.copyProperties(item, matterInfo, BeanUtil.getNullPropertyNames(item));
+            return matterInfo;
+        }).collect(Collectors.toList());
+        matterInfoResult.setList(matterInfoList);
+        matterInfoResult.setPageInfo(pageInfo);
+
         return matterInfoResult;
     }
 

base-manager/src/main/resources/baseinfo.setting

@@ -160,5 +160,9 @@
 是否支持网上支付 = isOnlinePayShow
 是否支持物流快递 = isExpressTakeOnlineShow
 网办类型 = onlineType
+乡镇街道名称 = townshipName
+乡镇街道代码 = townshipCode
+村居社区名称 = villageName
+村居社区代码 = villageCode
 
 

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

@@ -31,6 +31,7 @@ Content-Type: application/json
 
 {
   "idList": [1,2],
+  "siteId": 3,
   "page": 1,
   "size": 10
 }