添加大厅与窗口关联

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java

@@ -135,7 +135,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
             if (!ObjectUtils.isEmpty(siteEntity)) {
                 //请求地址 http://domian/app/siteCode/appcode/html
                 if (!ObjectUtils.isEmpty(domainUrl)) {
-                    String custUrl = String.format("%s/%s/%s/%s/%s", domainUrl, CUSTAPP_ROOT_PATH, siteEntity.getSiteCode(), item.getAppCode(), item.getVersion().toString());
+                    String custUrl = String.format("%s/%s/%s/%s/%s/", domainUrl, CUSTAPP_ROOT_PATH, siteEntity.getSiteCode(), item.getAppCode(), item.getVersion().toString());
                     item.setCustUrl(custUrl);
 //                    item.setCustUrl(UrlBuilder.ofHttp(domainUrl)
 //                            .addPath(CUSTAPP_ROOT_PATH)
@@ -144,7 +144,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
 //                            .addPath(item.getVersion().toString())
 //                            .build());
                 } else {
-                    item.setCustUrl(CUSTAPP_ROOT_PATH + "/" + siteEntity.getSiteCode() + "/" + item.getAppCode() + "/" + item.getVersion());
+                    item.setCustUrl(CUSTAPP_ROOT_PATH + "/" + siteEntity.getSiteCode() + "/" + item.getAppCode() + "/" + item.getVersion()+ "/");
                 }
 
             } else {

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessForm.java

-package com.mortals.xhx.module.business.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.business.model.BusinessEntity;
-import com.mortals.xhx.module.business.model.BusinessQuery;
-
-/**
-* Business
-*
-* 站点业务 Form
-*
-* @author zxfei
-* @date 2022-01-13
-*/
-public class BusinessForm extends BaseCRUDFormLong<BusinessEntity> {
-    private BusinessEntity entity = new BusinessEntity();
-    private BusinessQuery query = new BusinessQuery();
-    public BusinessForm(){
-    }
-
-    @Override
-    public BusinessEntity getEntity() {
-        return entity;
-    }
-
-    public void setBusiness(BusinessEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public BusinessQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(BusinessQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessMatterController.java

@@ -6,7 +6,6 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.business.model.BusinessMatterEntity;
 import com.mortals.xhx.module.business.model.BusinessMatterQuery;
@@ -39,7 +38,6 @@ public class BusinessMatterController extends BaseCRUDJsonBodyMappingController<
     private ParamService paramService;
 
     public BusinessMatterController() {
-        super.setFormClass(BusinessMatterForm.class);
         super.setModuleDesc("业务事项关联");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessMatterForm.java

-package com.mortals.xhx.module.business.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.business.model.BusinessMatterEntity;
-import com.mortals.xhx.module.business.model.BusinessMatterQuery;
-
-/**
-* BusinessMatter
-*
-* 业务事项关联 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class BusinessMatterForm extends BaseCRUDFormLong<BusinessMatterEntity> {
-    private BusinessMatterEntity entity = new BusinessMatterEntity();
-    private BusinessMatterQuery query = new BusinessMatterQuery();
-    public BusinessMatterForm(){
-    }
-
-    @Override
-    public BusinessMatterEntity getEntity() {
-        return entity;
-    }
-
-    public void setBusinessMatter(BusinessMatterEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public BusinessMatterQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(BusinessMatterQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -48,7 +48,6 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
     private SiteService siteService;
 
     public DeptController() {
-        super.setFormClass(DeptForm.class);
         super.setModuleDesc("部门");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptForm.java

-package com.mortals.xhx.module.dept.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.dept.model.DeptEntity;
-import com.mortals.xhx.module.dept.model.DeptQuery;
-
-/**
-* Dept
-*
-* 部门 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class DeptForm extends BaseCRUDFormLong<DeptEntity> {
-    private DeptEntity entity = new DeptEntity();
-    private DeptQuery query = new DeptQuery();
-    public DeptForm(){
-    }
-
-    @Override
-    public DeptEntity getEntity() {
-        return entity;
-    }
-
-    public void setDept(DeptEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public DeptQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(DeptQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/holiday/web/HolidayController.java

@@ -26,7 +26,6 @@ public class HolidayController extends BaseCRUDJsonBodyMappingController<Holiday
     private ParamService paramService;
 
     public HolidayController() {
-        super.setFormClass(HolidayForm.class);
         super.setModuleDesc("节假日");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/holiday/web/HolidayForm.java

-package com.mortals.xhx.module.holiday.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.holiday.model.HolidayEntity;
-import com.mortals.xhx.module.holiday.model.HolidayQuery;
-
-/**
-* Holiday
-*
-* 节假日 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class HolidayForm extends BaseCRUDFormLong<HolidayEntity> {
-    private HolidayEntity entity = new HolidayEntity();
-    private HolidayQuery query = new HolidayQuery();
-    public HolidayForm(){
-    }
-
-    @Override
-    public HolidayEntity getEntity() {
-        return entity;
-    }
-
-    public void setHoliday(HolidayEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public HolidayQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(HolidayQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

@@ -26,7 +26,6 @@ public class MatterAcceptController extends BaseCRUDJsonBodyMappingController<Ma
     private ParamService paramService;
 
     public MatterAcceptController() {
-        super.setFormClass(MatterAcceptForm.class);
         super.setModuleDesc("事项受理条件");
     }
 

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

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
-import com.mortals.xhx.module.matter.model.MatterAcceptQuery;
-
-/**
-* MatterAccept
-*
-* 事项受理条件 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterAcceptForm extends BaseCRUDFormLong<MatterAcceptEntity> {
-    private MatterAcceptEntity entity = new MatterAcceptEntity();
-    private MatterAcceptQuery query = new MatterAcceptQuery();
-    public MatterAcceptForm(){
-    }
-
-    @Override
-    public MatterAcceptEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterAccept(MatterAcceptEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterAcceptQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterAcceptQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

@@ -26,7 +26,6 @@ public class MatterChargesController extends BaseCRUDJsonBodyMappingController<M
     private ParamService paramService;
 
     public MatterChargesController() {
-        super.setFormClass(MatterChargesForm.class);
         super.setModuleDesc("事项收费标准");
     }
 

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

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterChargesEntity;
-import com.mortals.xhx.module.matter.model.MatterChargesQuery;
-
-/**
-* MatterCharges
-*
-* 事项收费标准 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterChargesForm extends BaseCRUDFormLong<MatterChargesEntity> {
-    private MatterChargesEntity entity = new MatterChargesEntity();
-    private MatterChargesQuery query = new MatterChargesQuery();
-    public MatterChargesForm(){
-    }
-
-    @Override
-    public MatterChargesEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterCharges(MatterChargesEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterChargesQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterChargesQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

@@ -52,7 +52,6 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
     private SiteThemeService siteThemeService;
 
     public MatterController() {
-        super.setFormClass(MatterForm.class);
         super.setModuleDesc("基础事项");
     }
 

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

@@ -33,7 +33,6 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
     private MatterDatumFileService matterDatumFileService;
 
     public MatterDatumController() {
-        super.setFormClass(MatterDatumForm.class);
         super.setModuleDesc("事项申请材料");
     }
 

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

@@ -26,7 +26,6 @@ public class MatterDatumFileController extends BaseCRUDJsonBodyMappingController
     private ParamService paramService;
 
     public MatterDatumFileController(){
-        super.setFormClass(MatterDatumFileForm.class);
         super.setModuleDesc( "材料附件");
     }
 

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

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
-import com.mortals.xhx.module.matter.model.MatterDatumFileQuery;
-
-/**
-* MatterDatumFile
-*
-* 材料附件 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterDatumFileForm extends BaseCRUDFormLong<MatterDatumFileEntity> {
-    private MatterDatumFileEntity entity = new MatterDatumFileEntity();
-    private MatterDatumFileQuery query = new MatterDatumFileQuery();
-    public MatterDatumFileForm(){
-    }
-
-    @Override
-    public MatterDatumFileEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterDatumFile(MatterDatumFileEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterDatumFileQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterDatumFileQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterDatumEntity;
-import com.mortals.xhx.module.matter.model.MatterDatumQuery;
-
-/**
-* MatterDatum
-*
-* 事项申请材料 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterDatumForm extends BaseCRUDFormLong<MatterDatumEntity> {
-    private MatterDatumEntity entity = new MatterDatumEntity();
-    private MatterDatumQuery query = new MatterDatumQuery();
-    public MatterDatumForm(){
-    }
-
-    @Override
-    public MatterDatumEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterDatum(MatterDatumEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterDatumQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterDatumQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

@@ -26,7 +26,6 @@ public class MatterFlowlimitController extends BaseCRUDJsonBodyMappingController
     private ParamService paramService;
 
     public MatterFlowlimitController() {
-        super.setFormClass(MatterFlowlimitForm.class);
         super.setModuleDesc("事项办理流程");
     }
 

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

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
-import com.mortals.xhx.module.matter.model.MatterFlowlimitQuery;
-
-/**
-* MatterFlowlimit
-*
-* 事项办理流程 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterFlowlimitForm extends BaseCRUDFormLong<MatterFlowlimitEntity> {
-    private MatterFlowlimitEntity entity = new MatterFlowlimitEntity();
-    private MatterFlowlimitQuery query = new MatterFlowlimitQuery();
-    public MatterFlowlimitForm(){
-    }
-
-    @Override
-    public MatterFlowlimitEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterFlowlimit(MatterFlowlimitEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterFlowlimitQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterFlowlimitQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterEntity;
-import com.mortals.xhx.module.matter.model.MatterQuery;
-
-/**
-* Matter
-*
-* 基础事项 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterForm extends BaseCRUDFormLong<MatterEntity> {
-    private MatterEntity entity = new MatterEntity();
-    private MatterQuery query = new MatterQuery();
-    public MatterForm(){
-    }
-
-    @Override
-    public MatterEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatter(MatterEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

@@ -26,7 +26,6 @@ public class MatterIntermediaryController extends BaseCRUDJsonBodyMappingControl
     private ParamService paramService;
 
     public MatterIntermediaryController() {
-        super.setFormClass(MatterIntermediaryForm.class);
         super.setModuleDesc("事项中介服务");
     }
 

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

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
-import com.mortals.xhx.module.matter.model.MatterIntermediaryQuery;
-
-/**
-* MatterIntermediary
-*
-* 事项中介服务 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterIntermediaryForm extends BaseCRUDFormLong<MatterIntermediaryEntity> {
-    private MatterIntermediaryEntity entity = new MatterIntermediaryEntity();
-    private MatterIntermediaryQuery query = new MatterIntermediaryQuery();
-    public MatterIntermediaryForm(){
-    }
-
-    @Override
-    public MatterIntermediaryEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterIntermediary(MatterIntermediaryEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterIntermediaryQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterIntermediaryQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

@@ -26,7 +26,6 @@ public class MatterQuestionController extends BaseCRUDJsonBodyMappingController<
     private ParamService paramService;
 
     public MatterQuestionController() {
-        super.setFormClass(MatterQuestionForm.class);
         super.setModuleDesc("事项常见问题");
     }
 

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

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
-import com.mortals.xhx.module.matter.model.MatterQuestionQuery;
-
-/**
-* MatterQuestion
-*
-* 事项常见问题 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterQuestionForm extends BaseCRUDFormLong<MatterQuestionEntity> {
-    private MatterQuestionEntity entity = new MatterQuestionEntity();
-    private MatterQuestionQuery query = new MatterQuestionQuery();
-    public MatterQuestionForm(){
-    }
-
-    @Override
-    public MatterQuestionEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterQuestion(MatterQuestionEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterQuestionQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterQuestionQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

@@ -26,7 +26,6 @@ public class MatterSetbaseController extends BaseCRUDJsonBodyMappingController<M
     private ParamService paramService;
 
     public MatterSetbaseController() {
-        super.setFormClass(MatterSetbaseForm.class);
         super.setModuleDesc("事项设定依据");
     }
 

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

-package com.mortals.xhx.module.matter.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
-import com.mortals.xhx.module.matter.model.MatterSetbaseQuery;
-
-/**
-* MatterSetbase
-*
-* 事项设定依据 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class MatterSetbaseForm extends BaseCRUDFormLong<MatterSetbaseEntity> {
-    private MatterSetbaseEntity entity = new MatterSetbaseEntity();
-    private MatterSetbaseQuery query = new MatterSetbaseQuery();
-    public MatterSetbaseForm(){
-    }
-
-    @Override
-    public MatterSetbaseEntity getEntity() {
-        return entity;
-    }
-
-    public void setMatterSetbase(MatterSetbaseEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public MatterSetbaseQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(MatterSetbaseQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/model/web/ModelController.java

@@ -39,7 +39,6 @@ public class ModelController extends BaseCRUDJsonBodyMappingController<ModelServ
     private ParamService paramService;
 
     public ModelController() {
-        super.setFormClass(ModelForm.class);
         super.setModuleDesc("模块");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/model/web/ModelForm.java

-package com.mortals.xhx.module.model.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.model.model.ModelEntity;
-import com.mortals.xhx.module.model.model.ModelQuery;
-
-/**
-* Model
-*
-* 模块 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class ModelForm extends BaseCRUDFormLong<ModelEntity> {
-    private ModelEntity entity = new ModelEntity();
-    private ModelQuery query = new ModelQuery();
-    public ModelForm(){
-    }
-
-    @Override
-    public ModelEntity getEntity() {
-        return entity;
-    }
-
-    public void setModel(ModelEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public ModelQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(ModelQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/product/web/ProductController.java

@@ -38,7 +38,6 @@ public class ProductController extends BaseCRUDJsonBodyMappingController<Product
     private ParamService paramService;
 
     public ProductController(){
-        super.setFormClass(ProductForm.class);
         super.setModuleDesc( "产品");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/product/web/ProductForm.java

-package com.mortals.xhx.module.product.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.product.model.ProductEntity;
-import com.mortals.xhx.module.product.model.ProductQuery;
-
-/**
-* Product
-*
-* 产品 Form
-*
-* @author zxfei
-* @date 2022-05-24
-*/
-public class ProductForm extends BaseCRUDFormLong<ProductEntity> {
-    private ProductEntity entity = new ProductEntity();
-    private ProductQuery query = new ProductQuery();
-    public ProductForm(){
-    }
-
-    @Override
-    public ProductEntity getEntity() {
-        return entity;
-    }
-
-    public void setProduct(ProductEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public ProductQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(ProductQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

 package com.mortals.xhx.module.site.service.impl;
+
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import com.mortals.xhx.module.window.service.WindowHallService;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -6,14 +11,32 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.site.dao.SiteHallDao;
 import com.mortals.xhx.module.site.model.SiteHallEntity;
 import com.mortals.xhx.module.site.service.SiteHallService;
+
 /**
-* SiteHallService
-* 站点大厅信息 service实现
-*
-* @author zxfei
-* @date 2023-04-25
-*/
+ * SiteHallService
+ * 站点大厅信息 service实现
+ *
+ * @author zxfei
+ * @date 2023-04-25
+ */
 @Service("siteHallService")
 public class SiteHallServiceImpl extends AbstractCRUDServiceImpl<SiteHallDao, SiteHallEntity, Long> implements SiteHallService {
-    
+
+    @Autowired
+    private WindowHallService windowHallService;
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void updateAfter(SiteHallEntity entity, Context context) throws AppException {
+        super.updateAfter(entity, context);
+        WindowHallEntity condition = new WindowHallEntity();
+        condition.setHallId(entity.getId());
+        WindowHallEntity windowHallEntity = new WindowHallEntity();
+        windowHallEntity.setHallName(entity.getHallName());
+        windowHallService.getDao().update(windowHallEntity, condition);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteBusinessController.java

@@ -39,7 +39,6 @@ public class SiteBusinessController extends BaseCRUDJsonBodyMappingController<Si
     private ParamService paramService;
 
     public SiteBusinessController() {
-        super.setFormClass(SiteBusinessForm.class);
         super.setModuleDesc("站点事项");
     }
 
@@ -58,11 +57,11 @@ public class SiteBusinessController extends BaseCRUDJsonBodyMappingController<Si
 
 
     @PostMapping("list/exclude")
-    public String excludeList(SiteBusinessForm form) {
+    public String excludeList(SiteBusinessEntity query) {
         Map<String, Object> model = new HashMap<>();
         JSONObject ret = new JSONObject();
         String busiDesc = "查询" + this.getModuleDesc();
-        Long id = form.getId()[0];
+        Long id = query.getId();
         int code = VALUE_RESULT_SUCCESS;
         try {
             List<SiteBusinessEntity> collect = this.service.find(new SiteBusinessQuery()).stream().map(item -> {
@@ -107,7 +106,6 @@ public class SiteBusinessController extends BaseCRUDJsonBodyMappingController<Si
     }
 
 
-
     /**
      * 查询站点业务扁平结构
      */

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteBusinessForm.java

-package com.mortals.xhx.module.site.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.site.model.SiteBusinessEntity;
-import com.mortals.xhx.module.site.model.SiteBusinessQuery;
-
-/**
-* SiteBusiness
-*
-* 站点事项 Form
-*
-* @author zxfei
-* @date 2022-01-13
-*/
-public class SiteBusinessForm extends BaseCRUDFormLong<SiteBusinessEntity> {
-    private SiteBusinessEntity entity = new SiteBusinessEntity();
-    private SiteBusinessQuery query = new SiteBusinessQuery();
-    public SiteBusinessForm(){
-    }
-
-    @Override
-    public SiteBusinessEntity getEntity() {
-        return entity;
-    }
-
-    public void setSiteBusiness(SiteBusinessEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SiteBusinessQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SiteBusinessQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -70,7 +70,6 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
     private AreaService areaService;
 
     public SiteController() {
-        super.setFormClass(SiteForm.class);
         super.setModuleDesc("站点");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteForm.java

-package com.mortals.xhx.module.site.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.site.model.SiteEntity;
-import com.mortals.xhx.module.site.model.SiteQuery;
-
-/**
-* Site
-*
-* 站点 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class SiteForm extends BaseCRUDFormLong<SiteEntity> {
-    private SiteEntity entity = new SiteEntity();
-    private SiteQuery query = new SiteQuery();
-    public SiteForm(){
-    }
-
-    @Override
-    public SiteEntity getEntity() {
-        return entity;
-    }
-
-    public void setSite(SiteEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SiteQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SiteQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteMatterController.java

@@ -29,7 +29,6 @@ public class SiteMatterController extends BaseCRUDJsonBodyMappingController<Site
     private ParamService paramService;
 
     public SiteMatterController() {
-        super.setFormClass(SiteMatterForm.class);
         super.setModuleDesc("站点事项");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteMatterForm.java

-package com.mortals.xhx.module.site.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.site.model.SiteMatterEntity;
-import com.mortals.xhx.module.site.model.SiteMatterQuery;
-
-/**
-* SiteMatter
-*
-* 站点事项 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class SiteMatterForm extends BaseCRUDFormLong<SiteMatterEntity> {
-    private SiteMatterEntity entity = new SiteMatterEntity();
-    private SiteMatterQuery query = new SiteMatterQuery();
-    public SiteMatterForm(){
-    }
-
-    @Override
-    public SiteMatterEntity getEntity() {
-        return entity;
-    }
-
-    public void setSiteMatter(SiteMatterEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SiteMatterQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SiteMatterQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteModelController.java

@@ -23,7 +23,6 @@ public class SiteModelController extends BaseCRUDJsonBodyMappingController<SiteM
     private ParamService paramService;
 
     public SiteModelController() {
-        super.setFormClass(SiteModelForm.class);
         super.setModuleDesc("站点模块");
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteModelForm.java

-package com.mortals.xhx.module.site.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.site.model.SiteModelEntity;
-import com.mortals.xhx.module.site.model.SiteModelQuery;
-
-/**
-* SiteModel
-*
-* 站点模块 Form
-*
-* @author zxfei
-* @date 2022-01-10
-*/
-public class SiteModelForm extends BaseCRUDFormLong<SiteModelEntity> {
-    private SiteModelEntity entity = new SiteModelEntity();
-    private SiteModelQuery query = new SiteModelQuery();
-    public SiteModelForm(){
-    }
-
-    @Override
-    public SiteModelEntity getEntity() {
-        return entity;
-    }
-
-    public void setSiteModel(SiteModelEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SiteModelQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SiteModelQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.java

@@ -57,7 +57,6 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
     private SkinFieldService skinFieldService;
 
     public SkinBaseController(){
-        super.setFormClass(SkinBaseForm.class);
         super.setModuleDesc( "系统基础皮肤");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseForm.java

-package com.mortals.xhx.module.skin.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.skin.model.SkinBaseEntity;
-import com.mortals.xhx.module.skin.model.SkinBaseQuery;
-
-/**
-* SkinBase
-*
-* 系统基础皮肤 Form
-*
-* @author zxfei
-* @date 2022-05-24
-*/
-public class SkinBaseForm extends BaseCRUDFormLong<SkinBaseEntity> {
-    private SkinBaseEntity entity = new SkinBaseEntity();
-    private SkinBaseQuery query = new SkinBaseQuery();
-    public SkinBaseForm(){
-    }
-
-    @Override
-    public SkinBaseEntity getEntity() {
-        return entity;
-    }
-
-    public void setSkinBase(SkinBaseEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SkinBaseQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SkinBaseQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinCategoryController.java

@@ -38,7 +38,6 @@ public class SkinCategoryController extends BaseCRUDJsonBodyMappingController<Sk
     private ParamService paramService;
 
     public SkinCategoryController(){
-        super.setFormClass(SkinCategoryForm.class);
         super.setModuleDesc( "系统皮肤分类");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinCategoryForm.java

-package com.mortals.xhx.module.skin.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
-import com.mortals.xhx.module.skin.model.SkinCategoryQuery;
-
-/**
-* SkinCategory
-*
-* 系统皮肤分类 Form
-*
-* @author zxfei
-* @date 2022-05-24
-*/
-public class SkinCategoryForm extends BaseCRUDFormLong<SkinCategoryEntity> {
-    private SkinCategoryEntity entity = new SkinCategoryEntity();
-    private SkinCategoryQuery query = new SkinCategoryQuery();
-    public SkinCategoryForm(){
-    }
-
-    @Override
-    public SkinCategoryEntity getEntity() {
-        return entity;
-    }
-
-    public void setSkinCategory(SkinCategoryEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SkinCategoryQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SkinCategoryQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinFieldController.java

@@ -38,7 +38,6 @@ public class SkinFieldController extends BaseCRUDJsonBodyMappingController<SkinF
     private ParamService paramService;
 
     public SkinFieldController(){
-        super.setFormClass(SkinFieldForm.class);
         super.setModuleDesc( "皮肤属性字段配置");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinFieldForm.java

-package com.mortals.xhx.module.skin.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.skin.model.SkinFieldEntity;
-import com.mortals.xhx.module.skin.model.SkinFieldQuery;
-
-/**
-* SkinField
-*
-* 皮肤属性字段配置 Form
-*
-* @author zxfei
-* @date 2022-05-24
-*/
-public class SkinFieldForm extends BaseCRUDFormLong<SkinFieldEntity> {
-    private SkinFieldEntity entity = new SkinFieldEntity();
-    private SkinFieldQuery query = new SkinFieldQuery();
-    public SkinFieldForm(){
-    }
-
-    @Override
-    public SkinFieldEntity getEntity() {
-        return entity;
-    }
-
-    public void setSkinField(SkinFieldEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SkinFieldQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SkinFieldQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinTemplateController.java

@@ -38,7 +38,6 @@ public class SkinTemplateController extends BaseCRUDJsonBodyMappingController<Sk
     private ParamService paramService;
 
     public SkinTemplateController(){
-        super.setFormClass(SkinTemplateForm.class);
         super.setModuleDesc( "系统皮肤模板");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinTemplateForm.java

-package com.mortals.xhx.module.skin.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.skin.model.SkinTemplateEntity;
-import com.mortals.xhx.module.skin.model.SkinTemplateQuery;
-
-/**
-* SkinTemplate
-*
-* 系统皮肤模板 Form
-*
-* @author zxfei
-* @date 2022-05-24
-*/
-public class SkinTemplateForm extends BaseCRUDFormLong<SkinTemplateEntity> {
-    private SkinTemplateEntity entity = new SkinTemplateEntity();
-    private SkinTemplateQuery query = new SkinTemplateQuery();
-    public SkinTemplateForm(){
-    }
-
-    @Override
-    public SkinTemplateEntity getEntity() {
-        return entity;
-    }
-
-    public void setSkinTemplate(SkinTemplateEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SkinTemplateQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SkinTemplateQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsSetController.java

@@ -26,7 +26,6 @@ public class SmsSetController extends BaseCRUDJsonBodyMappingController<SmsSetSe
     private ParamService paramService;
 
     public SmsSetController() {
-        super.setFormClass(SmsSetForm.class);
         super.setModuleDesc("短信设置");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsSetForm.java

-package com.mortals.xhx.module.sms.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.sms.model.SmsSetEntity;
-import com.mortals.xhx.module.sms.model.SmsSetQuery;
-
-/**
-* SmsSet
-*
-* 短信设置 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class SmsSetForm extends BaseCRUDFormLong<SmsSetEntity> {
-    private SmsSetEntity entity = new SmsSetEntity();
-    private SmsSetQuery query = new SmsSetQuery();
-    public SmsSetForm(){
-    }
-
-    @Override
-    public SmsSetEntity getEntity() {
-        return entity;
-    }
-
-    public void setSmsSet(SmsSetEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SmsSetQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SmsSetQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsTemplateController.java

@@ -26,7 +26,6 @@ public class SmsTemplateController extends BaseCRUDJsonBodyMappingController<Sms
     private ParamService paramService;
 
     public SmsTemplateController() {
-        super.setFormClass(SmsTemplateForm.class);
         super.setModuleDesc("短信模板");
     }
 

base-manager/src/main/java/com/mortals/xhx/module/sms/web/SmsTemplateForm.java

-package com.mortals.xhx.module.sms.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.sms.model.SmsTemplateEntity;
-import com.mortals.xhx.module.sms.model.SmsTemplateQuery;
-
-/**
-* SmsTemplate
-*
-* 短信模板 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class SmsTemplateForm extends BaseCRUDFormLong<SmsTemplateEntity> {
-    private SmsTemplateEntity entity = new SmsTemplateEntity();
-    private SmsTemplateQuery query = new SmsTemplateQuery();
-    public SmsTemplateForm(){
-    }
-
-    @Override
-    public SmsTemplateEntity getEntity() {
-        return entity;
-    }
-
-    public void setSmsTemplate(SmsTemplateEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public SmsTemplateQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(SmsTemplateQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file

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

@@ -24,4 +24,13 @@ public class WindowVo extends BaseEntityLong {
 
     private List<WindowMatterEntity> windowMatterList;
 
+    /**
+     * 大厅ID
+     */
+    private Long hallId;
+    /**
+     * 大厅名称
+     */
+    private String hallName;
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowServiceImpl.java

@@ -19,6 +19,7 @@ import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.service.SiteBusinessService;
 import com.mortals.xhx.module.window.model.*;
 import com.mortals.xhx.module.window.service.WindowBusinessService;
+import com.mortals.xhx.module.window.service.WindowHallService;
 import com.mortals.xhx.module.window.service.WindowMatterService;
 import com.mortals.xhx.module.workman.model.WorkmanEntity;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
@@ -56,6 +57,8 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
     private WindowBusinessService windowBusinessService;
     @Autowired
     private WindowMatterService windowMatterService;
+    @Autowired
+    private WindowHallService windowHallService;
 
     @Autowired
     private BusinessService businessService;
@@ -70,6 +73,9 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
         Map<Long, List<WindowMatterEntity>> windowMatterCollect = windowMatterService.find(new WindowMatterQuery())
                 .stream().filter(f -> f.getWindowId() != null).collect(Collectors.groupingBy(x -> x.getWindowId()));
 
+        Map<Long, WindowHallEntity> windowHallMap = windowHallService.find(new WindowHallQuery()).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), y -> y, (o, n) -> n));
+
+
         list.stream().peek(item -> {
             if (!ObjectUtils.isEmpty(workmanCollect.get(item.getId()))) {
                 item.setWorkmanList(workmanCollect.get(item.getId()));
@@ -81,6 +87,11 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
             if (!ObjectUtils.isEmpty(windowMatterCollect.get(item.getId()))) {
                 item.setWindowMatterList(windowMatterCollect.get(item.getId()));
             }
+            WindowHallEntity windowHallEntity = windowHallMap.get(item.getId());
+            if (!ObjectUtils.isEmpty(windowHallEntity)) {
+                item.setHallId(windowHallEntity.getHallId());
+                item.setHallName(windowHallEntity.getHallName());
+            }
 
         }).count();
         super.findAfter(params, pageInfo, context, list);

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanForm.java

-package com.mortals.xhx.module.workman.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.module.workman.model.WorkmanEntity;
-import com.mortals.xhx.module.workman.model.WorkmanQuery;
-
-/**
-* Workman
-*
-* 工作人员 Form
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public class WorkmanForm extends BaseCRUDFormLong<WorkmanEntity> {
-    private WorkmanEntity entity = new WorkmanEntity();
-    private WorkmanQuery query = new WorkmanQuery();
-    public WorkmanForm(){
-    }
-
-    @Override
-    public WorkmanEntity getEntity() {
-        return entity;
-    }
-
-    public void setWorkman(WorkmanEntity entity) {
-        this.entity = entity;
-    }
-
-    @Override
-    public WorkmanQuery getQuery() {
-        return query;
-    }
-
-    public void setQuery(WorkmanQuery query) {
-        this.query = query;
-    }
-}
\ No newline at end of file