kaifabu/AssetsTenantServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整二手房的逻辑

Browse Source
This commit is contained in:
RuicyWu
2026-07-24 10:28:18 +08:00
parent 0f0d714911
commit f2f01d5095
13 changed files with 108 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/main/java/com/seeyon/apps/assetstenant/assets/AssetsService.java
View File

@@ -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(condition.getValues().size() > 0) {
conditions.add(condition);
if(tempSet == null || tempSet.isEmpty()){
return;
}
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,8 +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,"资产来源"));
assetsVo.setSource(getStringValue(fieldsMap,"房源类型"));
V3xOrgMember member = null;
try {
member = orgManager.getMemberById(Long.parseLong((String)fieldsMap.get("运营管理员")));
@@ -293,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) {
assetsVo.setVrImg(OaFileVo.getInstance(fieldsMap.get("VR文件上传"),attachmentManager));
TableContext sub = FormTableExecutor.sub(getFormNo(), "VR文件");
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);
}
}
@@ -311,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,"年租金"));
@@ -319,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 {

22
src/main/java/com/seeyon/apps/assetstenant/assets/AssetsVrVo.java Normal file
View File

@@ -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;
}
}

15
src/main/java/com/seeyon/apps/assetstenant/assets/OaAssetsVo.java
View File

@@ -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; //纬度
@@ -38,6 +38,7 @@ public class OaAssetsVo {
private String[] tags;
private String renovationStatus; //装修状态
private String source;//来源
private String communityNo;// 楼盘
public String getAssetsNo() {
return assetsNo;
@@ -103,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;
}
@@ -294,4 +295,12 @@ public class OaAssetsVo {
public void setSource(String source) {
this.source = source;
}
public String getCommunityNo() {
return communityNo;
}
public void setCommunityNo(String communityNo) {
this.communityNo = communityNo;
}
}

7
src/main/java/com/seeyon/apps/assetstenant/assets/ShAssetsService.java
View File

@@ -73,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;
@@ -166,7 +166,7 @@ public class ShAssetsService {
assetsVo.setAssetsStatus(getStringValue(fieldsMap,"资产状态"));
assetsVo.setAssetsAddress(getStringValue(fieldsMap,"房屋地址"));
assetsVo.setManageType(getStringValue(fieldsMap,"运营类型"));
assetsVo.setSource(getStringValue(fieldsMap,"资产来源"));
assetsVo.setSource(getStringValue(fieldsMap,"房源类型"));
String lnglat = getStringValue(fieldsMap, "坐落经纬度");
if(StringUtils.isNotBlank(lnglat)){
// 统一替换逗号为分号，然后分割，兼容 ; 和 , 两种格式
@@ -197,6 +197,7 @@ public class ShAssetsService {
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);

8
src/main/java/com/seeyon/apps/assetstenant/bill/BillService.java
View File

@@ -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("账单-收款结果反馈").value(EnumMapUtils.getEnumItemValueByDisplayValue(formTableBean, "账单-收款结果反馈", "未收款")).endWithBracket(true));
conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").clauseFactor(ClauseFactor.NULL).startWithBracket(1).concatFactor(ClauseFactor.OR));
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("账单-收款结果反馈").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(), "账单-收款结果反馈", "未收款")).endWithBracket(true));
conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").clauseFactor(ClauseFactor.NULL).startWithBracket(1).concatFactor(ClauseFactor.OR));
conditions.add(FormWhereCondition.build().display("账单-收款结果反馈").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(), "账单-收款结果反馈", "未收款")).endWithBracket(1));
Long count = FormTableExecutor.count(tableContext, null, conditions);
return count.intValue();
}

8
src/main/java/com/seeyon/apps/assetstenant/bill/WaeBillService.java
View File

@@ -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("缴费状态").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(), "缴费状态", "未结清")).endWithBracket(true));
conditions.add(FormWhereCondition.build().display("缴费状态").clauseFactor(ClauseFactor.NULL).startWithBracket(1).concatFactor(ClauseFactor.OR));
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("缴费状态").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(),"缴费状态","未结清")).endWithBracket(true));
conditions.add(FormWhereCondition.build().display("缴费状态").clauseFactor(ClauseFactor.NULL).startWithBracket(1).concatFactor(ClauseFactor.OR));
conditions.add(FormWhereCondition.build().display("缴费状态").value(EnumMapUtils.getEnumItemValueByDisplayValue(tableContext.getTableBean(),"缴费状态","未结清")).endWithBracket(1));
Long count = FormTableExecutor.count(tableContext,null, conditions);
return count.intValue();
}

9
src/main/java/com/seeyon/apps/assetstenant/community/CommunitityVo.java
View File

@@ -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;
}
}

1
src/main/java/com/seeyon/apps/assetstenant/community/CommunityService.java
View File

@@ -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)) {
// 统一替换逗号为分号，然后分割，兼容 ; 和 , 两种格式

1
src/main/java/com/seeyon/apps/assetstenant/constants/AssetsTenantConstants.java
View File

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

4
src/main/java/com/seeyon/apps/assetstenant/cus/CustomerService.java
View File

@@ -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();

4
src/main/java/com/seeyon/apps/assetstenant/reserve/ReserveService.java
View File

@@ -134,7 +134,7 @@ public class ReserveService {
}
// 2. 复用配置，避免重复查询
String templateCode = this.configProvider.getBizConfigByKey(AssetsTenantConstants.RESERVE_FORMNO);
String templateCode = this.configProvider.getBizConfigByKey(AssetsTenantConstants.RESERVE_FLOW_FORMNO);
String appName = this.configProvider.getBizConfigByKey(AssetsTenantConstants.FORMAPPNAME);
// 3. 获取表单结构
@@ -180,7 +180,7 @@ public class ReserveService {
public Long getManageType(String assetsNo,String houseType) throws Exception {
JSONObject param = new JSONObject();
param.put("assetsNo", assetsNo);
Long manageType = "自建房".equals(houseType) ? assetsService.queryAssetsManageType(param) : shAssetsService.queryAssetsManageType(param);
Long manageType = "二手房".equals(houseType) ? shAssetsService.queryAssetsManageType(param) : assetsService.queryAssetsManageType(param);
return manageType;
}

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

@@ -3,6 +3,7 @@ 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;

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

@@ -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));