修改站点权限分配

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

@@ -16,4 +16,37 @@ public class SiteBusinessVo extends BaseEntityLong {
 
     /** 子站点事项 */
     private List<SiteBusinessEntity> children = new ArrayList<>();
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 是否允许预约（1.允许，0.不允许）
+     */
+    private Integer canorder;
+    /**
+     * 是否允许取号（1.允许，0.不允许）
+     */
+    private Integer cantake;
+    /**
+     * 大厅情况展示 （1.展示，0.不展示）
+     */
+    private Integer datashow;
+    /**
+     * 英语业务名
+     */
+    private String englishname;
+    /**
+     * 流水编号如A、B
+     */
+    private String flownum;
+
+    /**
+     * 业务类型 (0.一体化业务，1.自建业务)
+     */
+    private Integer businessType;
+
+
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteBusinessServiceImpl.java

@@ -5,6 +5,9 @@ import com.mortals.framework.model.Result;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.xhx.module.business.model.BusinessEntity;
 import com.mortals.xhx.module.business.model.BusinessQuery;
+import com.mortals.xhx.module.business.service.BusinessService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -30,6 +33,8 @@ import java.util.stream.Collectors;
 @Service("siteBusinessService")
 public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBusinessDao, SiteBusinessEntity, Long> implements SiteBusinessService {
 
+    @Autowired
+    private BusinessService businessService;
 
     @Override
     protected void findAfter(SiteBusinessEntity params, PageInfo pageInfo, Context context, List<SiteBusinessEntity> list) throws AppException {
@@ -104,6 +109,17 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
     @Override
     public Result<SiteBusinessEntity> flatList(SiteBusinessEntity query, PageInfo pageInfo, Context context) {
         Result<SiteBusinessEntity> result = this.dao.getList(query, pageInfo);
+        result.getList().stream().forEach(item->{
+            if(!ObjectUtils.isEmpty(item.getBusinessId())){
+                BusinessEntity businessEntity = businessService.get(item.getBusinessId());
+                if(!ObjectUtils.isEmpty(businessEntity)){
+                    BeanUtils.copyProperties(businessEntity,item,"id");
+                }
+            }
+        });
+
+
+
         return result;
     }