调整二手房的逻辑

seeyon/WEB-INF/cfgHome/plugin/assetstenant/spring/spring-bean.xml

@@ -4,6 +4,7 @@
 <beans default-autowire="byName">
 	<bean id="assetsTenantConfigProvider" class="com.seeyon.apps.assetstenant.config.AssetsTenantConfigProvider" />
 	<bean id="assetsService" class="com.seeyon.apps.assetstenant.assets.AssetsService" />
+	<bean id="shAssetsService" class="com.seeyon.apps.assetstenant.assets.ShAssetsService" />
 	<bean id="billService" class="com.seeyon.apps.assetstenant.bill.BillService" />
 	<bean id="feeRecordService" class="com.seeyon.apps.assetstenant.bill.FeeRecordService" />
 	<bean id="waeBillService" class="com.seeyon.apps.assetstenant.bill.WaeBillService" />

src/main/java/com/seeyon/apps/assetstenant/assets/AssetsService.java

@@ -91,16 +91,27 @@ public class AssetsService {
         }
         if(StringUtils.isNotBlank(params.getString("keyWord"))){
             conditions.add(FormWhereCondition.build().display("资产名称")
-                    .startWithBracket(true)
+                    .startWithBracket(1)
                     .concatFactor(ClauseFactor.OR)
                     .value(params.getString("keyWord"))
                     .clauseFactor(ClauseFactor.LIKE));
             handleBizZoneSet(conditions,params.getString("keyWord"));
-            conditions.add(FormWhereCondition.build().display("所在位置")
+            conditions.add(FormWhereCondition.build().display("详细地址")
                     .value(params.getString("keyWord"))
-                    .endWithBracket(true)
+                    .endWithBracket(1)
                     .clauseFactor(ClauseFactor.LIKE));
         }
+        if(StringUtils.isNotBlank(params.getString("rentRange"))) {
+            String rentRange = params.getString("rentRange");
+            String[] split = rentRange.split("-");
+            String rangeStart = split[0];
+            String rangeEnd = split.length > 1 ? split[1] : null;
+            conditions.add(FormWhereCondition.build().display("月租金").clauseFactor(ClauseFactor.GE).value(rangeStart));
+            if(rangeEnd != null) {
+                conditions.add(FormWhereCondition.build().display("月租金").clauseFactor(ClauseFactor.LE).value(rangeEnd));
+            }
+        }
+        conditions.add(FormWhereCondition.build().display("招商状态").value(EnumMapUtils.getEnumItemValueByDisplayValue(formTableBean,"招商状态","上架")));
         return conditions;
     }
 
@@ -139,47 +150,16 @@ public class AssetsService {
                 tempSet.add(enumItemId);
             }
         }
-        condition.setValues(Collections.singletonList(tempSet));
+        if(tempSet == null || tempSet.isEmpty()){
-        if(condition.getValues().size() > 0) {
+            return;
-            conditions.add(condition);
         }
+        condition.setValues(Collections.singletonList(tempSet));
+        conditions.add(condition);
     }
     
     private void handleAssetsSubType(List<FormWhereCondition> conditions,String type) throws BusinessException {
         TableContext master = FormTableExecutor.master(getFormNo());
         FormTableBean masterTableBean = master.getTableBean();
-//        if("住房".equals(type)) {
-//            conditions
-//                    .add(FormWhereCondition.build().display("资产二级类型")
-//                            .startWithBracket(true)
-//                            .concatFactor(ClauseFactor.OR)
-//                    .value(EnumMapUtils.getEnumItemValueByDisplayValue(masterTableBean,"资产二级类型","住宅")));
-//            conditions.add(FormWhereCondition.build().display("资产二级类型")
-//                            .endWithBracket(true)
-//                    .value(EnumMapUtils.getEnumItemValueByDisplayValue(masterTableBean,"资产二级类型","保障性住房")));
-//        }
-//        if("商铺".equals(type)) {
-//            conditions
-//                    .add(FormWhereCondition.build().display("资产二级类型")
-//                            .startWithBracket(true)
-//                            .concatFactor(ClauseFactor.OR)
-//                            .value(EnumMapUtils.getEnumItemValueByDisplayValue(masterTableBean,"资产二级类型","写字楼")));
-//            conditions.add(FormWhereCondition.build().display("资产二级类型")
-//                    .concatFactor(ClauseFactor.OR)
-//                    .value(EnumMapUtils.getEnumItemValueByDisplayValue(masterTableBean,"资产二级类型","商业门面")));
-//            conditions.add(FormWhereCondition.build().display("资产二级类型")
-//                    .concatFactor(ClauseFactor.OR)
-//                    .value(EnumMapUtils.getEnumItemValueByDisplayValue(masterTableBean,"资产二级类型","商业用房")));
-//            conditions.add(FormWhereCondition.build().display("资产二级类型")
-//                    .endWithBracket(true)
-//                    .value(EnumMapUtils.getEnumItemValueByDisplayValue(masterTableBean,"资产二级类型","政府机构")));
-//        }
-//        if("厂房".equals(type)) {
-//            conditions.add(FormWhereCondition.build().display("资产二级类型").value(EnumMapUtils.getEnumItemValueByDisplayValue(masterTableBean,"资产二级类型","厂房")));
-//        }
-//        if("停车场".equals(type)) {
-//            conditions.add(FormWhereCondition.build().display("资产二级类型").value(EnumMapUtils.getEnumItemValueByDisplayValue(masterTableBean,"资产二级类型","车房")));
-//        }
         conditions
                 .add(FormWhereCondition.build().display("资产二级类型")
                         .value(EnumMapUtils.getEnumItemValueByDisplayValue(masterTableBean,"资产二级类型",type)));
@@ -212,7 +192,7 @@ public class AssetsService {
         assetsVo.setAssetsNo(getStringValue(fieldsMap,"资产编号"));
         assetsVo.setAssetsName(getStringValue(fieldsMap,"资产名称"));
         assetsVo.setManager(getStringValue(fieldsMap,"资产管理员"));
-        assetsVo.setAddress(getStringValue(fieldsMap,"所在地址"));
+        assetsVo.setAddress(getStringValue(fieldsMap,"详细地址"));
         assetsVo.setZone(getStringValue(fieldsMap,"所在区域"));
         if(fieldsMap.get("资产图片") != null) {
             assetsVo.setDetailImg(OaFileVo.getInstance(fieldsMap.get("资产图片"),attachmentManager));
@@ -260,7 +240,7 @@ public class AssetsService {
         assetsVo.setFormId(getStringValue(fieldsMap,"id"));
         assetsVo.setAssetsStatus(getStringValue(fieldsMap,"资产状态"));
         assetsVo.setAssetsType(getStringValue(fieldsMap,"资产二级类型"));
-        assetsVo.setAssetsAddress(getStringValue(fieldsMap,"所在位置"));
+        assetsVo.setAssetsAddress(getStringValue(fieldsMap,"详细地址"));
         assetsVo.setManageType(getStringValue(fieldsMap,"运营类型"));
         String lnglat = getStringValue(fieldsMap, "坐落经纬度");
         if(StringUtils.isNotBlank(lnglat)){
@@ -280,7 +260,9 @@ public class AssetsService {
         assetsVo.setManagerPhone(getStringValue(fieldsMap,"管理员联系方式"));
         assetsVo.setBizZone(getStringValue(fieldsMap,"商圈位置"));
         assetsVo.setLayout(getStringValue(fieldsMap,"户型"));
+        assetsVo.setCommunityNo(getStringValue(fieldsMap,"楼盘编号"));
         assetsVo.setRenovationStatus(getStringValue(fieldsMap,"装修情况"));
+        assetsVo.setSource(getStringValue(fieldsMap,"房源类型"));
         V3xOrgMember member = null;
         try {
             member = orgManager.getMemberById(Long.parseLong((String)fieldsMap.get("运营管理员")));
@@ -292,15 +274,29 @@ public class AssetsService {
         }
         String area = getStringValue(fieldsMap,"建筑面积");
         String rentFee = Optional.ofNullable(getStringValue(fieldsMap,"月租金")).orElse(getStringValue(fieldsMap,"年租金"));
-        assetsVo.setFootPrint(area.toString());
         if(area != null && rentFee != null) {
+            assetsVo.setFootPrint(area.toString());
+        }
+        if(rentFee != null) {
             assetsVo.setRentFee(rentFee.toString());
         }
         if(fieldsMap.get("资产图片") != null) {
             assetsVo.setDetailImg(OaFileVo.getInstance(fieldsMap.get("资产图片"),attachmentManager));
         }
-        if(fieldsMap.get("VR文件上传") != null) {
+        TableContext sub = FormTableExecutor.sub(getFormNo(), "VR文件");
-            assetsVo.setVrImg(OaFileVo.getInstance(fieldsMap.get("VR文件上传"),attachmentManager));
+        List<FormWhereCondition> subConditions = new ArrayList<>();
+        subConditions.add(FormWhereCondition.build().display("formmain_id").value(fieldsMap.get("id")));
+        List<FormColumn> formColumns = FormTableExecutor.query(sub, null, subConditions, false);
+        List<AssetsVrVo> assetsVrVos = new ArrayList<>();
+        if(formColumns != null && formColumns.size() > 0) {
+            for (FormColumn formColumn : formColumns) {
+                Map<String, Object> subFieldsMap = formColumn.getFieldsMap();
+                AssetsVrVo assetsVrVo = new AssetsVrVo();
+                assetsVrVo.setUrl((String)subFieldsMap.get("VR文件链接"));
+                assetsVrVo.setAssetsName((String)subFieldsMap.get("VR名称"));
+                assetsVrVos.add(assetsVrVo);
+            }
+            assetsVo.setVrImg(assetsVrVos);
         }
     }
 
@@ -310,6 +306,8 @@ public class AssetsService {
         assetsVo.setAssetsDesc(getStringValue(fieldsMap,"详情信息"));
         assetsVo.setFormId(getStringValue(fieldsMap,"id"));
         assetsVo.setLayout(getStringValue(fieldsMap,"户型"));
+        assetsVo.setCommunityNo(getStringValue(fieldsMap,"楼盘编号"));
+        assetsVo.setRoomNo(getStringValue(fieldsMap,"门牌号"));
         assetsVo.setRenovationStatus(getStringValue(fieldsMap,"装修情况"));
         String area = getStringValue(fieldsMap,"建筑面积");
         String rentFee = Optional.ofNullable(getStringValue(fieldsMap,"月租金")).orElse(getStringValue(fieldsMap,"年租金"));
@@ -318,6 +316,7 @@ public class AssetsService {
         if(fieldsMap.get("资产图片") != null) {
             assetsVo.setDetailImg(OaFileVo.getInstance(fieldsMap.get("资产图片"),attachmentManager));
         }
+        assetsVo.setSource(getStringValue(fieldsMap,"房源类型"));
     }
 
     public Map<String,Object> getAssetsManagerInfo(String assetsNo) throws Exception {

src/main/java/com/seeyon/apps/assetstenant/assets/AssetsVrVo.java

@@ -0,0 +1,22 @@
+package com.seeyon.apps.assetstenant.assets;
+
+public class AssetsVrVo {
+    private String assetsName;
+    private String url;
+
+    public String getAssetsName() {
+        return assetsName;
+    }
+
+    public void setAssetsName(String assetsName) {
+        this.assetsName = assetsName;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}

src/main/java/com/seeyon/apps/assetstenant/assets/OaAssetsVo.java

@@ -15,7 +15,7 @@ public class OaAssetsVo {
     private String footPrint; //占地大小
     private String formId; //表单记录ID
     private OaFileVo detailImg; //详情图片
-    private OaFileVo vrImg; //vr图
+    private List<AssetsVrVo> vrImg; //vr图
     private String assetsDesc; //资产描述
     private String assetsAddress; //资产地址
     private String latitude; //纬度
@@ -37,6 +37,8 @@ public class OaAssetsVo {
     private String manageType; //运营类型
     private String[] tags;
     private String renovationStatus; //装修状态
+    private String source;//来源
+    private String communityNo;// 楼盘
 
     public String getAssetsNo() {
         return assetsNo;
@@ -102,11 +104,11 @@ public class OaAssetsVo {
         this.detailImg = detailImg;
     }
 
-    public OaFileVo getVrImg() {
+    public List<AssetsVrVo> getVrImg() {
         return vrImg;
     }
 
-    public void setVrImg(OaFileVo vrImg) {
+    public void setVrImg(List<AssetsVrVo> vrImg) {
         this.vrImg = vrImg;
     }
 
@@ -285,4 +287,20 @@ public class OaAssetsVo {
     public void setManageType(String manageType) {
         this.manageType = manageType;
     }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getCommunityNo() {
+        return communityNo;
+    }
+
+    public void setCommunityNo(String communityNo) {
+        this.communityNo = communityNo;
+    }
 }

src/main/java/com/seeyon/apps/assetstenant/assets/ShAssetsService.java

@@ -21,9 +21,8 @@ public class ShAssetsService {
 
     private AssetsTenantConfigProvider configProvider = (AssetsTenantConfigProvider) AppContext.getBean("assetsTenantConfigProvider");
     private AttachmentManager attachmentManager = (AttachmentManager) AppContext.getBean("attachmentManager");
-    private OrgManager orgManager = (OrgManager) AppContext.getBean("orgManager");
     private String getFormNo() {
-        return configProvider.getBizConfigByKey(AssetsTenantConstants.ASSETS_FORMNO);
+        return configProvider.getBizConfigByKey(AssetsTenantConstants.ASSETS_SH_FORMNO);
     }
 
     public PageQueryVo pageQuery(JSONObject params) throws Exception {
@@ -74,13 +73,13 @@ public class ShAssetsService {
 
         if(StringUtils.isNotBlank(params.getString("keyWord"))){
             conditions.add(FormWhereCondition.build().display("资产名称")
-                    .startWithBracket(true)
+                    .startWithBracket(1)
                     .concatFactor(ClauseFactor.OR)
                     .value(params.getString("keyWord"))
                     .clauseFactor(ClauseFactor.LIKE));
             conditions.add(FormWhereCondition.build().display("房屋地址")
                     .value(params.getString("keyWord"))
-                    .endWithBracket(true)
+                    .endWithBracket(1)
                     .clauseFactor(ClauseFactor.LIKE));
         }
         return conditions;
@@ -167,7 +166,7 @@ public class ShAssetsService {
         assetsVo.setAssetsStatus(getStringValue(fieldsMap,"资产状态"));
         assetsVo.setAssetsAddress(getStringValue(fieldsMap,"房屋地址"));
         assetsVo.setManageType(getStringValue(fieldsMap,"运营类型"));
-
+        assetsVo.setSource(getStringValue(fieldsMap,"房源类型"));
         String lnglat = getStringValue(fieldsMap, "坐落经纬度");
         if(StringUtils.isNotBlank(lnglat)){
             // 统一替换逗号为分号，然后分割，兼容 ; 和 , 两种格式
@@ -194,12 +193,15 @@ public class ShAssetsService {
     public void fillPageQueryVo(Map<String, Object> fieldsMap,OaAssetsVo assetsVo) throws BusinessException {
         assetsVo.setAssetsNo(getStringValue(fieldsMap,"资产编号"));
         assetsVo.setAssetsName(getStringValue(fieldsMap,"资产名称"));
+        assetsVo.setManageType(getStringValue(fieldsMap,"运营类型"));
         assetsVo.setFormId(getStringValue(fieldsMap,"id"));
         assetsVo.setLayout(getStringValue(fieldsMap,"户型"));
+        assetsVo.setOrientation(getStringValue(fieldsMap,"朝向"));
+        assetsVo.setSource(getStringValue(fieldsMap,"房源类型"));
         assetsVo.setRenovationStatus(getStringValue(fieldsMap,"装修情况"));
         String area = getStringValue(fieldsMap,"建筑面积");
         assetsVo.setFootPrint(area);
-        if(fieldsMap.get("资产图片") != null) {
+        if(fieldsMap.get("房源图片") != null) {
             assetsVo.setDetailImg(OaFileVo.getInstance(fieldsMap.get("房源图片"),attachmentManager));
         }
     }

src/main/java/com/seeyon/apps/assetstenant/bill/BillService.java

@@ -72,8 +72,8 @@ public class BillService {
             if ("已缴费".equals(params.getString("billStatus"))) {
                 conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").clauseFactor(ClauseFactor.NOT_NULL));
             } else {
-                conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").clauseFactor(ClauseFactor.NULL).startWithBracket(true).concatFactor(ClauseFactor.OR));
+                conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").clauseFactor(ClauseFactor.NULL).startWithBracket(1).concatFactor(ClauseFactor.OR));
-                conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").value(EnumMapUtils.getEnumItemValueByDisplayValue(formTableBean, "账单-收款结果反馈", "未收款")).endWithBracket(true));
+                conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").value(EnumMapUtils.getEnumItemValueByDisplayValue(formTableBean, "账单-收款结果反馈", "未收款")).endWithBracket(1));
             }
         }
         return conditions;
@@ -142,8 +142,8 @@ public class BillService {
     public Integer countUnpayRentBills(JSONObject params) throws Exception {
         TableContext tableContext = getTableContext();
         List<FormWhereCondition> conditions = buildConditions(params, tableContext.getTableBean());
-        conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").clauseFactor(ClauseFactor.NULL).startWithBracket(true).concatFactor(ClauseFactor.OR));
+        conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").clauseFactor(ClauseFactor.NULL).startWithBracket(1).concatFactor(ClauseFactor.OR));
-        conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(), "账单-收款结果反馈", "未收款")).endWithBracket(true));
+        conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(), "账单-收款结果反馈", "未收款")).endWithBracket(1));
         Long count = FormTableExecutor.count(tableContext, null, conditions);
         return count.intValue();
     }

src/main/java/com/seeyon/apps/assetstenant/bill/WaeBillService.java

@@ -49,8 +49,8 @@ public class WaeBillService {
             if("已缴费".equals(params.getString("billStatus"))) {
                 conditions.add(FormWhereCondition.build().display("缴费状态").clauseFactor(ClauseFactor.NOT_NULL));
             }else {
-                conditions.add(FormWhereCondition.build().display("缴费状态").clauseFactor(ClauseFactor.NULL).startWithBracket(true).concatFactor(ClauseFactor.OR));
+                conditions.add(FormWhereCondition.build().display("缴费状态").clauseFactor(ClauseFactor.NULL).startWithBracket(1).concatFactor(ClauseFactor.OR));
-                conditions.add(FormWhereCondition.build().display("缴费状态").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(), "缴费状态", "未结清")).endWithBracket(true));
+                conditions.add(FormWhereCondition.build().display("缴费状态").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(), "缴费状态", "未结清")).endWithBracket(1));
             }
         }
         return conditions;
@@ -97,8 +97,8 @@ public class WaeBillService {
     public Integer countUnpayWaeBills(JSONObject params) throws Exception {
         TableContext tableContext = getTableContext();
         List<FormWhereCondition> conditions = buildConditions(params);
-        conditions.add(FormWhereCondition.build().display("缴费状态").clauseFactor(ClauseFactor.NULL).startWithBracket(true).concatFactor(ClauseFactor.OR));
+        conditions.add(FormWhereCondition.build().display("缴费状态").clauseFactor(ClauseFactor.NULL).startWithBracket(1).concatFactor(ClauseFactor.OR));
-        conditions.add(FormWhereCondition.build().display("缴费状态").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(),"缴费状态","未结清")).endWithBracket(true));
+        conditions.add(FormWhereCondition.build().display("缴费状态").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(),"缴费状态","未结清")).endWithBracket(1));
         Long count = FormTableExecutor.count(tableContext,null, conditions);
         return count.intValue();
     }

src/main/java/com/seeyon/apps/assetstenant/community/CommunitityVo.java

@@ -20,6 +20,7 @@ public class CommunitityVo {
     private String contactPhone;//联系电话
     private String communityNo;//楼盘编号
     private String communityDesc;//楼盘描述
+    private String construction; //建筑类型
 
     public String getReferenceTotalPrice() {
         return referenceTotalPrice;
@@ -156,4 +157,12 @@ public class CommunitityVo {
     public void setCommunityDesc(String communityDesc) {
         this.communityDesc = communityDesc;
     }
+
+    public String getConstruction() {
+        return construction;
+    }
+
+    public void setConstruction(String construction) {
+        this.construction = construction;
+    }
 }

src/main/java/com/seeyon/apps/assetstenant/community/CommunityService.java

@@ -254,6 +254,7 @@ public class CommunityService {
         communitityVo.setPropertyType(getStringValue(fieldsMap,"物业类型")); //物业类型
         communitityVo.setCommunityNo(getStringValue(fieldsMap,"台账编号")); //楼盘编号
         communitityVo.setCommunityDesc(getStringValue(fieldsMap,"小区详情")); //楼盘描述
+        communitityVo.setConstruction(getStringValue(fieldsMap,"建筑类型"));//建筑类型
         String lnglat = getStringValue(fieldsMap,"坐落经纬度");
         if(StringUtils.isNotBlank(lnglat)) {
             // 统一替换逗号为分号，然后分割，兼容 ; 和 , 两种格式

src/main/java/com/seeyon/apps/assetstenant/constants/AssetsTenantConstants.java

@@ -15,6 +15,7 @@ public enum AssetsTenantConstants {
     DISCHARGE_TEMPLATECODE("","退租申请模板编码"),
     FALLBACK_FORMNO("","留言板表单编码"),
     RESERVE_FORMNO("","看房预约表单编码"),
+    RESERVE_FLOW_FORMNO("","看房预约流程表编码"),
     VIEWRECORD_FORMNO("","浏览记录表单编码"),
     FORMAPPNAME("","表单应用名称"),
     FEERECORDFORMNO("","费用收支台账表单编码"),

src/main/java/com/seeyon/apps/assetstenant/cus/CustomerService.java

@@ -26,10 +26,12 @@ public class CustomerService {
 
     public String matchCusPerson(Customer customer) throws Exception {
         String cardNo = customer.getCardNo();
+        String phone = customer.getCusPhone();
         List<FormWhereCondition> conditions = new ArrayList<>();
         conditions.add(FormWhereCondition.build().display("纳税人识别号或身份证号").value(cardNo).clauseFactor(ClauseFactor.EQ));
         TableContext tableContext = getTableContext();
         conditions.add(FormWhereCondition.build().display("客商分类").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(),"客商分类","个人")));
+        conditions.add(FormWhereCondition.build().display("客户联系方式").value(phone).clauseFactor(ClauseFactor.EQ));
         List<FormColumn> formColumnList = FormTableExecutor.query(tableContext,null,conditions,true);
         if(formColumnList != null && formColumnList.size() > 0){
             Map<String, Object> fieldsMap = formColumnList.get(0).getFieldsMap();
@@ -40,10 +42,12 @@ public class CustomerService {
 
     public String matchCusOrg(Customer customer) throws BusinessException {
         String orgNo = customer.getOrgNo();
+        String phone = customer.getCusPhone();
         List<FormWhereCondition> conditions = new ArrayList<>();
         TableContext tableContext = getTableContext();
         conditions.add(FormWhereCondition.build().display("纳税人识别号或身份证号").value(orgNo).clauseFactor(ClauseFactor.EQ));
         conditions.add(FormWhereCondition.build().display("客商分类").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(),"客商分类","企业")));
+        conditions.add(FormWhereCondition.build().display("客户联系方式").value(phone).clauseFactor(ClauseFactor.EQ));
         List<FormColumn> formColumnList = FormTableExecutor.query(tableContext,null,conditions,true);
         if(formColumnList != null && formColumnList.size() > 0){
             Map<String, Object> fieldsMap = formColumnList.get(0).getFieldsMap();

src/main/java/com/seeyon/apps/assetstenant/reserve/ReserveService.java

@@ -3,22 +3,33 @@ package com.seeyon.apps.assetstenant.reserve;
 import com.alibaba.fastjson.JSONObject;
 import com.seeyon.apps.assetstenant.assets.AssetsService;
 import com.seeyon.apps.assetstenant.assets.OaAssetsVo;
+import com.seeyon.apps.assetstenant.assets.ShAssetsService;
 import com.seeyon.apps.assetstenant.config.AssetsTenantConfigProvider;
 import com.seeyon.apps.assetstenant.constants.AssetsTenantConstants;
+import com.seeyon.apps.assetstenant.flow.FlowCreateService;
 import com.seeyon.apps.assetstenant.po.PageQueryVo;
+import com.seeyon.cap4.form.api.FormApi4Cap4;
+import com.seeyon.cap4.form.bean.FormBean;
+import com.seeyon.cap4.form.bean.FormFieldBean;
 import com.seeyon.cap4.form.bean.FormTableBean;
 import com.seeyon.ctp.common.AppContext;
 import com.seeyon.ctp.common.exceptions.BusinessException;
+import com.seeyon.ctp.organization.bo.V3xOrgMember;
 import com.seeyon.utils.form.*;
 import com.seeyon.v3x.services.form.FormFactory;
 import org.apache.commons.lang3.StringUtils;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 public class ReserveService {
     private AssetsTenantConfigProvider configProvider = (AssetsTenantConfigProvider) AppContext.getBean("assetsTenantConfigProvider");
     private AssetsService assetsService = (AssetsService) AppContext.getBean("assetsService");
-    private FormFactory factory = (FormFactory) AppContext.getBean("formFactory");
+    private FlowCreateService flowCreateService = (FlowCreateService) AppContext.getBean("flowCreateService");
+    private ShAssetsService shAssetsService = (ShAssetsService) AppContext.getBean("shAssetsService");
 
     private String getFormNo() {
         return configProvider.getBizConfigByKey(AssetsTenantConstants.RESERVE_FORMNO);
@@ -89,36 +100,87 @@ public class ReserveService {
         vo.setStatus(status);
     }
 
+//    public void saveReserve(JSONObject params) throws Exception {
+//        Map<String,Object> mainData = new HashMap<>();
+//        mainData.put("资产编号", params.getString("assetsNo"));
+//        mainData.put("资产名称", params.getString("assetsName"));
+//        mainData.put("看房人姓名", params.getString("reserveName"));
+//        mainData.put("看房人手机号", params.getString("phone"));
+//        mainData.put("微信openId", params.getString("openId"));
+//        mainData.put("预约时间", params.getString("reserveTime"));
+//        String tenantType = params.getString("tenantType");
+//        if(StringUtils.isNotBlank(tenantType)) {
+//            TableContext tableContext = getMasterTableContext();
+//            FormTableBean tableBean = tableContext.getTableBean();
+//            if("0".equals(tenantType)) {
+//                mainData.put("客户属性",EnumMapUtils.getEnumItemValueByDisplayValue(tableBean,"客户属性","个人"));
+//            }else {
+//                mainData.put("客户属性",EnumMapUtils.getEnumItemValueByDisplayValue(tableBean,"客户属性","企业"));
+//            }
+//        }
+//        String docNo = "weChat_" + UUID.randomUUID().toString().replace("-","");
+//        mainData.put("档案编号",docNo);
+//        mainData.put("运营类型",getManageType(params.getString("assetsNo")));
+//        mainData.put("处理状态", EnumMapUtils.getEnumItemValueByDisplayValue(getMasterTableContext().getTableBean(), "处理状态", "未处理"));
+//        String loginName = configProvider.getBizConfigByKey(AssetsTenantConstants.formLoginName);
+//        FormSaveUtil.formSave(loginName,getFormNo(),factory,mainData,null);
+//    }
+
     public void saveReserve(JSONObject params) throws Exception {
+        // 1. 获取Bean + 非空校验
+        FormApi4Cap4 formApi4Cap4 = (FormApi4Cap4) AppContext.getBean("formApi4Cap4");
+        if (formApi4Cap4 == null) {
+            throw new Exception("Spring容器中未找到formApi4Cap4 Bean");
+        }
+
+        // 2. 复用配置，避免重复查询
+        String templateCode = this.configProvider.getBizConfigByKey(AssetsTenantConstants.RESERVE_FLOW_FORMNO);
+        String appName = this.configProvider.getBizConfigByKey(AssetsTenantConstants.FORMAPPNAME);
+
+        // 3. 获取表单结构
+        FormBean cap4FormBean = formApi4Cap4.getFormByFormCode(templateCode);
+        FormTableBean masterTableBean = cap4FormBean.getMasterTableBean();
+        String tableName = masterTableBean.getTableName();
+
+        // 5. 构造数据结构（规范泛型）
         Map<String, Object> mainFormData = new HashMap<>();
-        mainFormData.put("资产编号", params.getString("assetsNo"));
+        Map<String, List<Object>> subFormDataMap = new HashMap<>();
-        mainFormData.put("资产名称", params.getString("assetsName"));
+        List<Object> subFormDataList = new ArrayList<>();
-        mainFormData.put("看房人姓名", params.getString("reserveName"));
+
-        mainFormData.put("看房人手机号", params.getString("phone"));
+        Map<String, Object> mainData = new HashMap<>();
-        mainFormData.put("微信openId", params.getString("openId"));
+        mainFormData.put(tableName, mainData);
-        mainFormData.put("预约时间", params.getString("reserveTime"));
+
-        String tenantType = params.getString("tenantType");
-        if(StringUtils.isNotBlank(tenantType)) {
         TableContext tableContext = getMasterTableContext();
         FormTableBean tableBean = tableContext.getTableBean();
+        // 9. 获取合同信息 + 非空校验
+        mainData.put("资产编号", params.getString("assetsNo"));
+        mainData.put("资产名称", params.getString("assetsName"));
+        mainData.put("看房人姓名", params.getString("reserveName"));
+        mainData.put("看房人手机号", params.getString("phone"));
+        mainData.put("微信openId", params.getString("openId"));
+        mainData.put("预约时间", params.getString("reserveTime"));
+        mainData.put("房源类型",EnumMapUtils.getEnumItemValueByDisplayValue(tableBean,"房源类型",params.getString("houseSourceType")));
+        String tenantType = params.getString("tenantType");
+        if(StringUtils.isNotBlank(tenantType)) {
             if("0".equals(tenantType)) {
-                mainFormData.put("客户属性",EnumMapUtils.getEnumItemValueByDisplayValue(tableBean,"客户属性","个人"));
+                mainData.put("客户属性",EnumMapUtils.getEnumItemValueByDisplayValue(tableBean,"客户属性","个人"));
             }else {
-                mainFormData.put("客户属性",EnumMapUtils.getEnumItemValueByDisplayValue(tableBean,"客户属性","企业"));
+                mainData.put("客户属性",EnumMapUtils.getEnumItemValueByDisplayValue(tableBean,"客户属性","企业"));
             }
         }
         String docNo = "weChat_" + UUID.randomUUID().toString().replace("-","");
-        mainFormData.put("档案编号",docNo);
+        mainData.put("档案编号",docNo);
-        mainFormData.put("运营类型",getManageType(params.getString("assetsNo")));
+        mainData.put("运营类型",getManageType(params.getString("assetsNo"),params.getString("houseSourceType")));
-        mainFormData.put("处理状态", EnumMapUtils.getEnumItemValueByDisplayValue(getMasterTableContext().getTableBean(), "处理状态", "未处理"));
+        mainData.put("处理状态", EnumMapUtils.getEnumItemValueByDisplayValue(getMasterTableContext().getTableBean(), "处理状态", "未处理"));
-        String loginName = configProvider.getBizConfigByKey(AssetsTenantConstants.formLoginName);
+        // 12. 启动流程
-        FormSaveUtil.formSave(loginName,getFormNo(),factory,mainFormData,null);
+        this.flowCreateService.flowStart("预约看房流程",
+                mainFormData, subFormDataMap, appName, templateCode);
     }
 
-    public Long getManageType(String assetsNo) throws Exception {
+    public Long getManageType(String assetsNo,String houseType) throws Exception {
         JSONObject param = new JSONObject();
         param.put("assetsNo", assetsNo);
-        Long manageType = assetsService.queryAssetsManageType(param);
+        Long manageType = "二手房".equals(houseType) ? shAssetsService.queryAssetsManageType(param) : assetsService.queryAssetsManageType(param);
         return manageType;
     }
 

src/main/java/com/seeyon/ctp/rest/resources/assetstenant/AssetsQueryResource.java

@@ -3,6 +3,8 @@ package com.seeyon.ctp.rest.resources.assetstenant;
 import cn.hutool.log.Log;
 import com.alibaba.fastjson.JSONObject;
 import com.seeyon.apps.assetstenant.assets.AssetsService;
+import com.seeyon.apps.assetstenant.assets.OaAssetsVo;
+import com.seeyon.apps.assetstenant.assets.ShAssetsService;
 import com.seeyon.ctp.common.AppContext;
 import com.seeyon.ctp.rest.resources.BaseResource;
 
@@ -20,6 +22,7 @@ public class AssetsQueryResource extends BaseResource {
 
     private static final Log log = Log.get(AssetsQueryResource.class);
     private AssetsService assetsService = (AssetsService) AppContext.getBean("assetsService");
+    private ShAssetsService shAssetsService = (ShAssetsService) AppContext.getBean("shAssetsService");
 
     @POST
     @Path("/queryPage")
@@ -27,8 +30,9 @@ public class AssetsQueryResource extends BaseResource {
     @Consumes({"application/json"})
     public Response queryPage(JSONObject params) throws IOException {
         log.info("分页查询资产信息参数为："+params);
+        String secHouse = params.getString("secHouse");
         try{
-            return success(assetsService.pageQuery(params));
+            return "0".equals(secHouse) ? success(assetsService.pageQuery(params)) : success(shAssetsService.pageQuery(params));
         } catch (Exception e) {
             log.error(e.getMessage(),e);
             return fail(e.getMessage());
@@ -41,8 +45,9 @@ public class AssetsQueryResource extends BaseResource {
     @Consumes({"application/json"})
     public Response queryDetail(JSONObject params) throws IOException {
         log.info("查询资产详情信息参数为："+params);
+        String secHouse = params.getString("secHouse");
         try{
-            return success(assetsService.queryAssetsDetail(params));
+            return "0".equals(secHouse) ? success(assetsService.queryAssetsDetail(params)) : success(shAssetsService.queryAssetsDetail(params));
         } catch (Exception e) {
             log.error(e.getMessage(),e);
             return fail(e.getMessage());

src/main/java/com/seeyon/ctp/rest/resources/assetstenant/CustomerMatchResource.java

@@ -33,6 +33,8 @@ public class CustomerMatchResource extends BaseResource {
             log.info("匹配客商参数为:" + params);
             Customer customer = new Customer();
             String userType = params.getString("userType");
+            String phone = params.getString("phone");
+            customer.setCusPhone(phone );
             if("个人".equals(userType)) {
                 customer.setCardNo(params.getString("cardNo"));
                 return success(customerService.matchCusPerson(customer));