同步现在的代码
This commit is contained in:
linghutianhao
@@ -0,0 +1,435 @@
|
||||
---
|
||||
sidebar_position: 1
|
||||
title: 26-1开发笔记
|
||||
---
|
||||
# 笔记1月
|
||||
|
||||
|
||||
#### 115663 【1月初上线】【相寓优选规则调整】相寓优选2.0规则调整
|
||||
|
||||
#### 115684 【需求】【相寓优选】杭州相寓优选产品委托无纸化签约过程页面相关修改
|
||||
|
||||
#### 115682 【需求】 【相寓优选】杭州相寓优选产品， 委托合同详情相关修改
|
||||
|
||||
|
||||
|
||||
// *******115663 UPDATE BY LHTH 2026-1-5 START *******
|
||||
// *******115663 UPDATE BY LHTH 2026-1-5 END *******
|
||||
|
||||
{'<'}%-- *******115663 UPDATE BY LHTH 2026-1-5 START *******--%>
|
||||
{'<'}%-- *******115663 UPDATE BY LHTH 2026-1-5 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
3、委托合同详情页增加 服务费(杭州特有每年收取的)、管理费(每个月收取的)收取说明 [委托合同签约规则文档-1.3.7]
|
||||
|
||||
|
||||
|
||||
7、合同模板修改 [范]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
1、招租期天数设定规则修改 [委托合同编辑页面一览表-招租期天数]
|
||||
|
||||
2、招租期截止日、招租期剩余天数计算规则更改 [委托合同签约规则文档-1.3.7]
|
||||
|
||||
4、维修基金变更，相寓优选2.0产品不收取。 [委托合同签约规则文档-1.3.7.2]
|
||||
|
||||
5、延长期变更为默认90天，不用收房人选择 [委托合同签约规则文档-1.3.13]
|
||||
|
||||
6、承租最高租金字段，上浮10%的比例变更为5% [字典值]
|
||||
|
||||
风李䶮风李䶮风李䶮风李䶮李䶮风李䶮风李䶮风李䶮风李䶮风李䶮风李䶮风李䶮风李䶮李䶮风李䶮风李䶮
|
||||
|
||||
|
||||
|
||||
##### 委托合同详情页 - 委托合同签约规则文档
|
||||
|
||||
###### 1.3.7 委托合同详情
|
||||
|
||||
```
|
||||
托管招租期
|
||||
招租期剩余天数”字段显示
|
||||
....
|
||||
```
|
||||
|
||||
###### 1.3.7.2 维修基金扣除规则
|
||||
|
||||
```
|
||||
相寓优选2.0产品不收取维修基金，故不生成维修基金的扣款单。
|
||||
```
|
||||
|
||||
###### 1.3.13 委托合同延期
|
||||
|
||||
```
|
||||
承租合同延期时间: 相寓优选2.0产品，承租最多延委托预计结束日+90天（自然日）
|
||||
当产品为相寓优选2.0:延长期期间需要收取资产管理费，具体收取规则见付款计划处
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 委托合同编辑页 - 委托合同编辑页面一览表
|
||||
|
||||
###### 合同主体信息
|
||||
|
||||
```
|
||||
承租最高金额 5% 字典值
|
||||
招租期天数 天数按需求给
|
||||
延长期（月） 不展示
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 资产管理费天数
|
||||
|
||||
```
|
||||
招租保证金生成时点,关联扣款单
|
||||
|
||||
付款计划生成规则: 押金收齐,防止多次生成 , 生成全部周期,生成承租周期的付款计划
|
||||
承租跨委托(比如上份还剩不到6个月吧,续签了一个),承租生成的啥是否适配委托?
|
||||
首次招租成功 挂扣消防器材的付款单(如未付款)
|
||||
|
||||
承租延期生成付款计划和资产管理费扣款
|
||||
付款金额=延期金额 , 延期的付款计划单独生成 ,比如第一次1个月2天 第二次1个月2天 , 一共4条
|
||||
资产管理费扣款 根据天数计算 也是每次延期单独生成
|
||||
|
||||
延期承租中退 ?委托还能有下一份的情况? 删除实际结束日之后的付款计划,如卡在一条付款计划中间,也删除
|
||||
|
||||
资产管理费/资产服务费扣款单生成 生成付款计划时生成
|
||||
资产管理费 1月3天的 月付季付哪里控制?季付3合1,如果第三个月不足月什么情况,跨两个委托年度的话 就各算各的,不足月的按公式算 , 还要关联付款单
|
||||
资产服务费 承租合同月租金的一半 每个委托年度一个 ,
|
||||
|
||||
维修基金 生成的地方都删掉
|
||||
|
||||
承租解约 撤单以及 前边没有撤单的承租 要删三个付款单
|
||||
其他情况 重新计算资产管理费(3天的那个)
|
||||
|
||||
分类增加资产服务费,删除维修基金,资产管理费补扣,返还 怎么出呢
|
||||
|
||||
扣款单挂扣排序
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 招租期天数
|
||||
|
||||
```
|
||||
编辑页
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 维修基金
|
||||
|
||||
```
|
||||
详情页
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 延长期
|
||||
|
||||
```
|
||||
详情页
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 付款计划
|
||||
|
||||
```
|
||||
付款计划规则
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 委托合同模板
|
||||
|
||||
```
|
||||
一套新的
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 承租解约短信/APP通知
|
||||
|
||||
```
|
||||
内容变更 4种
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 承租签约短信/APP通知
|
||||
|
||||
```
|
||||
内容变更
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 补需求 招租截止日
|
||||
|
||||
1. 签约时 招租截止日 = 委托合同开始日+首个招租期天数-1
|
||||
|
||||
2. 承租签约审核通过时 清空招租截止日
|
||||
|
||||
3. 承租解约 当前承租之后有有效承租 招租截止日不变(清空状态)
|
||||
|
||||
4. 承租解约 非3 , 如实际结束日+1 ≥ 委托实际结束日 -3月 , 招租截止日显示临期
|
||||
|
||||
5. 1承租解约 非3非4 , 如撤单 且没有已付款的付款计划 且无其他有效承租 , 招租截止日 = 委托合同开始日+首个招租期天数-1
|
||||
|
||||
2承租解约 非3非4 , 如撤单 有已付款的付款计划 且无其他有效承租 , 招租截止日 = 承租实际结束日+当前委托年度每年招租期天数
|
||||
|
||||
3承租解约 非3非4 , 如撤单 , 无其他有效承租 但是其他承租有已付款的付款计划 , 招租截止日 = 其他承租实际结束日+当前委托年度每年招租期天数
|
||||
|
||||
4承租解约 非3非4 , 如撤单 , 有其他有效承租 , 招租截止日 = 最后一份有效承租实际结束日+当前委托年度每年招租期天数
|
||||
|
||||
6. 承租解约 非3非4 , 如非撤单 , 招租截止日 = 承租实际结束日+当前委托年度每年招租期天数
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
只拿首年的天数去算了
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
set.*SF_CONTRACT_TYPE_JYZ
|
||||
|
||||
set.*1000100070005
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
北京
|
||||
TENP_CONTRACT_SIGN_STATE
|
||||
WIWJ_SF_CONTRACT_XY_NEW_REL
|
||||
WK_SF_CONTRACT
|
||||
WK_SF_CONTRACT_OWNER
|
||||
WIWJ_ESTIMATE_PRODUCT_REL
|
||||
WIWJ_CONTRACT_TRACKING
|
||||
|
||||
|
||||
|
||||
上海
|
||||
Sh_TENP_CONTRACT_SIGN_STATE
|
||||
Sh_WIWJ_SF_CONTRACT_XY_NEW_REL
|
||||
Sh_WK_SF_CONTRACT
|
||||
Sh_WK_SF_CONTRACT_OWNER
|
||||
Sh_WIWJ_CONTRACT_TRACKING
|
||||
SH_WK_SF_CYCLE_PRICE
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
页面变更新续关系
|
||||
|
||||
先签下一份委托,再承租延期
|
||||
|
||||
下一份是优选 但是延期导致重期
|
||||
|
||||
上份是招租失败且新签
|
||||
|
||||
合同重期-更名协议
|
||||
|
||||
合同重期-房源编号变更
|
||||
|
||||
合同更名协议
|
||||
|
||||
禅道改数据
|
||||
|
||||
变更房源编号
|
||||
|
||||
上线后的数据
|
||||
|
||||
---
|
||||
|
||||
#### 116499 【需求】相寓优选2.0临期3个月如有无缝续签委托进入招租期
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
招租截止日
|
||||
|
||||
当前日期后有有效承租不展示
|
||||
|
||||
##### 首次招租期
|
||||
|
||||
##### 托管招租期
|
||||
|
||||
1. 后边无承租 按3(1) 3(2)
|
||||
|
||||
2. 委托审核通过
|
||||
|
||||
条件 : 无缝续签 , 无招租截止日(临期半年内续签和3个月内到期) , 无有效承租(这里是都解约完成) , 3个月内是对的 , 委托上份合同状态是已续约(已解约没有截止日 , 解约中?)
|
||||
|
||||
3. 协议变更开始日
|
||||
|
||||
##### 生成公式 : 3>2>1
|
||||
|
||||
1. 如在首年 招租截止日=承租结束日+当年招租天数-(委托开始日 到 承租实际结束日的空置天数)
|
||||
|
||||
非首年 招租截止日=承租结束日+当年招租天数-(周期开始日 到 承租实际结束日的空置天数)
|
||||
|
||||
空置天数具体计算 承租开始日-统计开始日 , 承租开始日-(上个承租实际结束日+1)
|
||||
|
||||
2. 招租截止日跨委托年度了 , 招租截止日=下一年度开始日+招租天数-1 , 如是最后一年 , 走123
|
||||
|
||||
3. 招租截止日跨无缝续签委托且是优选2.0 招租截止日=下份委托的招租截止日 不签协议的话 最多60来天 (延期)
|
||||
|
||||
##### 保证金生成
|
||||
|
||||
1. 公式1最后一年可能会导致 结束日>招租截止日 , 截止日为空是半年内还有承租
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 116739 【需求】【26年2月初上线】武汉、成都相寓优选计算招租期规则更改
|
||||
|
||||
|
||||
|
||||
// *******116739 UPDATE BY LHTH 2026-1-23 START *******
|
||||
// *******116739 UPDATE BY LHTH 2026-1-23 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 116517 【需求】【26年2月初上线】相寓优选2.0使用的《北京相寓资产管理服务合同》补充协议新增“变更首次招租期开始日”的逻辑
|
||||
|
||||
|
||||
|
||||
// *******116517 UPDATE BY LHTH 2026-1-28 START *******
|
||||
// *******116517 UPDATE BY LHTH 2026-1-28 END *******
|
||||
|
||||
{'<'}%-- *******116517 UPDATE BY LHTH 2026-1-28 START *******--%>
|
||||
{'<'}%-- *******116517 UPDATE BY LHTH 2026-1-28 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
```
|
||||
orderDepositWithSubService.judgeProductId(contractMainInfo.getProductCode(), StaticVariable.SF_CONTRACT_PRODUCT_XYYX, null)
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 115479 【需求】【26年3月初上线】相寓优选2.0产品，资产管理费收取规则修改，根据签订租金不同收取标准不同
|
||||
|
||||
|
||||
|
||||
// *******115479 UPDATE BY LHTH 2026-1-30 START *******
|
||||
// *******115479 UPDATE BY LHTH 2026-1-30 END *******
|
||||
|
||||
|
||||
|
||||
4.2 表格
|
||||
|
||||
4.8.1
|
||||
|
||||
4.8.2
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,373 @@
|
||||
---
|
||||
sidebar_position: 2
|
||||
title: 26-2开发笔记
|
||||
---
|
||||
# 笔记2月
|
||||
// *******116517 UPDATE BY LHTH 2026-2-2 START *******
|
||||
// *******116517 UPDATE BY LHTH 2026-2-2 END *******
|
||||
|
||||
{'<'}%-- *******116517 UPDATE BY LHTH 2026-2-2 START *******--%>
|
||||
{'<'}%-- *******116517 UPDATE BY LHTH 2026-2-2 END *******--%>
|
||||
|
||||
---
|
||||
|
||||
#### 116702 测试
|
||||
|
||||
#### 116753 【需求】【26年2月初上线】【关联116702】相寓优选招租失败委托时间结束日缩回规则更改
|
||||
|
||||
先签一个 临期不开招租期的委托 签了无缝续签委托(优选?) , 给旧委托招租期赋值
|
||||
|
||||
|
||||
|
||||
如招租截止日>委托实际结束日 第二份合同如果是优选 , 不能支付招租保证金
|
||||
|
||||
|
||||
|
||||
##### 托管招租期生成时点1: 承租解约
|
||||
|
||||
##### 生成时点2: 委托签约审核通过 / 生成时点3: 协议修改开始日
|
||||
|
||||
A 续签且无缝
|
||||
|
||||
B 无招租截止日(因C 所以只有临期)
|
||||
|
||||
C 无有效承租
|
||||
|
||||
D 最后一个承租实际结束日在尾空3个月(延期?)
|
||||
|
||||
E 原合同状态是已续约
|
||||
|
||||
|
||||
|
||||
3.1 解约触发 临期 且没有无缝续签的合同 不生成招租截止日
|
||||
|
||||
3.2 解约触发 不临期 / 有无缝续签的合同
|
||||
|
||||
A 招租截止日>合同实际结束日 则用计算的结果
|
||||
|
||||
B 招租截止日>合同实际结束日 且有无缝续签优选委托 截止日=新委托的截止日
|
||||
|
||||
(看B 没B则用计算的结果)
|
||||
|
||||
4 承租审核通过 还要清空上份委托的截止日
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
签优选协议时
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
招租失败定时 : 不刷合同结束日到招租截止日
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 117010 【需求】【全国】Work端录入委托合同时优化
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
只能签署整年 :
|
||||
|
||||
上海, 成都直营, 武汉直营, 广州直营, 南京
|
||||
|
||||
|
||||
|
||||
部分产品只能签署整年 :
|
||||
|
||||
北京 : 相寓优选 (在评估单页面录入, 合同录入页无法更改)
|
||||
|
||||
杭州 : 相寓优选和相寓精选 (在评估单页面录入, 合同录入页无法更改)
|
||||
|
||||
太原 : 相寓优选 (在评估单页面录入, 合同录入页无法更改)
|
||||
|
||||
苏州 : 相寓优选
|
||||
|
||||
天津 : 相寓优选
|
||||
|
||||
郑州 : 相寓优选
|
||||
|
||||
|
||||
|
||||
可签署月的 :
|
||||
|
||||
无锡
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// *******117252 UPDATE BY LHTH 2026-2-4 START *******
|
||||
// *******117252 UPDATE BY LHTH 2026-2-4 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
select rentuse,planned_use,preenddate from wk_sf_contract where contractcode = 'AFWT10452284ZY';--2023-08-27 00:00:00
|
||||
|
||||
update wk_sf_contract set rentuse='1000300200003',planned_use='1000100860003',preenddate='2026-01-27' where contractcode = 'AFWT10452284ZY';
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
select rentuse,planned_use,preenddate,CountPeople from wk_sf_contract where contractcode = 'AFWT10560033ZY';
|
||||
|
||||
select * from taw_system_dicttype where dictid = '1000901020001';
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 117318 【需求】《郑州相寓资产管理服务合同》补充协议-进行资产管理服务期限变更时结束日计算规则更改
|
||||
|
||||
|
||||
|
||||
// *******117318 UPDATE BY LHTH 2026-2-5 START *******
|
||||
// *******117318 UPDATE BY LHTH 2026-2-5 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
首年整
|
||||
|
||||
首年不足年
|
||||
|
||||
else
|
||||
|
||||
非首年没有月
|
||||
|
||||
非首年有月 , 非最后一年
|
||||
|
||||
非首年优越 , 最后不足年的一年
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 测试
|
||||
|
||||
##### 115479 **【需求】【26年3月初上线】相寓优选2.0产品，资产管理费收取规则修改，根据签订租金不同收取标准不同**
|
||||
|
||||
- [x] 1管理费收取(签约,延期)金额
|
||||
- [x] 2模板
|
||||
- [x] 3签协议无变化
|
||||
- [x] 4 114968新加的字段展示
|
||||
- [x] 5延期收取同合同 **AFWT100024130ZY** 新小于1000元
|
||||
|
||||
**AFWT100024042ZY**旧小于1000元
|
||||
|
||||
**AFWT100024135ZY**新大于1000元
|
||||
|
||||
上线前{'<'}1000的
|
||||
|
||||
- [x] pc 上线后{'<'}1000的 : 管理服务费133元/月
|
||||
|
||||
- [x] pc 上线后>=1000的 : 管理服务费首年4天/月 非首年4天/月
|
||||
|
||||
- [x] work 上线后{'<'}1000的 : 管理服务费133元/月
|
||||
|
||||
- [x] work 上线后>=1000的 : 管理服务费首年4天/月 非首年4天/月
|
||||
|
||||
- [x] app{'<'}1000 : 管理服务费标准133元/月
|
||||
|
||||
- [x] app>=1000 : 管理服务费标准4天/月
|
||||
|
||||
##### 115914 **【需求】 【26年2月上线】【相寓优选】太原相寓优选产品， 委托合同详情相关修改**
|
||||
|
||||
- [x] 合同详情字段修改
|
||||
|
||||
- [x] 取值说明看新字段吧 (禅道写看月租金)
|
||||
- [x] 旧版无问题 没修改字段名
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 116894 【需求】相寓优选产品，委托合同详情页面增加“标准招租天数”字段
|
||||
|
||||
// *******116894 UPDATE BY LHTH 2026-2-25 START *******
|
||||
// *******116894 UPDATE BY LHTH 2026-2-25 END *******
|
||||
|
||||
{'<'}%-- *******116894 UPDATE BY LHTH 2026-2-25 START *******--%>
|
||||
{'<'}%-- *******116894 UPDATE BY LHTH 2026-2-25 END *******--%>
|
||||
|
||||
|
||||
|
||||
#### 116877 【需求】委托合同详情页面修改
|
||||
|
||||
// *******116877 UPDATE BY LHTH 2026-2-25 START *******
|
||||
// *******116877 UPDATE BY LHTH 2026-2-25 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 116442 【需求】上海相寓优选2.0合同， 合同详情和合同主体页面 去掉 最低月租金的展示。
|
||||
|
||||
// *******116442 UPDATE BY LHTH 2026-2-26 START *******
|
||||
// *******116442 UPDATE BY LHTH 2026-2-26 END *******
|
||||
|
||||
|
||||
|
||||
#### 116382 【需求】委托相寓优选2.0 的基准租金、最高租金及最低租金调整优化
|
||||
|
||||
|
||||
|
||||
// *******116382 UPDATE BY LHTH 2026-2-26 START *******
|
||||
// *******116382 UPDATE BY LHTH 2026-2-26 END *******
|
||||
|
||||
{'<'}%-- *******116382 UPDATE BY LHTH 2026-2-26 START *******--%>
|
||||
{'<'}%-- *******116382 UPDATE BY LHTH 2026-2-26 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
```
|
||||
minFloatRatio
|
||||
```
|
||||
|
||||
|
||||
|
||||
1.
|
||||
|
||||
- [x] pc
|
||||
|
||||
- [x] work
|
||||
- [ ] 上线前未打印的
|
||||
- [ ] 上线前提交打印审核 上线后驳回的
|
||||
- [ ] 上线前的合同 换签(忽略)
|
||||
|
||||
2.
|
||||
|
||||
- [x] pc
|
||||
- [x] work
|
||||
|
||||
3.
|
||||
|
||||
- [x] pc
|
||||
- [x] work
|
||||
|
||||
4.
|
||||
|
||||
- [x] 合同模板
|
||||
|
||||
|
||||
|
||||
协议
|
||||
|
||||
1.
|
||||
|
||||
- [x] pc页面
|
||||
- [x] work页面
|
||||
|
||||
2.
|
||||
|
||||
- [x] 模板
|
||||
- [x] work预览
|
||||
|
||||
3.
|
||||
|
||||
- [x] 变更后的最低金额=基准租金
|
||||
|
||||
4.
|
||||
|
||||
- [x] 去掉校验 最低最高租金需要一致
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 117703 【需求】【26年3月初上线】委托产品类型为“相寓优选2.0”时，不能发起《爱家营-相寓空置期租金免除补充协议》
|
||||
|
||||
|
||||
|
||||
// *******117703 UPDATE BY LHTH 2026-2-28 START *******
|
||||
// *******117703 UPDATE BY LHTH 2026-2-28 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,256 @@
|
||||
---
|
||||
sidebar_position: 3
|
||||
title: 26-3开发笔记
|
||||
---
|
||||
# 笔记3月
|
||||
#### 117209 【需求】相寓优选2.0使用的《苏州相寓资产管理服务合同》补充协议新增“变更首次招租期开始日”的逻辑
|
||||
|
||||
// *******117209 UPDATE BY LHTH 2026-3-2 START *******
|
||||
// *******117209 UPDATE BY LHTH 2026-3-2 END *******
|
||||
|
||||
#### 116826 【需求】相寓优选2.0使用的《南京相寓资产管理服务合同》补充协议新增“变更首次招租期开始日”的逻辑
|
||||
|
||||
// *******116826 UPDATE BY LHTH 2026-3-2 START *******
|
||||
// *******116826 UPDATE BY LHTH 2026-3-2 END *******
|
||||
|
||||
#### 117368 【需求】相寓优选2.0使用的《天津相寓资产管理服务合同》补充协议新增“变更首次招租期开始日”的逻辑
|
||||
|
||||
// *******117368 UPDATE BY LHTH 2026-3-2 START *******
|
||||
// *******117368 UPDATE BY LHTH 2026-3-2 END *******
|
||||
|
||||
#### 117251 【需求】相寓优选2.0使用的《相寓资产管理服务合同》补充协议新增“变更首次招租期开始日”的逻辑
|
||||
|
||||
// *******117251 UPDATE BY LHTH 2026-3-2 START *******
|
||||
// *******117251 UPDATE BY LHTH 2026-3-2 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// *******117209,116826,117368,117251 UPDATE BY LHTH 2026-3-2 START *******
|
||||
// *******117209,116826,117368,117251 UPDATE BY LHTH 2026-3-2 END *******
|
||||
|
||||
{'<'}%-- *******117209,116826,117368,117251 UPDATE BY LHTH 2026-3-2 START *******--%>
|
||||
{'<'}%-- *******117209,116826,117368,117251 UPDATE BY LHTH 2026-3-2 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 117210 【需求】相寓优选2.0资产管理费扣款规则调整及相关合同模板调整
|
||||
|
||||
#### 117213 【需求】相寓优选2.0临期3个月如有无缝续签委托进入招租期
|
||||
|
||||
苏州 117210,117213
|
||||
|
||||
南京 117188,117191
|
||||
|
||||
天津 117372,117373
|
||||
|
||||
郑州 117258,117262
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 117047 【需求】变更打招租失败标签的逻辑
|
||||
|
||||
|
||||
|
||||
// *******117047 UPDATE BY LHTH 2026-3-10 START *******
|
||||
// *******117047 UPDATE BY LHTH 2026-3-10 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
有委托 且 无承租 展示
|
||||
|
||||
无委托 且 有承租 不展示
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 117573 【需求】相寓优选2.0使用的《相寓资产管理服务合同》补充协议新增“变更首次招租期开始日”的逻辑
|
||||
|
||||
|
||||
|
||||
// *******117573 UPDATE BY LHTH 2026-3-12 START *******
|
||||
// *******117573 UPDATE BY LHTH 2026-3-12 END *******
|
||||
|
||||
{'<'}%-- *******117573 UPDATE BY LHTH 2026-3-12 START *******--%>
|
||||
{'<'}%-- *******117573 UPDATE BY LHTH 2026-3-12 END *******--%>
|
||||
|
||||
|
||||
|
||||
思源宋体 Regular
|
||||
|
||||
SourceHanSerifCN-Regular.ttf
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 117597 【需求】【全国】相寓优选2.0协议签署补充协议增加招租期天数时，判断当前在哪个招租期逻辑更改
|
||||
|
||||
|
||||
|
||||
// *******117597 UPDATE BY LHTH 2026-3-17 START *******
|
||||
// *******117597 UPDATE BY LHTH 2026-3-17 END *******
|
||||
|
||||
|
||||
|
||||
- [x] 优先用委托合同招租期截止日判断在哪个委托年度内
|
||||
- [ ] 如果招租期截止日>委托合同实际结束日则视为最后一个履约年度
|
||||
- [x] 如果委托合同招租期截止日为空，则使用协议录入日期 (成都、武汉 不行)
|
||||
|
||||
|
||||
|
||||
排除招租失败已缩回的
|
||||
|
||||
必须有周期 - 排除没有签过承租的
|
||||
|
||||
- [x] 有承租 截止日是空 , 用当前时间
|
||||
|
||||
测试方法 : 第一年和第二年都看下
|
||||
|
||||
- [x] 无承租 且倒数3个月 截止日是空 , 用当前时间
|
||||
|
||||
测试方法 : 解约到临期
|
||||
|
||||
- [x] 无承租 且倒数3个月 且有无缝续签的合同 招租截止日是下一份委托的截止日
|
||||
|
||||
测试方法 : 续签一个合同 , 将旧合同解约到临期范围
|
||||
|
||||
- [x] 无承租 按招租截止日看 比如承租1月20到期 还剩20天 结束日是2月10号
|
||||
|
||||
测试方法 :
|
||||
|
||||
|
||||
|
||||
招租是空
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
当前日期大于招租期开始日
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 116935 【需求】委托交割续签增加优选2次收房判断
|
||||
|
||||
#### 116930 【需求】委托交割续签增加优选2次收房判断
|
||||
|
||||
##### 杭州
|
||||
|
||||
无缝续签规则 自动审核
|
||||
|
||||
优选续优选 , 上份合同和原合同字段+无缝
|
||||
|
||||
|
||||
|
||||
##### 其他城市
|
||||
|
||||
普通续普通 , 满足口径+无缝
|
||||
|
||||
普通续优选 , 满足口径+无缝
|
||||
|
||||
优选续普通 ,
|
||||
|
||||
优选续优选 ,
|
||||
|
||||
|
||||
|
||||
##### 字面解析
|
||||
|
||||
lastcontractcode有就是续签 , 如果是首次招租失败导致的新签看PROPERTY_LASTCONTRACTCODE , 有任一满足且达成 + 无缝AUTO_CREATE_PROPERTY_FLAG
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
自动生成的交割单 不需要审核 ?
|
||||
自动审核 和 不自动审核录入交割单代入数据 ?
|
||||
|
||||
##### 字段说明
|
||||
|
||||
lastcontractcode 和 PROPERTY_LASTCONTRACTCODE -- 保存合同时更新
|
||||
|
||||
AUTO_CREATE_PROPERTY_FLAG -- 推送/打印时更新
|
||||
|
||||
|
||||
|
||||
##### 操作地点
|
||||
|
||||
type页的带数据的时候 看新续
|
||||
|
||||
定时生成的时候 看新续
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 118499 【需求】相寓优选2.0《北京相寓资产管理服务合同》补充协议-《首次招租期变更》部分风控审批流调整
|
||||
|
||||
|
||||
|
||||
// *******118499 UPDATE BY LHTH 2026-3-27 START *******
|
||||
// *******118499 UPDATE BY LHTH 2026-3-27 END *******
|
||||
|
||||
{'<'}%-- *******118499 UPDATE BY LHTH 2026-3-27 START *******--%>
|
||||
{'<'}%-- *******118499 UPDATE BY LHTH 2026-3-27 END *******--%>
|
||||
|
||||
|
||||
|
||||
注意点
|
||||
|
||||
- [x] 审核通过后看履历的审核人
|
||||
- [x] work财务审核页面返回按钮是否好使
|
||||
- [x] 审核通过的逻辑是否对
|
||||
- [x] work消息
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,569 @@
|
||||
---
|
||||
sidebar_position: 4
|
||||
title: 26-4开发笔记
|
||||
---
|
||||
# 笔记4月
|
||||
#### 117807 【优化】委托房间价格周期表数据存储优化
|
||||
|
||||
// *******117807 UPDATE BY LHTH 2026-3-30 START *******
|
||||
// *******117807 UPDATE BY LHTH 2026-3-30 END *******
|
||||
|
||||
{'<'}%-- *******117807 UPDATE BY LHTH 2026-3-30 START *******--%>
|
||||
{'<'}%-- *******117807 UPDATE BY LHTH 2026-3-30 END *******--%>
|
||||
|
||||
|
||||
|
||||
- [x] work/AMS初始化页面是否要更新房间信息 直营分支agreement_detail_INSERT_DATA.sql
|
||||
|
||||
- [x] 后台同页面一样的计算系数
|
||||
- [x] 保存房间信息的保留和红冲
|
||||
- [x] 定时任务的保留和红冲
|
||||
- [x] 协议的保留和红冲
|
||||
- [x] (可能是修改房间的)保留和红冲
|
||||
- [ ] 64976 【问题】房间分间价格变为0后无法恢复原来的定价
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
117776 【需求】【成都直营】相寓优选2.0资产管理费扣款规则调整及相关合同模板调整
|
||||
|
||||
117779 【需求】【成都直营】相寓优选2.0临期3个月如有无缝续签委托进入招租期
|
||||
|
||||
117939 【需求】【武汉直营】相寓优选2.0资产管理费扣款规则调整及相关合同模板调整
|
||||
|
||||
117943 【需求】【武汉直营】相寓优选2.0临期3个月如有无缝续签委托进入招租期
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 117770 【需求】【成都直营】相寓优选2.0使用的《成都相寓资产管理服务合同》补充协议新增“变更首次招租期开始日”的逻辑
|
||||
|
||||
#### 117934 【需求】【武汉直营】相寓优选2.0使用的《相寓资产管理服务合同》补充协议新增“变更首次招租期开始日”的逻辑
|
||||
|
||||
|
||||
|
||||
// *******117770,117934 UPDATE BY LHTH 2026-4-8 START *******
|
||||
// *******117770,117934 UPDATE BY LHTH 2026-4-8 END *******
|
||||
|
||||
{'<'}%-- *******117770,117934 UPDATE BY LHTH 2026-4-8 START *******--%>
|
||||
{'<'}%-- *******117770,117934 UPDATE BY LHTH 2026-4-8 END *******--%>
|
||||
|
||||
|
||||
|
||||
思源宋体 Regular
|
||||
|
||||
SourceHanSerifCN-Regular.ttf
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 118634 【优化】委托合同编辑页面，如果证件类型为营业执照，业主证件编号录入时支持录入汉字
|
||||
|
||||
// *******118634 UPDATE BY LHTH 2026-4-10 START *******
|
||||
// *******118634 UPDATE BY LHTH 2026-4-10 END *******
|
||||
|
||||
{'<'}%-- *******118634 UPDATE BY LHTH 2026-4-10 START *******--%>
|
||||
{'<'}%-- *******118634 UPDATE BY LHTH 2026-4-10 END *******--%>
|
||||
|
||||
|
||||
|
||||
人中编函[1989]65号/()asdASD-李䶮风
|
||||
|
||||
人中编函[1989]65号/()asdASD-李风
|
||||
|
||||
[1989]65/()asdASD-
|
||||
|
||||
198965/()asdASD-
|
||||
|
||||
|
||||
|
||||
lastRealEndDate 最后一份其他承租
|
||||
|
||||
如果当前是撤单 且之前没有其他承租 这个日期是委托开始日
|
||||
|
||||
非撤单 最后一份是自己
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119054 【上海预生产】《上海相寓资产管理服务合同》补充协议，页面优化*
|
||||
|
||||
|
||||
|
||||
// *******119054 UPDATE BY LHTH 2026-4-14 START *******
|
||||
// *******119054 UPDATE BY LHTH 2026-4-14 END *******
|
||||
{'<'}%-- *******119054 UPDATE BY LHTH 2026-4-14 START *******--%>
|
||||
{'<'}%-- *******119054 UPDATE BY LHTH 2026-4-14 END *******--%>
|
||||
|
||||
|
||||
|
||||
http://10.1.67.76:8080/api/agreement/modifyAgreement?contractId=100035240&token=e2be8c7436bcbce4476fac2c2f33ec7d&agreementId=7732398&bntFlag=N
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119079 【北京测试--关联118499】【work】鸿蒙 《北京相寓资产管理服务合同》补充协议在work审核页面，附件信息里的驳回原因框可以滑动变换大小
|
||||
|
||||
{'<'}%-- *******119079 UPDATE BY LHTH 2026-4-14 START *******--%>
|
||||
{'<'}%-- *******119079 UPDATE BY LHTH 2026-4-14 END *******--%>
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 118978 增加非收房分支修改房源楼层的功能
|
||||
|
||||
// *******118978 UPDATE BY LHTH 2026-4-15 START *******
|
||||
// *******118978 UPDATE BY LHTH 2026-4-15 END *******
|
||||
|
||||
{'<'}%-- *******118978 UPDATE BY LHTH 2026-4-15 START *******--%>
|
||||
{'<'}%-- *******118978 UPDATE BY LHTH 2026-4-15 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
权限 houseNew_floor_edit
|
||||
|
||||
输入框
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 118702 【需求】委托代理人可以在相寓app及短信收到房屋出租及房屋退租的信息提示
|
||||
|
||||
// *******118702 UPDATE BY LHTH 2026-4-17 START *******
|
||||
// *******118702 UPDATE BY LHTH 2026-4-17 END *******
|
||||
|
||||
{'<'}%-- *******118702 UPDATE BY LHTH 2026-4-17 START *******--%>
|
||||
{'<'}%-- *******118702 UPDATE BY LHTH 2026-4-17 END *******--%>
|
||||
|
||||
|
||||
|
||||
- [x] 加标记按钮 -- 风控审核之后的状态
|
||||
- [x] 加取消标记按钮
|
||||
- [x] 承租解约短信/app通知 承租签约短信/app通知
|
||||
- [x] 续签清字段 pc和work都清理
|
||||
- [x] 菜单
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119031 【成都-需求】相寓优选2.0首次招租期天数调整及招租保证金金额调整
|
||||
|
||||
// *******119031 UPDATE BY LHTH 2026-4-21 START *******
|
||||
// *******119031 UPDATE BY LHTH 2026-4-21 END *******
|
||||
|
||||
|
||||
|
||||
测试
|
||||
|
||||
- [x] 招租天数调整30->45
|
||||
- [x] 招租保证金变成80%
|
||||
- [ ] 上线前创建 30天
|
||||
- [ ] 上线前换签 30天
|
||||
- [ ] 上线前换签再换签 45天
|
||||
- [ ] 上线前未打印 45天
|
||||
- [ ] 上线后创建 45天
|
||||
|
||||
|
||||
|
||||
已打印审核通过
|
||||
|
||||
此时打印的是旧版
|
||||
|
||||
|
||||
|
||||
换签一下 打印的还是旧版
|
||||
|
||||
|
||||
|
||||
因为我用了新版存完数据 , 再打印 , 保证金都是后生成的
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
承租签约生成 委托的保证金
|
||||
|
||||
work合同保存 给招租时间
|
||||
|
||||
合同审核通过 生成招租保证金
|
||||
|
||||
新旧合同的区分方法
|
||||
|
||||
AMS同保存 给招租时间
|
||||
|
||||
```
|
||||
招租天数字典 10001010700030001
|
||||
上线分割日字典 1000101160001
|
||||
```
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119232 【需求】相寓优选2.0产品首年、非首年招租期天数调整
|
||||
|
||||
// *******119232 UPDATE BY LHTH 2026-4-22 START *******
|
||||
// *******119232 UPDATE BY LHTH 2026-4-22 END *******
|
||||
|
||||
{'<'}%-- *******119232 UPDATE BY LHTH 2026-4-22 START *******--%>
|
||||
{'<'}%-- *******119232 UPDATE BY LHTH 2026-4-22 END *******--%>
|
||||
|
||||
|
||||
|
||||
历史数据 :
|
||||
|
||||
- [x] 已提审/审核通过 刷数据
|
||||
- [x] 未提交审核/审核驳回 不刷,点提审按钮校验
|
||||
- [x] 已失效 刷不刷?
|
||||
|
||||
非历史数据 :
|
||||
|
||||
- [x] 按照价格出不同天数
|
||||
|
||||
合同AMS :
|
||||
|
||||
- [x] 招租期天数取评估单的值--合同
|
||||
- [ ] 招租期天数取评估单的值--周期
|
||||
- [x] 合同模板
|
||||
|
||||
- [ ] 合同保存校验 , 招租期天数为或者是0 , “无法获取到招租期天数，请重新评估后收房。”
|
||||
|
||||
ams 提交财务审核
|
||||
|
||||
|
||||
|
||||
- [ ] 编辑页取字段
|
||||
|
||||
合同work :
|
||||
|
||||
- [x] 招租期天数取评估单的值--合同
|
||||
|
||||
- [ ] 合同保存校验 , 招租期天数为或者是0 , “无法获取到招租期天数，请重新评估后收房。”
|
||||
- [ ] 编辑页取字段
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119112 【需求】委托合同详情页面关闭修改产品功能
|
||||
|
||||
// *******119112 UPDATE BY LHTH 2026-4-28 START *******
|
||||
// *******119112 UPDATE BY LHTH 2026-4-28 END *******
|
||||
|
||||
{'<'}%-- *******119112 UPDATE BY LHTH 2026-4-28 START *******--%>
|
||||
{'<'}%-- *******119112 UPDATE BY LHTH 2026-4-28 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119570 【需求】数据绩效专员 开通work权限
|
||||
|
||||
// *******119570 UPDATE BY LHTH 2026-4-29 START *******
|
||||
// *******119570 UPDATE BY LHTH 2026-4-29 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
- #### 112
|
||||
|
||||
- [ ] 21:17:33.330 /api/houseKeeper/houseManager/checkContractSign
|
||||
|
||||
- [ ] 21:17:37.648 /api/work/estimate/product/detailEditEstimateProduct
|
||||
|
||||
21:17:44.557 /api/workSeesignWait/getSeeSignWaitInfoCount
|
||||
|
||||
21:17:44.610 /api/houseKeeper/houseManager/applyCfbcxyListPageNum
|
||||
|
||||
21:17:44.678 /api/houseKeeper/houseManager/applyTzsqListPageNum
|
||||
|
||||
21:17:45.443 /api/houseKeeper/houseManager/auditEstimateListPageNum
|
||||
|
||||
- #### 113
|
||||
|
||||
- [ ] 21:17:26.369 /api/houseKeeper/houseManager/unreadMsgCnt
|
||||
|
||||
- [ ] 21:17:31.598 /api/houseKeeper/houseManager/evaluateInofList
|
||||
|
||||
- [ ] 21:17:34.555 /api/houseKeeper/houseManager/productList
|
||||
|
||||
21:17:42.996 /api/houseKeeper/houseManager/getAuditCount
|
||||
|
||||
21:17:44.368 /api/skPlanWaitPay/getremindeSkPlanCount
|
||||
|
||||
/skPlanWaitPay/skPlanWaitPayCount
|
||||
|
||||
21:17:44.534 /api/houseKeeper/houseManager/getRentOrderWbjCount
|
||||
|
||||
21:17:44.697 /api/houseKeeper/houseManager/applyCfjyxyListPageNum
|
||||
|
||||
21:17:45.378 ...
|
||||
|
||||
- #### 114
|
||||
|
||||
21:17:42.677 /api/houseKeeper/houseManager/unreadMsgCnt
|
||||
|
||||
21:17:44.315 ...
|
||||
|
||||
- #### 115
|
||||
|
||||
- [ ] 21:17:26.696 /api/houseKeeper/houseManager/getAuditCount
|
||||
|
||||
- [ ] 21:17:38.629 /api/work/sfContractAppAction/getAuditProcessTracking
|
||||
|
||||
21:17:43.872 /api/houseKeeper/houseManager/appBacklogPage
|
||||
|
||||
21:17:44.507 /api/houseKeeper/houseManager/getQtCount
|
||||
|
||||
21:17:44.874 /api/houseKeeper/houseManager/getCwTotalCount
|
||||
|
||||
21:17:47.369 ...
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
打开首页
|
||||
|
||||
- [x] 21:17:26.369 /api/houseKeeper/houseManager/unreadMsgCnt
|
||||
|
||||
- [x] 21:17:26.696 /api/houseKeeper/houseManager/getAuditCount
|
||||
|
||||
打开列表
|
||||
|
||||
- [x] 21:17:31.598 /api/houseKeeper/houseManager/evaluateInofList
|
||||
|
||||
评估单产品列表
|
||||
|
||||
- [x] 21:17:33.330 /api/houseKeeper/houseManager/checkContractSign
|
||||
|
||||
- [x] 21:17:34.555 /api/houseKeeper/houseManager/productList
|
||||
|
||||
产品详情
|
||||
|
||||
- [x] 21:17:37.648 /api/work/estimate/product/detailEditEstimateProduct
|
||||
|
||||
流程追踪
|
||||
|
||||
- [ ] 21:17:38.629 /api/work/sfContractAppAction/getAuditProcessTracking
|
||||
|
||||
21:17:42.996 /api/houseKeeper/houseManager/getAuditCount
|
||||
|
||||
21:17:42.677 /api/houseKeeper/houseManager/unreadMsgCnt
|
||||
|
||||
|
||||
|
||||
经纪人
|
||||
|
||||
editButtonShow 修改按钮 Y
|
||||
|
||||
seeButtonShow 查看按钮 N
|
||||
|
||||
submitButtonShow 提审按钮 Y
|
||||
|
||||
区域经理
|
||||
|
||||
editButtonShow 修改按钮 N
|
||||
|
||||
seeButtonShow 查看按钮 Y
|
||||
|
||||
submitButtonShow 提审按钮 N
|
||||
|
||||
|
||||
|
||||
默认Y
|
||||
|
||||
非这些 已签约 失效 签约中
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119153 【生产问题】org.hpin.sfManage.service.ContractMainInfoService 后台报异常
|
||||
|
||||
{'<'}%-- *******119153 UPDATE BY LHTH 2026-4-29 START *******--%>
|
||||
{'<'}%-- *******119153 UPDATE BY LHTH 2026-4-29 END *******--%>
|
||||
|
||||
```
|
||||
maxlength=""
|
||||
```
|
||||
|
||||
1234567890
|
||||
|
||||
杭州
|
||||
|
||||
```
|
||||
合同编号 21
|
||||
房源编号 22
|
||||
物业地址 57
|
||||
户型（室）12
|
||||
免租期天数 13
|
||||
委托月租金 18
|
||||
业主姓名 50
|
||||
业主手机号 33
|
||||
业主证件号 47
|
||||
```
|
||||
|
||||
杭州成交管理-委托
|
||||
|
||||
```
|
||||
户型（室）12
|
||||
免租期天数 13
|
||||
委托月租金 18
|
||||
```
|
||||
|
||||
北京
|
||||
|
||||
```
|
||||
合同编号 25
|
||||
房源编号 22
|
||||
业主姓名 45
|
||||
```
|
||||
|
||||
直营
|
||||
|
||||
```
|
||||
合同编号 25
|
||||
房源编号 22
|
||||
业主姓名 31
|
||||
```
|
||||
|
||||
上海
|
||||
|
||||
```
|
||||
合同编号 25
|
||||
房源编号 22
|
||||
业主姓名 38
|
||||
```
|
||||
|
||||
无锡
|
||||
|
||||
```
|
||||
合同编号 25
|
||||
房源编号 22
|
||||
业主姓名 38
|
||||
管家姓名 17
|
||||
```
|
||||
|
||||
非收房
|
||||
|
||||
```
|
||||
合同编号 25
|
||||
房源编号 22
|
||||
业主姓名 50
|
||||
管家姓名天津,南京 22
|
||||
```
|
||||
|
||||
太原
|
||||
|
||||
```
|
||||
合同编号 26
|
||||
房源编号 22
|
||||
业主姓名 38
|
||||
管家姓名 27
|
||||
两书一合同编号 空 AI说一般20 ,所以给30
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
SELECT
|
||||
(select max(length(contractcode)) from wk_sf_contract) AS 合同编号
|
||||
,(select max(length(housecode)) from wk_jc_house_info) AS 房源编号
|
||||
,(select max(length(ownername)) from wk_sf_contract) AS 业主姓名
|
||||
,(select max(length(ownerphoneno)) from wk_sf_contract) AS 业主手机号
|
||||
--,(select max(length(BASERENT)) from wk_sf_contract) AS 杭州委托月租金
|
||||
--,(select max(length(vacantSumDay)) from wk_sf_cycle) AS 杭州免租天数
|
||||
--,(select max(length(CERTIFICATESCODE)) from wk_sf_contract) AS 杭州业主证件号
|
||||
--,(select max(length(adminAddress)) from wk_jc_house_info) AS 杭州物业地址
|
||||
--,(select max(length(fewRoom)) from wk_sf_contract) AS 杭州户型
|
||||
--,(select max(length(username)) from taw_system_user) AS 太原无锡天津南京管家姓名
|
||||
--,(select max(length(SPEC_CODE)) from wk_sf_contract) AS 太原两书一合同编号
|
||||
FROM dual;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119565 【5月初上线】杭州优选上待租时候自动定价以及调价规则调整
|
||||
|
||||
// *******119565 UPDATE BY LHTH 2026-4-30 START *******
|
||||
// *******119565 UPDATE BY LHTH 2026-4-30 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// *******119550 UPDATE BY LHTH 2026-5-7 START *******
|
||||
// *******119550 UPDATE BY LHTH 2026-5-7 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,636 @@
|
||||
---
|
||||
sidebar_position: 5
|
||||
title: 26-5开发笔记
|
||||
---
|
||||
# 笔记5月
|
||||
#### 成都优选规则变更
|
||||
|
||||
- [ ] 部分代码撤回
|
||||
|
||||
- [ ] 首次招租期天数调整 -- 首年是字典 后续在公共方法里
|
||||
|
||||
原 : 首年45 次年45 单次30
|
||||
|
||||
现 : 每次45
|
||||
|
||||
- [ ] 招租保证金调整
|
||||
|
||||
原 : 50% -> 80%(没上线)
|
||||
|
||||
现 : 100%
|
||||
|
||||
- [ ] 租金上下浮动比例调整
|
||||
|
||||
原 : 5%
|
||||
|
||||
现 : 10% 校验提示应该不会弹出
|
||||
|
||||
- [ ] 招租服务费调整 -- 财务
|
||||
|
||||
原 : 含托管招租期
|
||||
|
||||
现 : 不含托管招租期 是招租期不收取费用
|
||||
|
||||
- [ ] 新增600元/年 维修基金
|
||||
- [ ] 固定延长期为3个月
|
||||
- [ ] 提前12个月可以续签 , 到期3个月内可解约
|
||||
|
||||
- [ ] 切割方案 新的打印版本 是要求之前的合同强制换签
|
||||
|
||||
换签 作废 后算新的
|
||||
|
||||
- [ ] 短信模板
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
- [ ] 招租期天数调整 -- 首年是字典 托管在公共方法里
|
||||
- [ ] 招租保证金调整 -- 模板 和 生成时点
|
||||
- [ ] 租金上下浮动比例调整 -- 字典
|
||||
- [ ] 招租服务费调整 --
|
||||
- [ ] 新增600元/年 维修基金 -- 首个承租审核通过
|
||||
- [x] 固定延长期为3个月 -- 页面 work
|
||||
- [x] 提前12个月可以续签 -- 后台判断
|
||||
- [x] X 到期3个月内可解约 -- 解约..
|
||||
- [ ] 招租结束日计算 -- 公共方法
|
||||
|
||||
- [x] 部分代码撤回
|
||||
- [x] X 新合同模板
|
||||
- [x] X 协议相关功能
|
||||
- [x] 切割方式 -- 优选版本
|
||||
- [ ] 短信模板
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
招租保证金生成 : 1.签完委托 2.定时 空置 且 保证金付款 {'<'}= 保证金返还
|
||||
|
||||
保证金删除 : 1. 无缝续签的 2.合同签约通过 , 删非已付款的
|
||||
|
||||
保证金返还 : 1.承租交三金 招租保证金 > 保证金返还 2.这是无缝续签的
|
||||
|
||||
返还房租 : 承租实际结束日{'<'}房租已付日(承租提前解约)
|
||||
|
||||
模拟 :
|
||||
|
||||
签约生成的保证金未付款 -> 承租交三金 -> 付款=返还=0 -> 删除招租保证金 -> 承租解约 -> 空置时点 付款=返还=0 -> 生成保证金
|
||||
|
||||
签约生成的保证金已付款 -> 承租交三金 -> 付款>返还=0 -> 生成保证金返还 -> 承租解约 -> 空置时点 付款=返还 -> 生成保证金
|
||||
|
||||
承租签约
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
普通合同
|
||||
|
||||
- [ ] 服务费
|
||||
- [ ] 固定延长期为3个月 -- 承租签约和签协议的校验
|
||||
- [ ] 提前12个月可以续签 -- 后台增加判断
|
||||
- [ ] 到期3个月内可解约 -- 解约..
|
||||
|
||||
协议相关
|
||||
|
||||
|
||||
|
||||
文档问题+修改点
|
||||
|
||||
模板 协议
|
||||
|
||||
|
||||
|
||||
委托周期 第一年2025.1.1-2025.12.30 第二年 2026.1.1-2026.12.30
|
||||
|
||||
承租2025.12.20解约 剩10天到第二个周期 ,假设还有30天招租期 , 招租截止日大于第一个周期 , 所以招租结束日是2026.1.30
|
||||
|
||||
- [ ] 2025.12.21 签协议增加2天招租期 , 实际修改 第一个周期的招租天数32天 , 招租截止日为2026.1.30 , 待租查询的结果是2026.1.30
|
||||
|
||||
如用承租结束日算 招租截止日为2026.2.1 , 待租查询的结果是2026.2.1
|
||||
|
||||
如用周期开始日算 招租截止日为2026.1.30 , 待租查询的结果是2026.1.30
|
||||
|
||||
- [ ] 2026.1.1 签协议增加2天招租期 , 实际修改 第二个周期的招租天数32天 , 招租截止日为2026.2.1 , 待租查询的结果是2026.1.30
|
||||
|
||||
如用承租结束日算 招租截止日为2026.2.1 , 待租查询的结果是2026.2.1
|
||||
|
||||
如用周期开始日算 招租截止日为2026.2.1 , 待租查询的结果是2026.2.1
|
||||
|
||||
- [ ] 如果以上两种情况都增加了两天的情况 , 招租截止日为2026.2.1 , 待租查询的结果是2026.1.30
|
||||
|
||||
如用承租结束日算 招租截止日为2026.2.1 , 待租查询的结果是2026.2.3
|
||||
|
||||
如用周期开始日算 招租截止日为2026.2.1 , 待租查询的结果是2026.2.1
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
A 当前承租非撤单
|
||||
|
||||
B 当前承租撤单 且 没有其他有效承租 且 没有已付款的付款计划
|
||||
|
||||
注 当前承租撤单 且 没有其他有效承租 且 有已付款的付款计划
|
||||
|
||||
如果 当前承租撤单 且 有其他有效承租呢?
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
resetLetEndDate调用地点
|
||||
|
||||
1. 承租签约完成 改啥?
|
||||
2. 承租解约
|
||||
3. 委托协议
|
||||
4. 因下一份合同无缝续签 委托审核通过,协议更改合同开始日(包括非优选)
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 测试 119450 【6月初上线】【成都需求】相寓优选2.0委托需求
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
委托合同编辑页面-相寓优选2.0延长期、招租天数、最高最低租金浮动比例修改（PC、WORK）
|
||||
|
||||
续签-相寓优选2.0续签规则校验修改（PC、WORK）
|
||||
|
||||
短信通知-相寓优选2.0承租签约、承租解约短信/APP通知修改
|
||||
|
||||
---
|
||||
|
||||
#### 119614 【需求】优选2.0委托合同可提前1年操作续签
|
||||
|
||||
|
||||
|
||||
// *******119614 UPDATE BY LHTH 2026-5-8 START *******
|
||||
// *******119614 UPDATE BY LHTH 2026-5-8 END *******
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119720 【5月初上线】【需求】相寓优选委托续签由提前6个月续签修改为提前9个月续签
|
||||
|
||||
|
||||
|
||||
// *******119720 UPDATE BY LHTH 2026-5-9 START *******
|
||||
// *******119720 UPDATE BY LHTH 2026-5-9 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119450 【6月初上线】【成都需求】相寓优选2.0委托需求
|
||||
|
||||
|
||||
|
||||
// *******119450 UPDATE BY LHTH 2026-5-12 START *******
|
||||
// *******119450 UPDATE BY LHTH 2026-5-12 END *******
|
||||
|
||||
|
||||
|
||||
一二三四五六七八九十
|
||||
|
||||
1234567890
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119752 【6月初上线】【成都需求】相寓优选2.0委托需求-委托补充协议部分
|
||||
|
||||
|
||||
|
||||
// *******119752 UPDATE BY LHTH 2026-5-14 START *******
|
||||
// *******119752 UPDATE BY LHTH 2026-5-14 END *******
|
||||
|
||||
{'<'}%-- *******119752 UPDATE BY LHTH 2026-5-14 START *******--%>
|
||||
{'<'}%-- *******119752 UPDATE BY LHTH 2026-5-14 END *******--%>
|
||||
|
||||
|
||||
|
||||
首次招租期去掉
|
||||
|
||||
```
|
||||
letDaysBefore
|
||||
letDaysAfter
|
||||
```
|
||||
|
||||
托管招租期去掉
|
||||
|
||||
```
|
||||
cycleLetDaysBefore
|
||||
cycleLetDaysAfter
|
||||
```
|
||||
|
||||
下方文案删除
|
||||
|
||||
```
|
||||
yearEffect
|
||||
mmEffect
|
||||
ddEffect
|
||||
```
|
||||
|
||||
|
||||
|
||||
俩按钮取消逻辑 1 o
|
||||
|
||||
首个招租期 更改招租开始日 逻辑 o
|
||||
|
||||
托管天数变更字段 逻辑 o
|
||||
|
||||
首个天数变更字段 逻辑 o
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
####
|
||||
|
||||
#### 旧版成都
|
||||
|
||||
##### 首个招租期变更-增加天数
|
||||
|
||||
```
|
||||
合同LET_DAYS 和 LET_END_DATE
|
||||
```
|
||||
|
||||
##### 托管招租期变更
|
||||
|
||||
```
|
||||
合同LET_DAYS(只在第一年改) 和 周期LET_DAYS 和 LET_END_DATE
|
||||
```
|
||||
|
||||
|
||||
|
||||
#### 新版成都
|
||||
|
||||
##### 首个招租期变更-增加天数
|
||||
|
||||
```
|
||||
LET_END_DATE
|
||||
```
|
||||
|
||||
##### 托管招租期变更
|
||||
|
||||
```
|
||||
LET_END_DATE
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 119934 【广州park】【需求】数据看板新增海山项目
|
||||
|
||||
houseKeeper/queryProjectList
|
||||
|
||||
看板 houseKeeper/queryDataBoardList
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120154 【生产问题】FY1000166590签约问题
|
||||
|
||||
|
||||
|
||||
// *******120154 UPDATE BY LHTH 2026-5-22 START *******
|
||||
// *******120154 UPDATE BY LHTH 2026-5-22 END *******
|
||||
|
||||
|
||||
|
||||
太原20260108-20260310 这段时间有问题
|
||||
|
||||
```sql
|
||||
signatory是1000300370001 1000300370004 1000300370006 1000300370007
|
||||
但是有 AgentPeople AgentCertificateType AgentCertificateNo
|
||||
AgentPhoneNo AgentMail AgentAddress
|
||||
|
||||
select contractcode,createtime，contractstate,CHECKSTATE,agentpeople,agentcertificatetype,agentcertificateno,agent_address,agent_mail,agent_phone_no
|
||||
from wk_sf_contract where signatory in ('1000300370001','1000300370004','1000300370006','1000300370007') and (AgentPeople is not null or AgentPeople is not null or AgentPeople is not null) order by createtime;
|
||||
```
|
||||
|
||||
杭州20260119-现在 这段时间有问题
|
||||
|
||||
```sql
|
||||
signatory是1000300170007 1000300170010
|
||||
|
||||
select contractcode,createtime，contractstate,CHECKSTATE,agentpeople,agentcertificatetype,agentcertificateno,agent_address,agent_mail,agent_phone_no
|
||||
from wk_sf_contract where signatory in ('1000300170007','1000300170010') and (AgentPeople is not null or AgentPeople is not null or AgentPeople is not null) order by createtime;
|
||||
```
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120144 【需求】【26年6月初上线】关于委托提前续签签约周期限制的更改
|
||||
|
||||
|
||||
|
||||
// *******120144 UPDATE BY LHTH 2026-5-26 START *******
|
||||
// *******120144 UPDATE BY LHTH 2026-5-26 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120176 【优化】委托合同产权地址可录入字符调整
|
||||
|
||||
|
||||
|
||||
{'<'}%-- *******120176 UPDATE BY LHTH 2026-5-26 START *******--%>
|
||||
{'<'}%-- *******120176 UPDATE BY LHTH 2026-5-26 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120265 【需求】【收房团队】房源相关功能与相寓+对接
|
||||
|
||||
// *******120265 UPDATE BY LHTH 2026-5-27 START *******
|
||||
// *******120265 UPDATE BY LHTH 2026-5-27 END *******
|
||||
|
||||
{'<'}%-- *******120265 UPDATE BY LHTH 2026-5-27 START *******--%>
|
||||
{'<'}%-- *******120265 UPDATE BY LHTH 2026-5-27 END *******--%>
|
||||
|
||||
|
||||
|
||||
// *******120265 UPDATE BY LHTH 2026-6-11 START *******
|
||||
// *******120265 UPDATE BY LHTH 2026-6-11 END *******
|
||||
|
||||
|
||||
|
||||
- [ ] 推荐列表有work吗?
|
||||
|
||||
- [x] 房源管理菜单关闭
|
||||
|
||||
1. 私盘 公盘 录入 本来就关着 看生产吧
|
||||
2. 华熙有一个菜单列表的判断 , 可以删代码
|
||||
|
||||
- [ ] 推荐列表
|
||||
|
||||
1. 关闭旧推荐列表 , 新建crm推荐列表菜单
|
||||
2. 我记得要刷哪个字段 -- 看飞哥
|
||||
3. 日志表WIWJ_SYNC_HOUSE_LOG -- 谁加?
|
||||
4. 还有个查不到人 去查ehr的 -- 标签给Y
|
||||
|
||||
- [x] 推荐信息查询-运营团队
|
||||
|
||||
关闭旧运营推荐列表 , 新建crm运营推荐列表菜单 --ok
|
||||
|
||||
- [x] CRM对接-推荐房源校验接口（CX01）
|
||||
|
||||
加字典值,再看一下跟AMS的方法一不一样
|
||||
|
||||
- [x] CRM对接-房源联系人推荐信息同步接口（CRM02）
|
||||
|
||||
城市字典值 , 其他不用改
|
||||
|
||||
|
||||
|
||||
##### 委托补充协议签署权限调整
|
||||
|
||||
- [ ] 开通相寓管家录入权限
|
||||
|
||||
- [ ] 修改委托所属人之后 , 走流程看哪里不行
|
||||
- [ ] 之前的上级是否需要关闭?
|
||||
|
||||
|
||||
|
||||
- [x] 101改回104
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120283 【需求】【收房团队】委托补充协议签署权限调整
|
||||
|
||||
|
||||
|
||||
// *******120283 UPDATE BY LHTH 2026-5-29 START *******
|
||||
// *******120283 UPDATE BY LHTH 2026-5-29 END *******
|
||||
|
||||
{'<'}%-- *******120283 UPDATE BY LHTH 2026-5-29 START *******--%>
|
||||
{'<'}%-- *******120283 UPDATE BY LHTH 2026-5-29 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120482 【需求】【26年5月31日替换】相寓优选2.0产品首年、非首年招租期天数调整
|
||||
|
||||
|
||||
|
||||
// *******120482 UPDATE BY LHTH 2026-5-28 START *******
|
||||
// *******120482 UPDATE BY LHTH 2026-5-28 END *******
|
||||
|
||||
{'<'}%-- *******120482 UPDATE BY LHTH 2026-5-28 START *******--%>
|
||||
{'<'}%-- *******120482 UPDATE BY LHTH 2026-5-28 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
##### work
|
||||
|
||||
初始化: 大于30天的 小于5000租金 给30
|
||||
|
||||
下拉列表: 是优选且租金不为空(和0) 小于5000给30 小于8000给30,45 大于8000给30,45,60
|
||||
|
||||
最大租金: 小于5000给30 小于8000给30,45 大于8000给30,45,60
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
1002000050001
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
##### 带显卡
|
||||
|
||||
主板+cpu : i3-12100F 或者 i5-12400F 或者 r5-5600 带wifi的1300元左右
|
||||
显卡 : 6500XT 900-1000元
|
||||
内存 : 8g*2 600元左右
|
||||
固态 : 512g 500元左右
|
||||
电源 : 500w 200元左右
|
||||
散热 : 百元内
|
||||
机箱 : 百元
|
||||
总计 : 3700
|
||||
|
||||
|
||||
|
||||
##### 不带显卡
|
||||
|
||||
主板+cpu : i3-12100 或者 r5-5600G 带wifi的1400元左右
|
||||
内存 : 8g*2 600元左右
|
||||
固态 : 512g 500元左右
|
||||
电源 : 300w 100-200元
|
||||
散热 : 百元内
|
||||
机箱 : 百元
|
||||
合计 : 2900
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Websocket is already in CLOSING or CLOsED state. 关闭后还在发消息
|
||||
|
||||
Uncaught InvalidstateError: Failed to execute 'send' on 'WebSocket':Still in CONNECTING state. 正在连接中就发送消息
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
100:初始化列表
|
||||
绑定用户信息->给所有用户发自己上线的信息(未脱敏)->修改登录状态->重置会员信息->查询发送者是自己的聊天记录,查询接收者是自己的聊天记录->合并两个聊天记录并排序(500条以上不排)->查所有未读的聊天记录->返回聊天列表和未读数量
|
||||
0:修改未读消息为已读
|
||||
1:发消息
|
||||
3:获取历史消息->无创建时间查最后10条->有创建时间按时间往上查10条
|
||||
4:陌生人查询 删掉了
|
||||
5:删除联系人->物理删除这俩人的聊天记录
|
||||
6:退出登录->修改自己为已离线 close_status=1 is_online=0
|
||||
20:管理员修改用户信息
|
||||
99886:修改为隐身
|
||||
99885:修改为上线
|
||||
99881:心跳
|
||||
客户端断开
|
||||
|
||||
|
||||
|
||||
100:
|
||||
->10 查不到人
|
||||
->4 给所有人发上线通知
|
||||
->0 给自己的聊天列表和未读数量
|
||||
1:
|
||||
->7 余额不足
|
||||
->1 消息发给自己
|
||||
->1 消息发给别人
|
||||
3:
|
||||
->3 给自己历史消息
|
||||
4:
|
||||
->5 不知道删掉了
|
||||
5:
|
||||
->6 删除聊天记录成功信息
|
||||
6:
|
||||
->4 给所有人发离线通知
|
||||
20:
|
||||
->20 给用户发送他的信息,成功后需要给管理员传回信息
|
||||
99886:
|
||||
->4 给所有人发离线通知
|
||||
99885:
|
||||
->4 给所有人发上线通知
|
||||
99881:
|
||||
->99881 心跳
|
||||
客户端断开:
|
||||
->4 给所有人发上线/离线通知
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,621 @@
|
||||
---
|
||||
sidebar_position: 6
|
||||
title: 26-6开发笔记
|
||||
---
|
||||
# 笔记6月
|
||||
|
||||
#### 120631 【收房团队】AMS和CBS接口调整
|
||||
|
||||
// *******120631 UPDATE BY LHTH 2026-6-2 START *******
|
||||
// *******120631 UPDATE BY LHTH 2026-6-2 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
####
|
||||
|
||||
---
|
||||
|
||||
#### 119075 【生产问题】XW10458541审核通过，付款计划状态还是待审核--重复提交校验
|
||||
|
||||
// *******119075 UPDATE BY LHTH 2026-6-5 START *******
|
||||
// *******119075 UPDATE BY LHTH 2026-6-5 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
{'<'}%-- *******120631 UPDATE BY LHTH 2026-6-4 START *******--%>
|
||||
{'<'}%-- *******120631 UPDATE BY LHTH 2026-6-4 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
```
|
||||
cropay.com
|
||||
paypal.com
|
||||
baypay.com
|
||||
ipasspay.biz
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120862 【收房团队】委托产品取得方式调整
|
||||
|
||||
// *******120862 UPDATE BY LHTH 2026-6-9 START *******
|
||||
// *******120862 UPDATE BY LHTH 2026-6-9 END *******
|
||||
|
||||
{'<'}%-- *******120862 UPDATE BY LHTH 2026-6-9 START *******--%>
|
||||
{'<'}%-- *******120862 UPDATE BY LHTH 2026-6-9 END *******--%>
|
||||
|
||||
```
|
||||
EstimateProductRel
|
||||
WIWJ_ESTIMATE_PRODUCT_REL
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 合同pdf下载 /mobileAPI/v4_0/owner/contracts/contractViewPage
|
||||
|
||||
```
|
||||
isShowButton
|
||||
{电子签}且{财务待审核 或 审核已通过}
|
||||
```
|
||||
|
||||
协议pdf下载 /mobileAPI/v4_0/agreement/agreementList
|
||||
|
||||
```
|
||||
showDownBtn
|
||||
{电子签}且{财务审核已通过}
|
||||
```
|
||||
|
||||
交割单pdf下载 /mobileAPI/v4_0/property/isShowUpLoadButton
|
||||
|
||||
```
|
||||
Y/N
|
||||
上海: {审核已通过}
|
||||
杭州: {审核已通过}且{来源非AIHOME}
|
||||
```
|
||||
|
||||
解约pdf下载 /mobileAPI/v4_0/owner/contracts/contractViewPage
|
||||
|
||||
```
|
||||
downloadButton
|
||||
{电子签}且{审核已通过}
|
||||
```
|
||||
|
||||
pdf下载时点
|
||||
合同: 财务待审核 或 审核已通过
|
||||
协议: 财务审核已通过
|
||||
交割单: 审核已通过
|
||||
解约: 审核已通过
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120883 【需求】告知催缴中台是否为优选合同
|
||||
|
||||
|
||||
|
||||
```sql
|
||||
create or replace FUNCTION IS_CONTRACT_XYYX (
|
||||
p_city_code IN VARCHAR2,
|
||||
p_ams_contract_id IN NUMBER
|
||||
) RETURN VARCHAR2 --120883 LHTH 2026-6-9 add
|
||||
IS
|
||||
v_result VARCHAR2(1) := 'N';
|
||||
v_product_id VARCHAR2(50);
|
||||
BEGIN
|
||||
BEGIN
|
||||
SELECT CASE
|
||||
WHEN p_city_code = 'beijing' THEN
|
||||
(SELECT epr.PRODUCT_ID FROM bjtest1.WIWJ_ESTIMATE_PRODUCT_REL epr, wk_sf_contract sf
|
||||
WHERE epr.id = sf.product_code AND sf.CITY_ID = p_city_code AND sf.AMS_ID = p_ams_contract_id AND ROWNUM = 1)
|
||||
WHEN p_city_code = 'taiyuan' THEN
|
||||
(SELECT epr.PRODUCT_ID FROM tycs.WIWJ_ESTIMATE_PRODUCT_REL epr, wk_sf_contract sf
|
||||
WHERE epr.id = sf.product_code AND sf.CITY_ID = p_city_code AND sf.AMS_ID = p_ams_contract_id AND ROWNUM = 1)
|
||||
WHEN p_city_code = 'hangzhou' THEN
|
||||
(SELECT sf.product_id FROM wk_sf_contract sf WHERE sf.CITY_ID = p_city_code AND sf.AMS_ID = p_ams_contract_id AND ROWNUM = 1)
|
||||
WHEN p_city_code IN ('chengdu2', 'wuhan2', 'shanghai', 'suzhou', 'nanjing', 'tianjin', 'zhengzhou') THEN
|
||||
(SELECT sf.product_item FROM wk_sf_contract sf WHERE sf.CITY_ID = p_city_code AND sf.AMS_ID = p_ams_contract_id AND ROWNUM = 1)
|
||||
END INTO v_product_id
|
||||
FROM DUAL;
|
||||
EXCEPTION
|
||||
WHEN NO_DATA_FOUND THEN
|
||||
v_product_id := NULL;
|
||||
END;
|
||||
|
||||
v_result := CASE
|
||||
WHEN p_city_code = 'taiyuan' AND v_product_id = 'PRODUCT_000007' THEN 'Y'
|
||||
WHEN p_city_code = 'beijing' AND v_product_id = 'PRODUCT_000068' THEN 'Y'
|
||||
WHEN p_city_code = 'hangzhou' AND v_product_id = 'PRODUCT_000075' THEN 'Y'
|
||||
WHEN p_city_code IN ('chengdu2', 'wuhan2') AND v_product_id = 'PRODUCT_000004' THEN 'Y'
|
||||
WHEN p_city_code IN ('shanghai', 'suzhou', 'nanjing', 'tianjin', 'zhengzhou')
|
||||
AND v_product_id IN ('1000100590010', '1000100590009') THEN 'Y'
|
||||
ELSE 'N'
|
||||
END;
|
||||
|
||||
RETURN v_result;
|
||||
END;
|
||||
|
||||
-----------------------------------------------------------------------
|
||||
select CITY_ID,count(0) from wk_sf_contract group by CITY_ID;
|
||||
select * from WIWJ_ESTIMATE_PRODUCT_REL;
|
||||
select * from wk_sf_contract where product_item is not null;
|
||||
-----------------------------------------------------------------------
|
||||
```
|
||||
|
||||
```
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('beijing','PRODUCT_000068');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('hangzhou','PRODUCT_000075');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('taiyuan','PRODUCT_000007');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('chengdu2','PRODUCT_000004');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('wuhan2','PRODUCT_000004');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('shanghai','1000100590009');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('shanghai','1000100590010');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('suzhou','1000100590010');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('nanjing','1000100590010');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('tianjin','1000100590009');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('tianjin','1000100590010');
|
||||
INSERT INTO COM_CONTRACT_XYYX_CONFIG VALUES('zhengzhou','1000100590010');
|
||||
```
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120493 【需求】因无纸化签约合规要求， 无纸化签约相关的修改
|
||||
|
||||
// *******120493 UPDATE BY LHTH 2026-6-13 START *******
|
||||
// *******120493 UPDATE BY LHTH 2026-6-13 END *******
|
||||
|
||||
- [x] 实名认证相关--承租
|
||||
- [ ] 签字前一页判断 : 实名认证跳转
|
||||
- [ ] 签字前一页判断 : 实名认证信息是否与合同内容一致 一致则刷脸 ,不一致提示且返回列表页
|
||||
- [ ] 签字前一页判断 : 非身份证/永久留居身份证/港澳台往来内地通行证 不可电子签,提示“当前证件类型不支持电子签，如需继续签署，请联系您的管家”， 页面停留在当前页面。
|
||||
|
||||
---
|
||||
|
||||
#### 120772 【合规性】所有使用电子签名及盖章的地方改用e签宝服务
|
||||
|
||||
// *******120772 UPDATE BY LHTH 2026-6-13 START *******
|
||||
// *******120772 UPDATE BY LHTH 2026-6-13 END *******
|
||||
|
||||
- [x] 签字最顶部校验 用户id -- 协议有
|
||||
|
||||
- [x] 签字和签章顺序调换
|
||||
|
||||
- [x] 签字修改为用最新的方法
|
||||
|
||||
- [x] 要catch异常
|
||||
|
||||
- [x] 大字11,白字8, 有横线的 比如框是20 那就比框高2 , 框是17,就比框高5
|
||||
|
||||
- [x] 大字11,白字8, 无横线的 白字最左下角在大字的中间就行
|
||||
|
||||
- [ ] 改过思源字体的 需要用思源的白字
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
前置 : app中台 一次性sql插入(一个是用户表id,222是固定的)
|
||||
|
||||
```sql
|
||||
insert into XY_CUSTOMER_FLOW_REL (ID, CUSTOMER_ID, FLOW_ID, CREATE_TIME, LAST_MODIFY_TIME)
|
||||
values (SEQ_CUSTOMER_FLOW_REL.NEXTVAL, '1301', '222', null, null);
|
||||
|
||||
insert into XY_CUSTOMER_FLOW_REL (ID, CUSTOMER_ID, FLOW_ID, CREATE_TIME, LAST_MODIFY_TIME)
|
||||
values (SEQ_CUSTOMER_FLOW_REL.NEXTVAL, '23545', '222', null, null);
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### 上线顺序：北京、杭州、上海、苏州、天津、南京、郑州、太原、无锡、成都直营、武汉直营、广州直营、广州PARK
|
||||
|
||||
|
||||
|
||||
##### 杭州测试协议
|
||||
|
||||
```properties
|
||||
收款账户变更协议
|
||||
收款账户变更协议新版
|
||||
委托和解协议
|
||||
委托和解协议新版
|
||||
租赁房屋空气质量承诺书
|
||||
《杭州相寓资产管理服务合同》补充协议
|
||||
《杭州相寓资产管理服务合同》补充协议新版
|
||||
《杭州相寓资产管理服务合同》补充协议相寓优选
|
||||
《杭州相寓资产管理服务合同》补充协议相寓优选新版
|
||||
```
|
||||
|
||||
##### 上海测试协议
|
||||
|
||||
```properties
|
||||
收款账户变更协议
|
||||
《上海相寓资产管理服务合同》补充协议
|
||||
相寓业主解约通知书--只有业主
|
||||
```
|
||||
|
||||
##### 天津
|
||||
|
||||
```properties
|
||||
收款账户变更协议
|
||||
《相寓资产管理服务合同》补充协议 1.1.1/1.2.1
|
||||
《相寓资产管理服务合同》补充协议 新版
|
||||
```
|
||||
|
||||
##### 南京
|
||||
|
||||
```properties
|
||||
收款账户变更协议
|
||||
《相寓资产管理服务合同》补充协议
|
||||
委托和解协议
|
||||
```
|
||||
|
||||
##### 郑州
|
||||
|
||||
```properties
|
||||
收款账户变更协议 历史v2
|
||||
《相寓资产管理服务合同》补充协议
|
||||
```
|
||||
|
||||
##### 苏州
|
||||
|
||||
```properties
|
||||
收款账户变更协议
|
||||
《相寓资产管理服务合同》补充协议 优选
|
||||
《相寓资产管理服务合同》补充协议 非优选
|
||||
```
|
||||
|
||||
##### 太原
|
||||
|
||||
```properties
|
||||
收款账户变更协议
|
||||
《相寓资产管理服务合同》补充协议 优选
|
||||
《相寓资产管理服务合同》补充协议 非优选
|
||||
```
|
||||
|
||||
##### 无锡
|
||||
|
||||
```properties
|
||||
收款账户变更协议
|
||||
变更补充协议
|
||||
相寓空置期租金免除补充协议
|
||||
```
|
||||
|
||||
##### 成都直营
|
||||
|
||||
```properties
|
||||
收款账户变更协议
|
||||
《相寓资产管理服务合同》补充协议 优选
|
||||
《相寓资产管理服务合同》补充协议 非优选
|
||||
相寓疫情防控期间租金支付补充协议
|
||||
```
|
||||
|
||||
##### 广州直营
|
||||
|
||||
```properties
|
||||
收款账户变更协议
|
||||
《相寓资产管理服务合同》补充协议
|
||||
相寓疫情防控期间租金支付补充协议
|
||||
```
|
||||
|
||||
##### 武汉直营
|
||||
|
||||
```properties
|
||||
收款账户变更协议
|
||||
《相寓资产管理服务合同》补充协议 优选
|
||||
《相寓资产管理服务合同》补充协议 非优选
|
||||
```
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120265 【需求】【收房团队】房源相关功能与相寓+对接
|
||||
|
||||
|
||||
|
||||
// *******120265 UPDATE BY LHTH 2026-6-15 START *******
|
||||
// *******120265 UPDATE BY LHTH 2026-6-15 END *******
|
||||
|
||||
|
||||
|
||||
房源: 只有房源编号
|
||||
|
||||
小区: 只填小区
|
||||
|
||||
楼栋: 填小区和buildhouseid
|
||||
|
||||
|
||||
|
||||
传房源过来
|
||||
|
||||
---
|
||||
|
||||
#### 121140 【相寓app】【委托合同列表】港澳台已经认证的委托合同，对应的认证信息是三种类型的任意一种没有自动绑定到委托合同列表去展示出来
|
||||
|
||||
|
||||
|
||||
// *******121140 UPDATE BY LHTH 2026-6-16 START *******
|
||||
// *******121140 UPDATE BY LHTH 2026-6-16 END *******
|
||||
|
||||
```
|
||||
合同:
|
||||
1013304
|
||||
|
||||
实名认证:
|
||||
1013397
|
||||
1013398
|
||||
1013399
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
写用例注意
|
||||
|
||||
护照不能电子签了
|
||||
|
||||
pc+work互相提审, 一级和二级页面校验,按钮重复点击
|
||||
|
||||
收房审批 注意驳回后增量和减量后 审批页展示(work+ams)
|
||||
|
||||
每次驳回注意新表的存值
|
||||
|
||||
委托数据对比 work和ams单独提交的情况,各种节点都要看
|
||||
|
||||
附件要代入这里的附件,共有人的情况 只给业主带 , 旧合同以及打印完成未生成附件的情况下 附件不能代入
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
VIEW_CF_CONTRACT_USER_REL_
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
令某
|
||||
|
||||
男
|
||||
|
||||
汉
|
||||
|
||||
1985/07/12
|
||||
|
||||
北京市昌平区
|
||||
|
||||
110101198507123456
|
||||
|
||||
北京市昌平区公安局
|
||||
|
||||
2020.01.01-2030.01.01
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120687 【生产问题】org.common.core.web.ErrorInterceptor 后台报异常（- ORA-12899: value too large for column "HANGZHOUNEW"."WIWJ_AGREEMENT_DETAIL_INFO"."VALUE" (actual: 3785, maximum: 1000)）
|
||||
|
||||
// *******120687 UPDATE BY LHTH 2026-6-18 START *******
|
||||
// *******120687 UPDATE BY LHTH 2026-6-18 END *******
|
||||
|
||||
{'<'}%-- *******120687 UPDATE BY LHTH 2026-6-18 START *******--%>
|
||||
{'<'}%-- *******120687 UPDATE BY LHTH 2026-6-18 END *******--%>
|
||||
|
||||
|
||||
|
||||
- [x] 现委托人：30汉字
|
||||
- [x] 产权人变更为：30汉字
|
||||
- [x] 储蓄卡开户人：30汉字
|
||||
- [x] 证件编号：30数字
|
||||
- [x] 证件号码：30数字
|
||||
- [x] 储蓄卡账号：30数字
|
||||
- [x] 乙方通讯地址：60汉字
|
||||
- [x] 产权地址变更为：60汉字
|
||||
|
||||
```
|
||||
aaaaaaaaaabbbbbbbbbbcccccccccod
|
||||
aaaaaaaaaabbbbbbbbbbccccccccco
|
||||
aaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbcccccccccoaaaaaaaaaabbbbbbbbbbccccccccco
|
||||
```
|
||||
|
||||
旧版有个邮编
|
||||
|
||||
乙方联系电话：（座机） -- 30
|
||||
|
||||
（其他联系电话） -- 30
|
||||
|
||||
```
|
||||
9999999.99
|
||||
手机是11
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 121258 【南京测试】分租的递增合同里递增协议少个签章
|
||||
|
||||
|
||||
|
||||
// *******121258 UPDATE BY LHTH 2026-6-20 START *******
|
||||
// *******121258 UPDATE BY LHTH 2026-6-20 END *******
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 121256 【优化】委托合同录入判断续签条件优化
|
||||
|
||||
// *******121256 UPDATE BY LHTH 2026-6-22 START *******
|
||||
// *******121256 UPDATE BY LHTH 2026-6-22 END *******
|
||||
|
||||
|
||||
|
||||
##### 优选续直选
|
||||
|
||||
优选是续签 : 评估为续签 , 校验
|
||||
|
||||
优选是新签且有价格周期 : 评估为续签 , 校验
|
||||
|
||||
优选是新签且无价格周期 : 评估为新签 , 不校验
|
||||
|
||||
##### 优选续优选
|
||||
|
||||
走原需求逻辑
|
||||
|
||||
##### 直选续直选
|
||||
|
||||
走原逻辑
|
||||
|
||||
|
||||
|
||||
评估单新签
|
||||
|
||||
业主续共有人 , 业主信息不一致 , 业主跟第二份共有人信息一致
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#### 优选续非优选 / 非优选续非优选
|
||||
|
||||
评估单选择新签 -> 校验1-5判断合同为新签 -> 正常签约
|
||||
|
||||
评估单选择新签 -> 校验1-5判断合同为续签 -> 提示校验内容,卡流程
|
||||
|
||||
评估单选择续签 -> 校验1-3判断合同为新签 -> 正常签约
|
||||
|
||||
评估单选择续签 -> 校验1-3判断合同为续签 -> 正常签约
|
||||
|
||||
#### 优选续优选
|
||||
|
||||
评估单不能选择新续签 ->
|
||||
|
||||
|
||||
|
||||
AMS保存/打印/推送APP -> 先校验后保存 -> 没保存上
|
||||
|
||||
work保存/推送APP -> 先保存, 被校验住抛异常, 事务回滚 -> 没保存上
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120933 【需求】精装相寓产品开通委托合同补充协议录入
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120948 【需求】《上海相寓资产管理服务合同》协议审批流变更
|
||||
|
||||
// *******120948 UPDATE BY LHTH 2026-6-29 START *******
|
||||
// *******120948 UPDATE BY LHTH 2026-6-29 END *******
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120449 【需求】关于AMS系统去掉管家管辖范围逻辑的需求
|
||||
|
||||
|
||||
|
||||
// *******120449 UPDATE BY LHTH 2026-6-30 START *******
|
||||
// *******120449 UPDATE BY LHTH 2026-6-30 END *******
|
||||
|
||||
{'<'}%-- *******120449 UPDATE BY LHTH 2026-6-30 START *******--%>
|
||||
{'<'}%-- *******120449 UPDATE BY LHTH 2026-6-30 END *******--%>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,663 @@
|
||||
---
|
||||
sidebar_position: 7
|
||||
---
|
||||
|
||||
# 笔记7月
|
||||
|
||||
|
||||
|
||||
啊
|
||||
|
||||
#### 120538 【生产问题】YW10482086录不了《杭州相寓资产管理服务合同》补充协议
|
||||
|
||||
```
|
||||
// *******120538 UPDATE BY LHTH 2026-7-1 START *******
|
||||
// *******120538 UPDATE BY LHTH 2026-7-1 END *******
|
||||
|
||||
<%-- *******120538 UPDATE BY LHTH 2026-7-1 START *******--%>
|
||||
<%-- *******120538 UPDATE BY LHTH 2026-7-1 END *******--%>
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120611 【成都】普通相寓合同规则调整
|
||||
|
||||
```
|
||||
// *******120611 UPDATE BY LHTH 2026-7-2 START *******
|
||||
// *******120611 UPDATE BY LHTH 2026-7-2 END *******
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
第一页不改
|
||||
|
||||
- [x] 内容全改
|
||||
|
||||
附件一不改
|
||||
|
||||
- [x] 附件二改
|
||||
|
||||
附件三不改
|
||||
|
||||
附件四不改
|
||||
|
||||
- [ ] 附件五改
|
||||
|
||||
附件六不改
|
||||
|
||||
- [ ] 附件七改
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 120859 【需求】相寓优选产品托管招租期不收取资产管理费
|
||||
|
||||
```
|
||||
// *******120859 UPDATE BY LHTH 2026-7-6 START *******
|
||||
// *******120859 UPDATE BY LHTH 2026-7-6 END *******
|
||||
|
||||
<%-- *******120859 UPDATE BY LHTH 2026-7-6 START *******--%>
|
||||
<%-- *******120859 UPDATE BY LHTH 2026-7-6 END *******--%>
|
||||
```
|
||||
|
||||
|
||||
|
||||
```
|
||||
// *******121517 UPDATE BY LHTH 2026-7-7 START *******
|
||||
// *******121517 UPDATE BY LHTH 2026-7-7 END *******
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 121626 【成都直营】【需求】优选委托补充协议可签署时点变更，同杭州需求120538
|
||||
|
||||
```
|
||||
// *******121626 UPDATE BY LHTH 2026-7-7 START *******
|
||||
// *******121626 UPDATE BY LHTH 2026-7-7 END *******
|
||||
```
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 121355 采暖费测试
|
||||
|
||||
|
||||
|
||||
还得新旧都测
|
||||
|
||||
/houseManage/housePrivate!showEvaluateEstimateLogTab.action?cbsHouseCode=547114825&buildingHouseId=75906969
|
||||
|
||||
原
|
||||
|
||||
```
|
||||
1.物业费
|
||||
同付款计划一起生成
|
||||
合同1: 2026-7-1 - 2026-7-31
|
||||
合同2: 2026-8-10 - 2026-9-9
|
||||
物业费1: 2026-7-1 - 2026-7-31
|
||||
物业费2: 2026-8-1 - 2026-9-9
|
||||
2.采暖费
|
||||
同付款计划一起生成
|
||||
预计付款日1:开始日在采暖季 用首期房租预计付款日
|
||||
预计付款日2:招租期期间有采暖费
|
||||
固定付款日3:承租每个月周期的开始日
|
||||
```
|
||||
|
||||
现
|
||||
|
||||
```
|
||||
1.物业费
|
||||
同付款计划一起生成
|
||||
合同1: 2026-7-1 - 2026-7-31
|
||||
合同2: 2026-8-10 - 2026-9-9
|
||||
物业费1: 2026-7-1 - 2026-7-31
|
||||
物业费2: 2026-8-10 - 2026-9-9
|
||||
2.采暖费
|
||||
同付款计划一起生成
|
||||
```
|
||||
|
||||
|
||||
|
||||
解约删除未付款的付款单, 如果承租实际结束日在这条付款计划的中间 也得删
|
||||
|
||||
且 承租编号=当前解约的承租
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 121707 【需求】【全国】相寓优选2.0增加手动操作招租失败权限
|
||||
|
||||
```
|
||||
// *******121707 UPDATE BY LHTH 2026-7-14 START *******
|
||||
// *******121707 UPDATE BY LHTH 2026-7-14 END *******
|
||||
```
|
||||
|
||||
```
|
||||
<%-- *******121707 UPDATE BY LHTH 2026-7-14 START *******--%>
|
||||
<%-- *******121707 UPDATE BY LHTH 2026-7-14 END *******--%>
|
||||
```
|
||||
|
||||
|
||||
|
||||
1. 确认招租失败 按钮 , 经纪人 , 经纪人上级 -- 按钮,菜单
|
||||
|
||||
2. 非解约中 且 招租失败标签 且 招租截止日小于委托实际结束日 √
|
||||
|
||||
--非解约中 √
|
||||
|
||||
--招租截止日\<委托实际结束日 √
|
||||
|
||||
----优选2 √
|
||||
|
||||
----招租截止日有值 √
|
||||
|
||||
----当前日期>招租截止日 √
|
||||
|
||||
----不存在承租实际结束日>当前日期 的非撤单 且 非作废 且 提交过风控审核 的承租合同 √
|
||||
|
||||
----非已解约,非已续约 √
|
||||
|
||||
```
|
||||
“招租失败”标签显示，符合下述所有条件时显示:
|
||||
1）委托合同产品为“相寓优选2.0”
|
||||
2）招租截止日有值且当前日期>招租期截止日
|
||||
3）不存在承租实际结束日>当前日期的有效承租
|
||||
注：有效承租合同：非撤单且非作废且提交过风控审核的承租合同
|
||||
4）委托合同状态非已解约、已续约
|
||||
```
|
||||
|
||||
3. 点击后触发招租失败定时任务处理 , 排除a条件 , 筛选合同是自己 -- 旧方法 √
|
||||
|
||||
4. “操作成功，委托合同实际结束日已变更。” , “操作失败，失败原因为\{获取失败原因，如果为多个使用;分开}” --新action方法
|
||||
|
||||
5. 部分城市告知cbs -- 北京有,杭州有,太原有,南京苏州天津有 郑州无,直营无?
|
||||
|
||||
6. 成功后写合同履历 "手动操作招租失败，委托合同实际结束日已变更" -- 履历 √
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
太原:《相寓资产管理服务合同》补充协议 {收房维护人 , 租赁区副总监}
|
||||
|
||||
南京:《南京相寓资产管理服务合同》补充协议 {相寓主管 , 相寓区域经理}
|
||||
|
||||
苏州:《苏州相寓资产管理服务合同》补充协议 {相寓主管 , 相寓经理}
|
||||
|
||||
天津:《天津相寓资产管理服务合同》补充协议 {相寓主管 , 相寓区域经理}
|
||||
|
||||
郑州:《郑州相寓资产管理服务合同》补充协议 {经纪人 , 店经理}
|
||||
|
||||
北京:《北京相寓资产管理服务合同》补充协议 {经纪人 , 商圈经理}
|
||||
|
||||
杭州:《杭州相寓资产管理服务合同》补充协议 {租赁经纪人 , 业务主任}
|
||||
|
||||
武汉直营:《武汉相寓资产管理服务合同》补充协议 {综合管家 , 业务经理}
|
||||
|
||||
成都直营:《成都相寓资产管理服务合同》补充协议 {资源经理(原经纪人) , 区域经理(原店经理)}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 121485 【需求】委托黑名单流程优化
|
||||
|
||||
```
|
||||
// *******121485 UPDATE BY LHTH 2026-7-16 START *******
|
||||
// *******121485 UPDATE BY LHTH 2026-7-16 END *******
|
||||
```
|
||||
|
||||
```
|
||||
<%-- *******121485 UPDATE BY LHTH 2026-7-16 START *******--%>
|
||||
<%-- *******121485 UPDATE BY LHTH 2026-7-16 END *******--%>
|
||||
```
|
||||
|
||||
listContractBlackInfo 列表
|
||||
|
||||
invalidBlackInfo.jsp 列表无效 HouseInfoAction.saveInvalidBlack
|
||||
|
||||
addWTBlackPage.jsp 列表新增 HouseInfoAction.saveBlackInfo
|
||||
|
||||
wtBlackApplyPage.jsp 加入/解除 申请(work只有申请) HouseInfoAction.commitBlackApply
|
||||
|
||||
驳回后修改页是哪个?
|
||||
|
||||
|
||||
|
||||
申请类型 1:新增;2:解除
|
||||
|
||||
屏蔽类型 1:房源;2:楼栋;3:小区 4承租
|
||||
|
||||
- [x] 加入黑名单审批流变更
|
||||
- [x] 看生产页面分配给谁了 /basicsdate/houseInfo!listContractBlackInfo.action
|
||||
- [x] 列表数据展示范围 : 要开给管家和经理 , 可以查看自己提交的数据
|
||||
- [x] 看申请页权限分配给谁了 /basicsdate/houseInfo!wtBlackApplyPage.action?operateKbn=I
|
||||
- [x] 申请页面 管家只能屏蔽房源 , 经理只能屏蔽小区和楼栋
|
||||
- [x] 申请校验 管家时 判断是否在管辖范围内
|
||||
|
||||
表
|
||||
|
||||
WTBLACKLIST
|
||||
|
||||
WIWJ_SF_BLACK_APPLY
|
||||
|
||||
|
||||
|
||||
默认有效数据查询时间 : 2132 ms
|
||||
|
||||
填写申请人查询时间 : 17503ms
|
||||
|
||||
填写申请人查询时间(修改后) : 17733 ms
|
||||
|
||||
|
||||
|
||||
sql:
|
||||
|
||||
黑名单关联房源可查出 房源,小区,楼号
|
||||
|
||||
黑名单关联楼栋可查出 小区,楼号
|
||||
|
||||
黑名单关联小区可查出 小区
|
||||
|
||||
|
||||
|
||||
页面查询:
|
||||
|
||||
小区>楼号>房源
|
||||
|
||||
小区要筛选房源,小区,楼号
|
||||
|
||||
楼栋要筛选房源,楼号
|
||||
|
||||
房源要筛选房源
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
添加的话 用UpdateUser 解除也看 : 关联WIWJ_SF_BLACK_APPLY
|
||||
|
||||
- [ ] 可以提交新增和解除 , 如果别人新增了 , 我解除了 , 是不是我俩都能看到 ,
|
||||
- [ ] 现状审核完成后直接把审核人存进了黑名单的保存人 , 旧数据也要看的话 得刷数据
|
||||
|
||||
- [x] 这个页面的三个按钮: 新增,查看,无效 -- 全去掉
|
||||
|
||||
- [x] 屏蔽类型 加入要限制 , 解除也要限制
|
||||
|
||||
- [ ] 批处理是否会卡
|
||||
|
||||
|
||||
|
||||
##### 本地:
|
||||
|
||||
typora修改文件 -> Docusaurus热加载 -> 最新页面(git手动/自动提交)
|
||||
|
||||
Decap修改文件 -> Docusaurus热加载 -> 最新页面(git手动/自动提交)
|
||||
|
||||
##### 云端
|
||||
|
||||
Decap修改文件 -> Docusaurus热加载/build -> 最新页面(git手动/自动提交)
|
||||
|
||||
Decap提交git -> git回调Docusaurus -> Docusaurus热加载/build -> 最新页面
|
||||
|
||||
|
||||
|
||||
```sql
|
||||
select wb.id,decode(wb.housecode,null,decode(wb.bid,null,'小区','楼栋'),'房源') blackType,
|
||||
decode(wb.housecode,null,decode(wb.bid,null,pi3.projectname,tp2.projectname),tp.projectname) proname,
|
||||
decode(wb.housecode,null,decode(wb.bid,null,'',tp2.bname),tp.hbname) bname,
|
||||
wb.housecode,
|
||||
describe,
|
||||
decode(isvalid,'Y','有效','无效') isvalid,tp.houseid,
|
||||
ADD_REASON
|
||||
from WTBLACKLIST wb
|
||||
left join (select hi.id houseid, hi.housecode,pi.projectname,pi.id hpid,bi.name hbname,bi.id hbid
|
||||
from wk_jc_house_info hi
|
||||
left join wk_jc_building_house bh on to_char(bh.id)=hi.buildinghouseid
|
||||
left join wk_jc_building_info bi on bi.id = bh.bid
|
||||
left join wk_jc_project_info pi on pi.id = hi.projectinfoid
|
||||
) tp on tp.housecode = wb.housecode
|
||||
left join (
|
||||
select bi2.id bbid,bi2.name bname,pi2.id bpid,pi2.projectname
|
||||
from wk_jc_building_info bi2
|
||||
left join wk_jc_project_info pi2 on pi2.id = bi2.sid
|
||||
) tp2 on tp2.bbid=wb.bid
|
||||
left join wk_jc_project_info pi3 on pi3.id = wb.projectinfoid
|
||||
where 1=1
|
||||
```
|
||||
|
||||
```
|
||||
--错误示例
|
||||
" SELECT"
|
||||
" wb.id, wb.housecode, wb.describe, wb.add_reason,"
|
||||
" CASE WHEN wb.housecode IS NOT NULL THEN '房源' WHEN wb.bid IS NOT NULL THEN '楼栋' WHEN wb.projectinfoid IS NOT NULL THEN '小区' ELSE '' END AS blacktype,"
|
||||
" CASE WHEN wb.housecode IS NOT NULL THEN pi.projectname WHEN wb.bid IS NOT NULL THEN pi2.projectname WHEN wb.projectinfoid IS NOT NULL THEN pi3.projectname ELSE '' END AS proname,"
|
||||
" CASE WHEN wb.housecode IS NOT NULL THEN bi.name WHEN wb.bid IS NOT NULL THEN bi2.name ELSE '' END AS bname,"
|
||||
" DECODE(wb.isvalid, 'Y', '有效', '无效') isvalid, hi.id AS houseid"
|
||||
" FROM wtblacklist wb"
|
||||
" --房源"
|
||||
" LEFT JOIN wk_jc_house_info hi ON hi.housecode = wb.housecode"
|
||||
" LEFT JOIN wk_jc_project_info pi ON pi.id = hi.projectinfoid"
|
||||
" LEFT JOIN wk_jc_building_house bh ON TO_CHAR(bh.id) = hi.buildinghouseid"
|
||||
" LEFT JOIN wk_jc_building_info bi ON bi.id = bh.bid"
|
||||
" --楼栋"
|
||||
" LEFT JOIN wk_jc_building_info bi2 ON bi2.id = wb.bid"
|
||||
" LEFT JOIN wk_jc_project_info pi2 ON pi2.id = bi2.sid"
|
||||
" --小区"
|
||||
" LEFT JOIN wk_jc_project_info pi3 ON pi3.id = wb.projectinfoid"
|
||||
" WHERE 1=1"
|
||||
```
|
||||
|
||||
测试不加索引
|
||||
全量 4秒
|
||||
筛选 17秒
|
||||
|
||||
测试加索引
|
||||
全量 2秒
|
||||
筛选 0.2秒
|
||||
|
||||
select count(0) from wk_jc_building_house;
|
||||
CREATE INDEX WK_JC_BUILDING_HOUSE_IDX01 ON wk_jc_building_house(TO_CHAR(id));
|
||||
DROP INDEX WK_JC_BUILDING_HOUSE_IDX01;
|
||||
|
||||
生产无索引
|
||||
全量 8秒
|
||||
筛选 3秒
|
||||
|
||||
---
|
||||
|
||||
#### 122148 【优化】Work端委托补充协议打印申请审核时点击查看协议文本需要查看协议文本内容
|
||||
|
||||
```
|
||||
// *******121485 UPDATE BY LHTH 2026-7-16 START *******
|
||||
// *******121485 UPDATE BY LHTH 2026-7-16 END *******
|
||||
```
|
||||
|
||||
getNoSignPdfElectronicAgreement
|
||||
|
||||
|
||||
|
||||
北京：无
|
||||
|
||||
杭州：无打印申请
|
||||
|
||||
上海：无
|
||||
|
||||
无锡：无
|
||||
|
||||
太原：和解协议, 和解协议漏水
|
||||
|
||||
苏州：页面不显示没改
|
||||
|
||||
```
|
||||
szSfAgreementTemplateHJXY
|
||||
suzhou + szSfAgreementTemplateHJXY
|
||||
cfAgreementTemplateHJXY
|
||||
suzhou + szSfAgreementTemplateHJXYLS
|
||||
```
|
||||
|
||||
南京：和解协议, 和解协议漏水
|
||||
|
||||
天津：页面不显示没改
|
||||
|
||||
```
|
||||
tjSfAgreementTemplateHJXYLS
|
||||
tjSfAgreementTemplateHJXYLSnew
|
||||
tjSfAgreementTemplateHJXY
|
||||
tjSfAgreementTemplateHJXYnew
|
||||
```
|
||||
|
||||
郑州：和解协议, 和解协议漏水
|
||||
|
||||
成都直营：无
|
||||
|
||||
武汉直营：无
|
||||
|
||||
广州直营：无
|
||||
|
||||
|
||||
|
||||
北京, 上海, 无锡, 直营分支, 如果
|
||||
|
||||
非收房已改
|
||||
|
||||
太原已改
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 122273 【需求】委托【录入法务诉讼】权限调整
|
||||
|
||||
```
|
||||
// *******122273 UPDATE BY LHTH 2026-7-21 START *******
|
||||
// *******122273 UPDATE BY LHTH 2026-7-21 END *******
|
||||
```
|
||||
|
||||
```
|
||||
<%-- *******122273 UPDATE BY LHTH 2026-7-21 START *******--%>
|
||||
<%-- *******122273 UPDATE BY LHTH 2026-7-21 END *******--%>
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 122248 【成都直营】【需求】【26年8月初上线】签署《成都相寓资产管理服务合同》补充协议时关闭“付款方式变更”区域
|
||||
|
||||
```
|
||||
<%-- *******122248 UPDATE BY LHTH 2026-7-21 START *******--%>
|
||||
<%-- *******122248 UPDATE BY LHTH 2026-7-21 END *******--%>
|
||||
```
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
#### 122328 【需求】变更打招租失败标签的逻辑
|
||||
|
||||
```
|
||||
// *******122328 UPDATE BY LHTH 2026-7-24 START *******
|
||||
// *******122328 UPDATE BY LHTH 2026-7-24 END *******
|
||||
```
|
||||
|
||||
|
||||
|
||||
428-85=343
|
||||
|
||||
---
|
||||
|
||||
#### 120013 【需求】【26年8月初上线】关于合同附件内容调整以及增加固定附件WORD版本
|
||||
|
||||
- [x] 签约类型新增“业主单位委托” -- 视为代理人委托
|
||||
- [x] 看代码各处取代理人的地方是否有问题
|
||||
- [x] 业主（未成年人） 新增 监护人姓名、监护人证件类型、监护人证件号码 字段 , 监护人可添加多个
|
||||
- [x] 业主死亡（有继承公证）OR业主死亡（无继承公证） 新增 继承人姓名、继承人证件类型、继承人证件号码 字段 , 继承人可添加多个
|
||||
- [x] 详情页 监护人 , 继承人
|
||||
- [x] 风控审核页 监护人 , 继承人
|
||||
- [x] work 签约类型新增“业主单位委托” -- 视为代理人委托
|
||||
- [x] work 编辑页 监护人 , 继承人
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
123456789012345678901234567890
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
```bash
|
||||
npm install @orama/plugin-docusaurus-v3
|
||||
npm install @orama/orama @orama/tokenizers
|
||||
npm install @orama/stopwords
|
||||
|
||||
npm install @orama/searchbox patch-package
|
||||
```
|
||||
|
||||
49
|
||||
|
||||
---
|
||||
|
||||
#### 122034 【需求】非相寓优选2.0产品签署委托补充协议变更“资产管理服务期限”时，风控审核通过后增加对付款计划相关的处理
|
||||
|
||||
```
|
||||
// *******122034 UPDATE BY LHTH 2026-7-30 START *******
|
||||
// *******122034 UPDATE BY LHTH 2026-7-30 END *******
|
||||
```
|
||||
|
||||
|
||||
|
||||
- [ ] 删除现有房行付款计划、
|
||||
- [ ] 重新生成房行付款计划、
|
||||
- [ ] 设置首期预计付款日。MAX（变更后委托开始日， 协议审核通过日期 + N工作日）N工作日同合同签约时的天数
|
||||
- [ ] 删除维修基金扣款单、房屋维护服务费，
|
||||
- [ ] 重新生成维修基金扣款单、房屋维护服务费。
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
1、删除现有房行付款计划 wt
|
||||
|
||||
2、按照本次变更后的周期重新生成房行付款计划 wt
|
||||
|
||||
3、房行付款单下的维修基金（房屋维护服务费）wt、资产管理费删除 cw，重新生成 wt cw，重新挂靠 cw cw，挂靠规则同签约
|
||||
|
||||
4、房行付款单下的非维修基金、资产管理费、房屋维护服务费的扣款单款项，重新挂靠 cw
|
||||
|
||||
5、重新生成的房行付款计划，协议风控审核通过后首期的预计付款日规则为 MAX（变更后委托开始日， 协议审核通过日期 + N工作日），N工作日同合同签约时的天数 wt
|
||||
|
||||
##### 实际
|
||||
|
||||
1、删除现有房行付款计划 wt1
|
||||
|
||||
2、按照本次变更后的周期重新生成房行付款计划 wt1
|
||||
|
||||
3、房行付款单下的维修基金（房屋维护服务费）wt2、资产管理费删除 cw1，重新生成 wt1 cw1，重新挂靠 cw1 cw1，挂靠规则同签约
|
||||
|
||||
4、其他扣款单款项，重新挂靠 解绑cw1 cw1
|
||||
|
||||
5、重新生成的房行付款计划，协议风控审核通过后首期的预计付款日规则为 MAX（变更后委托开始日， 协议审核通过日期 + N工作日），N工作日同合同签约时的天数 wt1
|
||||
|
||||
|
||||
|
||||
资产管理费仅成都有
|
||||
|
||||
|
||||
|
||||
删除付款计划--保存
|
||||
|
||||
保存付款计划--保存
|
||||
|
||||
删除维修基金--保存
|
||||
|
||||
保存维修基金--保存
|
||||
|
||||
审核通过相关的逻辑
|
||||
|
||||
重置首期房租的预计付款日--审核通过
|
||||
|
||||
维修基金挂靠?
|
||||
|
||||
扣款单已经挂扣 要删除掉吧?
|
||||
|
||||
|
||||
|
||||
##### saveYQPlansList 比较 savePlansList
|
||||
|
||||
不删旧付款计划 , 删除多余无用的判断
|
||||
|
||||
PAYABLEDATE,OCCURDATE
|
||||
|
||||
|
||||
|
||||
设置付款总次数?
|
||||
|
||||
如果付款日期比首次还早 , 那就设置成跟首次一样
|
||||
|
||||
保存付款计划
|
||||
|
||||
付款计划已审核
|
||||
|
||||
合并周期 生成维修基金
|
||||
|
||||
|
||||
|
||||
56.15
|
||||
|
||||
2.834
|
||||
|
||||
审核通过
|
||||
|
||||
```
|
||||
ContractMainInfoService.completeApproval
|
||||
-> updateContractHouseFeeInfo
|
||||
```
|
||||
|
||||
```js
|
||||
$(function() {
|
||||
let resultText = '';
|
||||
|
||||
$('table').each(function(index) {
|
||||
let tableData = [];
|
||||
|
||||
// 1. 提取表头 (thead)
|
||||
let headers = [];
|
||||
$(this).find('thead th').each(function() {
|
||||
headers.push($(this).text().trim());
|
||||
});
|
||||
if (headers.length > 0) {
|
||||
tableData.push(headers.join('\t'));
|
||||
}
|
||||
|
||||
// 2. 提取表体 (tbody)
|
||||
$(this).find('tbody tr').each(function() {
|
||||
let rowData = [];
|
||||
$(this).find('td').each(function() {
|
||||
let cellText = $(this).text().replace(/\s+/g, ' ').trim();
|
||||
rowData.push(cellText);
|
||||
});
|
||||
tableData.push(rowData.join('\t'));
|
||||
});
|
||||
|
||||
resultText += tableData.join('\n');
|
||||
|
||||
// 表格之间加空行
|
||||
if (index < $('table').length - 1) {
|
||||
resultText += '\n\n';
|
||||
}
|
||||
});
|
||||
|
||||
// 打印到控制台
|
||||
console.log('%c提取完成！右键下方字符串 -> Copy string contents:', 'color: green; font-weight: bold;');
|
||||
console.log(resultText);
|
||||
});
|
||||
```
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"label": "2026开发笔记",
|
||||
"position": 3,
|
||||
"link": {
|
||||
"type": "generated-index",
|
||||
"description": "无说明"
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"label": "Docusaurus资料",
|
||||
"position": 99,
|
||||
"link": {
|
||||
"type": "generated-index",
|
||||
"description": "无说明"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,250 @@
|
||||
---
|
||||
title: cms构建说明
|
||||
sidebar_position: 10
|
||||
---
|
||||
|
||||
## cms
|
||||
|
||||
### sveltia-cms
|
||||
|
||||
```
|
||||
1.文件
|
||||
新增 static/admin/index.html sveltia CMS入口页，CDN方式
|
||||
新增 static/admin/config.yml sveltia全部配置
|
||||
|
||||
2.访问
|
||||
http://localhost:3000/admin/
|
||||
```
|
||||
|
||||
|
||||
|
||||
### decap-cms(仅本地)
|
||||
|
||||
https://decapcms.org/docs/basic-steps/
|
||||
|
||||
```
|
||||
1.文件
|
||||
新增 static/admin/index.html Decap CMS入口页，CDN方式
|
||||
新增 static/admin/config.yml Decap全部配置
|
||||
修改 package.json 增加"cms": "npx decap-server"
|
||||
|
||||
2.内容
|
||||
docs的文件要增加 title
|
||||
|
||||
3.启动
|
||||
npx decap-server 或 npm run cms
|
||||
|
||||
4.访问
|
||||
http://localhost:3000/admin/
|
||||
```
|
||||
|
||||
#### 已创建的文件
|
||||
|
||||
| 文件 | 说明 |
|
||||
| ------------------------------------------------------------ | -------------------------------------- |
|
||||
| [static/admin/index.html](vscode-webview://0ckeaenbrnfu1mc0gmsrksqv66drn38jfo32mrkm9h7l6l40fp43/static/admin/index.html) | Decap CMS 入口，从 CDN 加载 |
|
||||
| [static/admin/config.yml](vscode-webview://0ckeaenbrnfu1mc0gmsrksqv66drn38jfo32mrkm9h7l6l40fp43/static/admin/config.yml) | 核心配置：backend、集合、媒体文件路径 |
|
||||
| [server.js](vscode-webview://0ckeaenbrnfu1mc0gmsrksqv66drn38jfo32mrkm9h7l6l40fp43/server.js) | Gitee OAuth 认证代理服务（生产环境用） |
|
||||
| [.env.example](vscode-webview://0ckeaenbrnfu1mc0gmsrksqv66drn38jfo32mrkm9h7l6l40fp43/.env.example) | 环境变量模板 |
|
||||
|
||||
#### Git 仓库
|
||||
|
||||
已本地提交并推送到 `git@gitee.com:lhth/testdecap.git`
|
||||
|
||||
有一个新的更改（导航栏链接改到 Gitee）在本地但被拦截了，你需要手动推一下：
|
||||
|
||||
```bash
|
||||
cd "d:/projects/test/my-websitetest"
|
||||
git push origin master
|
||||
```
|
||||
|
||||
#### 架构说明
|
||||
|
||||
**当前配置（开发/测试）：proxy backend**
|
||||
|
||||
```
|
||||
浏览器 → Decap CMS → proxy:8081 → 本地 git repo → SSH → Gitee
|
||||
```
|
||||
|
||||
运行方式：
|
||||
|
||||
```bash
|
||||
# 终端 1：启动 Docusaurus
|
||||
npm start
|
||||
|
||||
# 终端 2：启动 Decap 代理（在项目根目录）
|
||||
npx decap-server
|
||||
|
||||
# 访问 http://localhost:3000/admin/ 即可使用 CMS
|
||||
```
|
||||
|
||||
> **注意**：Docusaurus 开发服务器的 SPA 路由会拦截 `/admin/` 路径。有两个解决办法：
|
||||
>
|
||||
> 1. 访问 `http://localhost:3000/admin/index.html` （可能仍会被拦截）
|
||||
> 2. 用生产模式：`npm run build && npm run serve`，然后访问 `http://localhost:3000/admin/` ✅（已验证可行）
|
||||
|
||||
#### 生产环境部署（Gitee OAuth）
|
||||
|
||||
当你要部署到远程服务器时，需要：
|
||||
|
||||
**1. 在 Gitee 创建 OAuth App**
|
||||
|
||||
- 打开 https://gitee.com/oauth/applications
|
||||
- 应用名称：`My Decap CMS`
|
||||
- 回调地址：`https://你的域名.com/api/auth`
|
||||
- 获取 `Client ID` 和 `Client Secret`
|
||||
|
||||
**2. 部署认证服务**
|
||||
|
||||
```bash
|
||||
# 服务器上运行
|
||||
GITEE_CLIENT_ID=xxx GITEE_CLIENT_SECRET=xxx node server.js
|
||||
```
|
||||
|
||||
或者部署到 Vercel/Cloudflare Workers 等 Serverless 平台。
|
||||
|
||||
**3. 修改 config.yml** 取消注释文末的生产环境配置，注释掉 proxy backend 部分（文件中已有注释说明）。
|
||||
|
||||
#### 内容集合
|
||||
|
||||
已配置两个集合：
|
||||
|
||||
- **博客文章** (`blog/`) — Docusaurus 标准 `YYYY-MM-DD-title.md` 格式
|
||||
- **文档** (`docs/`) — Docusaurus 文档格式
|
||||
|
||||
你可以随时在 [static/admin/config.yml](vscode-webview://0ckeaenbrnfu1mc0gmsrksqv66drn38jfo32mrkm9h7l6l40fp43/static/admin/config.yml) 中增删字段或集合。
|
||||
|
||||
```
|
||||
浏览器 本地机器 Gitee
|
||||
┌─────────┐ ┌──────────────┐ ┌──────────┐
|
||||
│ Decap │──proxy──→ │ decap-server │──git──→ │ gitee.com│
|
||||
│ CMS UI │ HTTP:8081 │ (本地Node进程) │ SSH │ (你的仓库)│
|
||||
│ admin/ │ │ 读写本地git │ │ │
|
||||
└────┬────┘ └──────────────┘ └──────────┘
|
||||
│
|
||||
└── unpkg.com CDN (加载 decap-cms.js)
|
||||
```
|
||||
|
||||
|
||||
|
||||
### tina-cms(卡)
|
||||
|
||||
https://tina.io/docs/reference/config
|
||||
|
||||
```
|
||||
1.npm install tinacms @tinacms/cli
|
||||
2.tina/config.js
|
||||
3.package.json
|
||||
// scripts 里加
|
||||
"tina": "tinacms dev -c \"docusaurus start\"",
|
||||
4.npm run tina
|
||||
自动生成tina/__generated__/
|
||||
├── _graphql.json
|
||||
├── _lookup.json
|
||||
├── _schema.json
|
||||
├── client.ts
|
||||
├── config.prebuild.jsx
|
||||
├── frags.gql
|
||||
├── queries.gql
|
||||
├── schema.gql
|
||||
├── static-media.json
|
||||
├── types.js
|
||||
└── types.ts
|
||||
5.npm run tina
|
||||
```
|
||||
|
||||
|
||||
|
||||
```
|
||||
# 官方提供标准版
|
||||
const branch =
|
||||
process.env.NEXT_PUBLIC_TINA_BRANCH ||
|
||||
process.env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_REF ||
|
||||
process.env.HEAD ||
|
||||
'main';
|
||||
|
||||
export default defineConfig({
|
||||
branch,
|
||||
// generated by TinaCloud
|
||||
token: '<Your Read Only Token>',
|
||||
// generated by TinaCloud
|
||||
clientId: '<Your Client ID>',
|
||||
build: {
|
||||
publicFolder: 'public',
|
||||
outputFolder: 'admin',
|
||||
},
|
||||
schema: {
|
||||
//Content model definition here...
|
||||
},
|
||||
ui: {
|
||||
previewUrl: (context) => {
|
||||
// Use Vercel preview deployments based on branch names
|
||||
return { url: `https://my-app-git-${context.branch}.vercel.app` };
|
||||
},
|
||||
},
|
||||
media: {
|
||||
tina: {
|
||||
publicFolder: 'public',
|
||||
mediaRoot: 'uploads',
|
||||
},
|
||||
},
|
||||
search: {
|
||||
tina: {
|
||||
indexerToken: process.env.TINA_SEARCH_TOKEN,
|
||||
},
|
||||
},
|
||||
});
|
||||
```
|
||||
|
||||
|
||||
|
||||
```ts
|
||||
import { defineConfig } from "tinacms";
|
||||
|
||||
export default defineConfig({
|
||||
branch: process.env.TINA_BRANCH || "master",
|
||||
clientId: process.env.TINA_CLIENT_ID || "",
|
||||
token: process.env.TINA_TOKEN || "",
|
||||
build: {
|
||||
publicFolder: "static",
|
||||
outputFolder: "admin",
|
||||
},
|
||||
media: {
|
||||
tina: {
|
||||
mediaRoot: "img",
|
||||
publicFolder: "static",
|
||||
static: true,
|
||||
},
|
||||
},
|
||||
schema: {
|
||||
collections: [
|
||||
{
|
||||
name: "blog",
|
||||
label: "博客",
|
||||
path: "blog",
|
||||
format: "md",
|
||||
fields: [
|
||||
{ type: "string", name: "title", label: "标题", isTitle: true, required: true },
|
||||
{ type: "datetime", name: "date", label: "发布日期", ui: { dateFormat: "YYYY-MM-DD", timeFormat: false } },
|
||||
{ type: "string", name: "tags", label: "标签", list: true, ui: { component: "tags" } },
|
||||
{ type: "string", name: "description", label: "描述/摘要" },
|
||||
{ type: "rich-text", name: "body", label: "正文", isBody: true },
|
||||
],
|
||||
},
|
||||
{
|
||||
name: "docs",
|
||||
label: "文档",
|
||||
path: "docs",
|
||||
format: "md",
|
||||
fields: [
|
||||
{ type: "string", name: "title", label: "标题", isTitle: true, required: true },
|
||||
{ type: "number", name: "sidebar_position", label: "侧边栏位置" },
|
||||
{ type: "string", name: "tags", label: "标签", list: true, ui: { component: "tags" } },
|
||||
{ type: "rich-text", name: "body", label: "正文", isBody: true },
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
});
|
||||
```
|
||||
|
||||
@@ -0,0 +1,234 @@
|
||||
---
|
||||
title: docusaurus构建说明
|
||||
sidebar_position: 1
|
||||
---
|
||||
|
||||
|
||||
## Docusaurus 项目结构
|
||||
### 搭建流程
|
||||
|
||||
```
|
||||
1.初始化
|
||||
npx create-docusaurus@latest my-website classic
|
||||
|
||||
2.启动
|
||||
npm start
|
||||
|
||||
# 附
|
||||
好看的网站 https://ai-speaker.com/
|
||||
```
|
||||
### 修改内容
|
||||
```
|
||||
# 配置
|
||||
1.blog的预计阅读时间关,默认展示数量改成无限
|
||||
2.i18默认zh-Hans
|
||||
3.colorMode默认浅色,不使用用户偏好色
|
||||
|
||||
# 样式
|
||||
1.表格样式
|
||||
2.代码块字体样式,java代码识别
|
||||
|
||||
# 其他
|
||||
1.editUrl 可以在本地打开typora
|
||||
1.1先搞个注册表register-typora-protocol.reg 目标路径 typora-handler.wsf
|
||||
1.2再wsf转换一下url编码,然后静默打开typora
|
||||
2.新增了启动器start.vbs
|
||||
```
|
||||
|
||||
### 增加一个docs页
|
||||
|
||||
```
|
||||
# docusaurus.config.ts
|
||||
plugins: [
|
||||
[
|
||||
'@docusaurus/plugin-content-docs',
|
||||
{
|
||||
path: 'docs2',
|
||||
routeBasePath: 'docs2',
|
||||
sidebarPath: './sidebars.ts',
|
||||
editUrl: 'typora://file/D:/projects/my-website/',
|
||||
},
|
||||
],
|
||||
],
|
||||
|
||||
|
||||
themeConfig.navbar.items:
|
||||
{
|
||||
type: 'docSidebar',
|
||||
sidebarId: 'tutorialSidebar2',
|
||||
docsPluginId: 'docs2',
|
||||
position: 'left',
|
||||
label: '文档2',
|
||||
},
|
||||
|
||||
# sidebars.ts
|
||||
tutorialSidebar2: [{type: 'autogenerated', dirName: '.'}],
|
||||
```
|
||||
|
||||
|
||||
|
||||
## 一端多git-ssh
|
||||
|
||||
```
|
||||
#生成ssh秘钥
|
||||
ssh-keygen -t ed25519 -C "haotiandev@outlook.com" -f ~/.ssh/id_ed25519_gitee
|
||||
|
||||
#私钥 C:\Users\haoti\.ssh\id_ed25519_gitee
|
||||
|
||||
#找到公钥 C:\Users\haoti\.ssh\id_ed25519_gitee.pub
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ5usext5BEGqdXEkwIgdOWZodGCMZqlOpMs7pmYuO3V haotiandev@outlook.com
|
||||
|
||||
#把公钥在git后台配进ssh公钥里
|
||||
|
||||
#在C:\Users\haoti\.ssh 下创建config文件,写入
|
||||
# 个人 Gitee 账号
|
||||
Host gitee.com
|
||||
HostName gitee.com
|
||||
User git
|
||||
IdentityFile ~/.ssh/id_ed25519_gitee
|
||||
IdentitiesOnly yes
|
||||
|
||||
#绑定git地址
|
||||
git remote add origin git@gitee.com:lhth/docusaurus.git
|
||||
|
||||
#测试
|
||||
ssh -T git@gitee.com
|
||||
```
|
||||
|
||||
|
||||
|
||||
## 完整项目地图
|
||||
|
||||
```
|
||||
my-website/
|
||||
│
|
||||
├── 📄 docusaurus.config.js ← 【核心】整个站点的总配置
|
||||
│ 标题、导航栏、页脚、主题、插件、国际化、深色模式……一切全局设置
|
||||
├── 📄 sidebars.js ← 文档侧边栏菜单的结构定义
|
||||
├── 📄 package.json ← 项目依赖 + npm 启动脚本
|
||||
│
|
||||
├── 📁 blog/ ← 博客系统
|
||||
│ ├── authors.yml ← 作者信息（头像、简介、社交链接）
|
||||
│ ├── tags.yml ← 博客标签定义
|
||||
│ ├── 2021-08-26-welcome/ ← 博客可以是文件夹（含图片等资源）
|
||||
│ ├── 2019-05-28-first-blog-post.mdx ← 单文件博客文章
|
||||
│ ├── 2019-05-29-long-blog-post.mdx ← 文件名格式：YYYY-MM-DD-标题.mdx
|
||||
│ └── 2021-08-01-mdx-blog-post.mdx ← 用 Markdown + JSX 写作
|
||||
│ ↑ 自动生成：RSS 订阅、标签筛选页、文章归档页
|
||||
│
|
||||
├── 📁 docs/ ← 文档系统
|
||||
│ ├── intro.mdx ← 文档的首页 / 入口
|
||||
│ ├── tutorial-basics/ ← 一个文档章节（目录）
|
||||
│ │ ├── _category_.json ← 章节配置：标签名、排序、是否折叠
|
||||
│ │ ├── congratulations.mdx
|
||||
│ │ ├── create-a-blog-post.mdx
|
||||
│ │ ├── create-a-document.mdx
|
||||
│ │ ├── create-a-page.mdx
|
||||
│ │ ├── deploy-your-site.mdx
|
||||
│ │ └── markdown-features.mdx
|
||||
│ └── tutorial-extras/ ← 另一个章节
|
||||
│ ├── _category_.json
|
||||
│ ├── manage-docs-versions.mdx
|
||||
│ ├── translate-your-site.mdx
|
||||
│ └── img/ ← 文档里引用的图片
|
||||
│ ↑ 支持多版本管理（v1, v2, next……）
|
||||
│
|
||||
├── 📁 src/ ← 自定义代码（React）
|
||||
│ ├── pages/ ← 独立页面，文件会自动生成路由
|
||||
│ │ ├── index.js ← 【首页！】网站的主入口页
|
||||
│ │ ├── index.module.css ← 首页专属样式
|
||||
│ │ └── markdown-page.mdx ← 纯 Markdown 写页面
|
||||
│ ├── components/ ← 可复用的 React 组件
|
||||
│ │ └── HomepageFeatures/ ← 首页的"特性展示"区块组件
|
||||
│ └── css/
|
||||
│ └── custom.css ← 全局自定义样式（覆盖主题默认样式）
|
||||
│
|
||||
├── 📁 static/ ← 静态资源（原封不动复制到最终网站根目录）
|
||||
│ ├── img/
|
||||
│ │ ├── favicon.ico ← 浏览器标签页小图标
|
||||
│ │ ├── logo.svg ← 导航栏 Logo
|
||||
│ │ ├── docusaurus-social-card.jpg ← 分享到社交媒体时的预览图
|
||||
│ │ ├── docusaurus.png
|
||||
│ │ └── undraw_docusaurus_*.svg ← 首页的插画素材
|
||||
│ └── .nojekyll ← GitHub Pages 需要（告诉 GitHub 这不是 Jekyll 项目）
|
||||
│
|
||||
├── 📁 .docusaurus/ ← 【自动生成】Docusaurus 内部缓存和构建产物
|
||||
│ │ ← 千万不要手动编辑！里面有个文件叫
|
||||
│ │ DONT-EDIT-THIS-FOLDER 就在提醒这一点
|
||||
│ │ ← 可以随时删掉（npm run clear），
|
||||
│ │ 下次 npm start / build 会自动重建
|
||||
│ │
|
||||
│ ├── docusaurus.config.mjs ← 源配置编译后的版本
|
||||
│ ├── routes.js / routesChunkNames.json ← 站点路由表（代码分割用）
|
||||
│ ├── registry.js ← 所有页面和组件的模块注册表
|
||||
│ ├── globalData.json ← 各插件暴露的全局运行时数据
|
||||
│ ├── i18n.json ← 国际化翻译数据
|
||||
│ ├── site-metadata.json ← 站点元信息
|
||||
│ ├── site-storage.json ← 持久化存储
|
||||
│ ├── client-modules.js ← 客户端模块入口
|
||||
│ │
|
||||
│ ├── docusaurus-plugin-content-docs/ ← 文档插件缓存
|
||||
│ │ ├── default/
|
||||
│ │ │ └── p/ ← 每个 .mdx 文档文件被编译成一个 JSON
|
||||
│ │ │ ↑ 浏览器最终加载的就是这些 JSON
|
||||
│ │ │
|
||||
│ ├── docusaurus-plugin-content-blog/ ← 博客插件缓存
|
||||
│ │ └── default/
|
||||
│ │ ├── blogMetadata-default.json ← 博客元数据
|
||||
│ │ ├── blog-post-list-prop-default.json
|
||||
│ │ └── p/ ← 博客文章、标签页、归档页的编译产物
|
||||
│ │
|
||||
│ ├── docusaurus-plugin-content-pages/ ← 独立页面插件缓存
|
||||
│ ├── docusaurus-plugin-css-cascade-layers/ ← CSS 层级管理
|
||||
│ └── docusaurus-plugin-debug/ ← 调试页面
|
||||
│
|
||||
├── 📁 node_modules/ ← npm 安装的依赖包，不用关心里面
|
||||
│
|
||||
├── 📄 README.md ← GitHub 项目首页显示的说明
|
||||
├── 📄 README_tome.md ← 就是你现在看的这份笔记
|
||||
└── 📄 .gitignore ← Git 忽略规则
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 各目录一句话速查
|
||||
|
||||
| 目录 / 文件 | 一句话 |
|
||||
|---|---|
|
||||
| `docusaurus.config.js` | 站点的全部配置，修改标题、导航、主题都在这 |
|
||||
| `sidebars.js` | 文档侧边栏菜单怎么排 |
|
||||
| `blog/` | 写博客，Markdown → 自动生成文章页 + RSS + 标签 |
|
||||
| `docs/` | 写文档，Markdown → 自动生成带侧边栏的文档站 |
|
||||
| `src/pages/` | 自己写 React 页面（首页就在这） |
|
||||
| `src/components/` | 自己写 React 组件 |
|
||||
| `src/css/custom.css` | 覆盖主题样式（改颜色、字体等） |
|
||||
| `static/` | 放图片、favicon 等不需要构建的文件 |
|
||||
| `.docusaurus/` | 内部缓存，别动，出问题就删掉重来 |
|
||||
| `node_modules/` | 第三方依赖 |
|
||||
|
||||
---
|
||||
|
||||
## 常用命令
|
||||
|
||||
| 命令 | 用途 |
|
||||
|---|---|
|
||||
| `npm start` | 启动开发服务器，自动打开浏览器，支持热更新 |
|
||||
| `npm run build` | 生成生产环境静态文件到 `build/` 目录 |
|
||||
| `npm run serve` | 本地预览构建后的产物 |
|
||||
| `npm run clear` | 删除 `.docusaurus/` 缓存（出问题先试试这个） |
|
||||
| `npm run deploy` | 部署到 GitHub Pages（需额外配置） |
|
||||
|
||||
---
|
||||
|
||||
## 数据流概览（简化版）
|
||||
|
||||
```
|
||||
你写的 Markdown（docs/ + blog/）
|
||||
↓ Docusaurus 编译
|
||||
.docusaurus/ 里面的 JSON
|
||||
↓ 浏览器加载
|
||||
网站页面渲染
|
||||
```
|
||||
|
||||
- MDX = Markdown + JSX（可以在 Markdown 里直接写 React 组件）
|
||||
- 所有页面最终都是 React 组件，但大多数情况下你只需要写 Markdown
|
||||
@@ -0,0 +1,31 @@
|
||||
---
|
||||
title: 插件
|
||||
sidebar_position: 3
|
||||
---
|
||||
|
||||
## 官方社区提供
|
||||
|
||||
https://docusaurus.io/zh-CN/community/resources
|
||||
|
||||
### 搜索
|
||||
|
||||
- `docusaurus-lunr-search`, `docusaurus-search-local`：它们是 `@easyops-cn` 的前身或同类，但没有明确的中文优化，不推荐。
|
||||
- `docusaurus-plugin-lunr`：这只是一个索引生成器，还需要自己集成 Lunr.js，太麻烦。
|
||||
- `typesense`, `meilisearch`, `markprompt`, `biel`：这些都是需要外部服务器的方案，对于“自己写笔记用”来说，架构太重了，不推荐。
|
||||
- `@orama/plugin-docusaurus`：Orama 也是一个优秀的本地搜索引擎，但 `@easyops-cn` 在 Docusaurus 生态中更成熟，文档和社区支持更好。
|
||||
|
||||
### 集成
|
||||
|
||||
- [docusaurus-plugin-dhub - 添加编辑链接，在](https://github.com/dhub-dev/docusaurus-plugin-dhub)[Dhub](https://dhub.dev/docusaurus)可视化 MDX 编辑器中打开页面的源文件，并生成一个`dhub.json`清单，将每个路由映射到其源文件。
|
||||
|
||||
### 其他
|
||||
|
||||
- [docusaurus-theme-github-codeblock](https://github.com/saucelabs/docusaurus-theme-github-codeblock)是一个 Docusaurus 插件，支持引用来自公共 GitHub 仓库的代码示例。
|
||||
|
||||
- [docusaurus-plugin-remote-content](https://github.com/rdilweb/docusaurus-plugin-remote-content) - 一个 Docusaurus 插件，允许您从远程源获取内容。
|
||||
|
||||
- [plugin-image-zoom](https://github.com/flexanalytics/plugin-image-zoom) - Docusaurus 的图像缩放插件
|
||||
- [docusaurus-theme-zoom-image](https://github.com/rmaacario/docusaurus-theme-zoom-image) - 一款零依赖主题，让所有 Markdown 图片都能缩放：悬停放大镜徽章 + 全屏灯箱
|
||||
|
||||
- [docusaurus-plugin-native-ideal-image](https://github.com/Legend-Master/docusaurus-plugin-native-ideal-image) - 一个 Docusaurus 插件，用于将图像预处理为多种格式、尺寸和低质量图像占位符，通过现代浏览器原生和[延迟加载取代官方的](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/img#loading)[@docusaurus/plugin-ideal-image](https://docusaurus.io/docs/api/plugins/@docusaurus/plugin-ideal-image)。
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
---
|
||||
title: 搜索框
|
||||
sidebar_position: 2
|
||||
---
|
||||
|
||||
|
||||
## 搜索框
|
||||
### 搭建流程
|
||||
|
||||
```
|
||||
1.
|
||||
npm install --save @easyops-cn/docusaurus-search-local
|
||||
|
||||
2.修改文件后需要build才能查询到最新的
|
||||
npm run build
|
||||
npm run serve
|
||||
```
|
||||
|
||||
+38
-38
@@ -1,47 +1,47 @@
|
||||
---
|
||||
sidebar_position: 1
|
||||
sidebar_position: 999
|
||||
---
|
||||
# 文档说明
|
||||
|
||||
# Tutorial Intro
|
||||
|
||||
Let's discover **Docusaurus in less than 5 minutes**.
|
||||
|
||||
## Getting Started
|
||||
|
||||
Get started by **creating a new site**.
|
||||
|
||||
Or **try Docusaurus immediately** with **[docusaurus.new](https://docusaurus.new)**.
|
||||
|
||||
### What you'll need
|
||||
|
||||
- [Node.js](https://nodejs.org/en/download/) version 20.0 or above:
|
||||
- When installing Node.js, you are recommended to check all checkboxes related to dependencies.
|
||||
|
||||
## Generate a new site
|
||||
|
||||
Generate a new Docusaurus site using the **classic template**.
|
||||
|
||||
The classic template will automatically be added to your project after you run the command:
|
||||
|
||||
```bash
|
||||
npm init docusaurus@latest my-website classic
|
||||
### 小于号录入方式
|
||||
```
|
||||
1: <% 替换成 {'<'}%
|
||||
2: 加转义符号 {'<'}%
|
||||
3: 加进代码块
|
||||
```
|
||||
|
||||
You can type this command into Command Prompt, Powershell, Terminal, or any other integrated terminal of your code editor.
|
||||
|
||||
The command also installs all necessary dependencies you need to run Docusaurus.
|
||||
|
||||
## Start your site
|
||||
|
||||
Run the development server:
|
||||
|
||||
```bash
|
||||
cd my-website
|
||||
npm run start
|
||||
### 注释符号
|
||||
```
|
||||
{/* */}
|
||||
```
|
||||
|
||||
The `cd` command changes the directory you're working with. In order to work with your newly created Docusaurus site, you'll need to navigate the terminal there.
|
||||
|
||||
The `npm run start` command builds your website locally and serves it through a development server, ready for you to view at http://localhost:3000/.
|
||||
### blog预览结束符
|
||||
```
|
||||
{/* truncate */}
|
||||
```
|
||||
|
||||
Open `docs/intro.md` (this page) and edit some lines: the site **reloads automatically** and displays your changes.
|
||||
### markdown插件快捷键
|
||||
格式化markdown table : alt + shift + f
|
||||
|
||||
### 注释
|
||||
```
|
||||
{/* 注释 */}
|
||||
```
|
||||
|
||||
### 标记文字
|
||||
```
|
||||
`标记文字`
|
||||
```
|
||||
|
||||
### 文件本地打开
|
||||
```
|
||||
vscode://file/D:/projects/my-website/README.md
|
||||
typora://file/D:/projects/my-website/README.md
|
||||
```
|
||||
|
||||
### 图片本地
|
||||
```
|
||||
|
||||
```
|
||||
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
{
|
||||
"label": "Tutorial - Basics",
|
||||
"position": 2,
|
||||
"link": {
|
||||
"type": "generated-index",
|
||||
"description": "5 minutes to learn the most important Docusaurus concepts."
|
||||
}
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
---
|
||||
sidebar_position: 6
|
||||
---
|
||||
|
||||
# Congratulations!
|
||||
|
||||
You have just learned the **basics of Docusaurus** and made some changes to the **initial template**.
|
||||
|
||||
Docusaurus has **much more to offer**!
|
||||
|
||||
Have **5 more minutes**? Take a look at **[versioning](../tutorial-extras/manage-docs-versions.mdx)** and **[i18n](../tutorial-extras/translate-your-site.mdx)**.
|
||||
|
||||
Anything **unclear** or **buggy** in this tutorial? [Please report it!](https://github.com/facebook/docusaurus/discussions/4610)
|
||||
|
||||
## What's next?
|
||||
|
||||
- Read the [official documentation](https://docusaurus.io/)
|
||||
- Modify your site configuration with [`docusaurus.config.js`](https://docusaurus.io/docs/api/docusaurus-config)
|
||||
- Add navbar and footer items with [`themeConfig`](https://docusaurus.io/docs/api/themes/configuration)
|
||||
- Add a custom [Design and Layout](https://docusaurus.io/docs/styling-layout)
|
||||
- Add a [search bar](https://docusaurus.io/docs/search)
|
||||
- Find inspirations in the [Docusaurus showcase](https://docusaurus.io/showcase)
|
||||
- Get involved in the [Docusaurus Community](https://docusaurus.io/community/support)
|
||||
@@ -1,34 +0,0 @@
|
||||
---
|
||||
sidebar_position: 3
|
||||
---
|
||||
|
||||
# Create a Blog Post
|
||||
|
||||
Docusaurus creates a **page for each blog post**, but also a **blog index page**, a **tag system**, an **RSS** feed...
|
||||
|
||||
## Create your first Post
|
||||
|
||||
Create a file at `blog/2021-02-28-greetings.md`:
|
||||
|
||||
```md title="blog/2021-02-28-greetings.md"
|
||||
---
|
||||
slug: greetings
|
||||
title: Greetings!
|
||||
authors:
|
||||
- name: Joel Marcey
|
||||
title: Co-creator of Docusaurus 1
|
||||
url: https://github.com/JoelMarcey
|
||||
image_url: https://github.com/JoelMarcey.png
|
||||
- name: Sébastien Lorber
|
||||
title: Docusaurus maintainer
|
||||
url: https://sebastienlorber.com
|
||||
image_url: https://github.com/slorber.png
|
||||
tags: [greetings]
|
||||
---
|
||||
|
||||
Congratulations, you have made your first post!
|
||||
|
||||
Feel free to play around and edit this post as much as you like.
|
||||
```
|
||||
|
||||
A new blog post is now available at [http://localhost:3000/blog/greetings](http://localhost:3000/blog/greetings).
|
||||
@@ -1,57 +0,0 @@
|
||||
---
|
||||
sidebar_position: 2
|
||||
---
|
||||
|
||||
# Create a Document
|
||||
|
||||
Documents are **groups of pages** connected through:
|
||||
|
||||
- a **sidebar**
|
||||
- **previous/next navigation**
|
||||
- **versioning**
|
||||
|
||||
## Create your first Doc
|
||||
|
||||
Create a Markdown file at `docs/hello.md`:
|
||||
|
||||
```md title="docs/hello.md"
|
||||
# Hello
|
||||
|
||||
This is my **first Docusaurus document**!
|
||||
```
|
||||
|
||||
A new document is now available at [http://localhost:3000/docs/hello](http://localhost:3000/docs/hello).
|
||||
|
||||
## Configure the Sidebar
|
||||
|
||||
Docusaurus automatically **creates a sidebar** from the `docs` folder.
|
||||
|
||||
Add metadata to customize the sidebar label and position:
|
||||
|
||||
```md title="docs/hello.md" {1-4}
|
||||
---
|
||||
sidebar_label: 'Hi!'
|
||||
sidebar_position: 3
|
||||
---
|
||||
|
||||
# Hello
|
||||
|
||||
This is my **first Docusaurus document**!
|
||||
```
|
||||
|
||||
It is also possible to create your sidebar explicitly in `sidebars.js`:
|
||||
|
||||
```js title="sidebars.js"
|
||||
export default {
|
||||
tutorialSidebar: [
|
||||
'intro',
|
||||
// highlight-next-line
|
||||
'hello',
|
||||
{
|
||||
type: 'category',
|
||||
label: 'Tutorial',
|
||||
items: ['tutorial-basics/create-a-document'],
|
||||
},
|
||||
],
|
||||
};
|
||||
```
|
||||
@@ -1,43 +0,0 @@
|
||||
---
|
||||
sidebar_position: 1
|
||||
---
|
||||
|
||||
# Create a Page
|
||||
|
||||
Add **Markdown or React** files to `src/pages` to create a **standalone page**:
|
||||
|
||||
- `src/pages/index.js` → `localhost:3000/`
|
||||
- `src/pages/foo.md` → `localhost:3000/foo`
|
||||
- `src/pages/foo/bar.js` → `localhost:3000/foo/bar`
|
||||
|
||||
## Create your first React Page
|
||||
|
||||
Create a file at `src/pages/my-react-page.js`:
|
||||
|
||||
```jsx title="src/pages/my-react-page.js"
|
||||
import React from 'react';
|
||||
import Layout from '@theme/Layout';
|
||||
|
||||
export default function MyReactPage() {
|
||||
return (
|
||||
<Layout>
|
||||
<h1>My React page</h1>
|
||||
<p>This is a React page</p>
|
||||
</Layout>
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
A new page is now available at [http://localhost:3000/my-react-page](http://localhost:3000/my-react-page).
|
||||
|
||||
## Create your first Markdown Page
|
||||
|
||||
Create a file at `src/pages/my-markdown-page.md`:
|
||||
|
||||
```mdx title="src/pages/my-markdown-page.md"
|
||||
# My Markdown page
|
||||
|
||||
This is a Markdown page
|
||||
```
|
||||
|
||||
A new page is now available at [http://localhost:3000/my-markdown-page](http://localhost:3000/my-markdown-page).
|
||||
@@ -1,31 +0,0 @@
|
||||
---
|
||||
sidebar_position: 5
|
||||
---
|
||||
|
||||
# Deploy your site
|
||||
|
||||
Docusaurus is a **static-site-generator** (also called **[Jamstack](https://jamstack.org/)**).
|
||||
|
||||
It builds your site as simple **static HTML, JavaScript and CSS files**.
|
||||
|
||||
## Build your site
|
||||
|
||||
Build your site **for production**:
|
||||
|
||||
```bash
|
||||
npm run build
|
||||
```
|
||||
|
||||
The static files are generated in the `build` folder.
|
||||
|
||||
## Deploy your site
|
||||
|
||||
Test your production build locally:
|
||||
|
||||
```bash
|
||||
npm run serve
|
||||
```
|
||||
|
||||
The `build` folder is now served at [http://localhost:3000/](http://localhost:3000/).
|
||||
|
||||
You can now deploy the `build` folder **almost anywhere** easily, **for free** or very small cost (read the **[Deployment Guide](https://docusaurus.io/docs/deployment)**).
|
||||
@@ -1,168 +0,0 @@
|
||||
---
|
||||
sidebar_position: 4
|
||||
---
|
||||
|
||||
# Markdown Features
|
||||
|
||||
Docusaurus supports **[Markdown](https://daringfireball.net/projects/markdown/syntax)** and a few **additional features**.
|
||||
|
||||
## Front Matter
|
||||
|
||||
Markdown documents have metadata at the top called [Front Matter](https://jekyllrb.com/docs/front-matter/):
|
||||
|
||||
```text title="my-doc.md"
|
||||
// highlight-start
|
||||
---
|
||||
id: my-doc-id
|
||||
title: My document title
|
||||
description: My document description
|
||||
slug: /my-custom-url
|
||||
---
|
||||
// highlight-end
|
||||
|
||||
Markdown content
|
||||
```
|
||||
|
||||
## Headings {/* #my-heading-id */}
|
||||
|
||||
Markdown headings are supported using the standard “#” syntax and are automatically added to the table of contents. The number of `#` corresponds to the heading level.
|
||||
|
||||
```md
|
||||
## Headings
|
||||
|
||||
My text
|
||||
```
|
||||
|
||||
### Heading Ids {/* #my-custom-id */}
|
||||
|
||||
Add `{/* #my-custom-id */}` after the heading text to assign it an explicit anchor id, used for linking.
|
||||
|
||||
```md
|
||||
### Heading Ids {/_ #my-custom-id _/}
|
||||
```
|
||||
|
||||
## Links
|
||||
|
||||
Regular Markdown links are supported, using url paths or relative file paths.
|
||||
|
||||
```md
|
||||
Let's see how to [Create a page](/create-a-page).
|
||||
```
|
||||
|
||||
```md
|
||||
Let's see how to [Create a page](./create-a-page.mdx).
|
||||
```
|
||||
|
||||
**Result:** Let's see how to [Create a page](./create-a-page.mdx).
|
||||
|
||||
## Images
|
||||
|
||||
Regular Markdown images are supported.
|
||||
|
||||
You can use absolute paths to reference images in the static directory (`static/img/docusaurus.png`):
|
||||
|
||||
```md
|
||||
|
||||
```
|
||||
|
||||
|
||||
|
||||
You can reference images relative to the current file as well. This is particularly useful to colocate images close to the Markdown files using them:
|
||||
|
||||
```md
|
||||
|
||||
```
|
||||
|
||||
## Code Blocks
|
||||
|
||||
Markdown code blocks are supported with Syntax highlighting.
|
||||
|
||||
````md
|
||||
```jsx title="src/components/HelloDocusaurus.js"
|
||||
function HelloDocusaurus() {
|
||||
return <h1>Hello, Docusaurus!</h1>;
|
||||
}
|
||||
```
|
||||
````
|
||||
|
||||
```jsx title="src/components/HelloDocusaurus.js"
|
||||
function HelloDocusaurus() {
|
||||
return <h1>Hello, Docusaurus!</h1>;
|
||||
}
|
||||
```
|
||||
|
||||
## Admonitions
|
||||
|
||||
Docusaurus has a special syntax to create admonitions and callouts:
|
||||
|
||||
```md
|
||||
:::tip[My tip]
|
||||
|
||||
Use this awesome feature option
|
||||
|
||||
:::
|
||||
|
||||
:::danger[Take care]
|
||||
|
||||
This action is dangerous
|
||||
|
||||
:::
|
||||
```
|
||||
|
||||
:::tip[My tip]
|
||||
|
||||
Use this awesome feature option
|
||||
|
||||
:::
|
||||
|
||||
:::danger[Take care]
|
||||
|
||||
This action is dangerous
|
||||
|
||||
:::
|
||||
|
||||
## MDX and React Components
|
||||
|
||||
[MDX](https://mdxjs.com/) can make your documentation more **interactive** and allows using any **React components inside Markdown**:
|
||||
|
||||
```jsx
|
||||
export const Highlight = ({children, color}) => (
|
||||
<span
|
||||
style={{
|
||||
backgroundColor: color,
|
||||
borderRadius: '20px',
|
||||
color: '#fff',
|
||||
padding: '10px',
|
||||
cursor: 'pointer',
|
||||
}}
|
||||
onClick={() => {
|
||||
alert(`You clicked the color ${color} with label ${children}`)
|
||||
}}>
|
||||
{children}
|
||||
</span>
|
||||
);
|
||||
|
||||
This is <Highlight color="#25c2a0">Docusaurus green</Highlight> !
|
||||
|
||||
This is <Highlight color="#1877F2">Facebook blue</Highlight> !
|
||||
```
|
||||
|
||||
export const Highlight = ({children, color}) => (
|
||||
<span
|
||||
style={{
|
||||
backgroundColor: color,
|
||||
borderRadius: '20px',
|
||||
color: '#fff',
|
||||
padding: '10px',
|
||||
cursor: 'pointer',
|
||||
}}
|
||||
onClick={() => {
|
||||
alert(`You clicked the color ${color} with label ${children}`);
|
||||
}}>
|
||||
{children}
|
||||
</span>
|
||||
);
|
||||
|
||||
This is <Highlight color="#25c2a0">Docusaurus green</Highlight> !
|
||||
|
||||
This is <Highlight color="#1877F2">Facebook blue</Highlight> !
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"label": "Tutorial - Extras",
|
||||
"position": 3,
|
||||
"link": {
|
||||
"type": "generated-index"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 27 KiB |
@@ -1,55 +0,0 @@
|
||||
---
|
||||
sidebar_position: 1
|
||||
---
|
||||
|
||||
# Manage Docs Versions
|
||||
|
||||
Docusaurus can manage multiple versions of your docs.
|
||||
|
||||
## Create a docs version
|
||||
|
||||
Release a version 1.0 of your project:
|
||||
|
||||
```bash
|
||||
npm run docusaurus docs:version 1.0
|
||||
```
|
||||
|
||||
The `docs` folder is copied into `versioned_docs/version-1.0` and `versions.json` is created.
|
||||
|
||||
Your docs now have 2 versions:
|
||||
|
||||
- `1.0` at `http://localhost:3000/docs/` for the version 1.0 docs
|
||||
- `current` at `http://localhost:3000/docs/next/` for the **upcoming, unreleased docs**
|
||||
|
||||
## Add a Version Dropdown
|
||||
|
||||
To navigate seamlessly across versions, add a version dropdown.
|
||||
|
||||
Modify the `docusaurus.config.js` file:
|
||||
|
||||
```js title="docusaurus.config.js"
|
||||
export default {
|
||||
themeConfig: {
|
||||
navbar: {
|
||||
items: [
|
||||
// highlight-start
|
||||
{
|
||||
type: 'docsVersionDropdown',
|
||||
},
|
||||
// highlight-end
|
||||
],
|
||||
},
|
||||
},
|
||||
};
|
||||
```
|
||||
|
||||
The docs version dropdown appears in your navbar:
|
||||
|
||||
|
||||
|
||||
## Update an existing version
|
||||
|
||||
It is possible to edit versioned docs in their respective folder:
|
||||
|
||||
- `versioned_docs/version-1.0/hello.md` updates `http://localhost:3000/docs/hello`
|
||||
- `docs/hello.md` updates `http://localhost:3000/docs/next/hello`
|
||||
@@ -1,88 +0,0 @@
|
||||
---
|
||||
sidebar_position: 2
|
||||
---
|
||||
|
||||
# Translate your site
|
||||
|
||||
Let's translate `docs/intro.md` to French.
|
||||
|
||||
## Configure i18n
|
||||
|
||||
Modify `docusaurus.config.js` to add support for the `fr` locale:
|
||||
|
||||
```js title="docusaurus.config.js"
|
||||
export default {
|
||||
i18n: {
|
||||
defaultLocale: 'en',
|
||||
locales: ['en', 'fr'],
|
||||
},
|
||||
};
|
||||
```
|
||||
|
||||
## Translate a doc
|
||||
|
||||
Copy the `docs/intro.md` file to the `i18n/fr` folder:
|
||||
|
||||
```bash
|
||||
mkdir -p i18n/fr/docusaurus-plugin-content-docs/current/
|
||||
|
||||
cp docs/intro.md i18n/fr/docusaurus-plugin-content-docs/current/intro.md
|
||||
```
|
||||
|
||||
Translate `i18n/fr/docusaurus-plugin-content-docs/current/intro.md` in French.
|
||||
|
||||
## Start your localized site
|
||||
|
||||
Start your site on the French locale:
|
||||
|
||||
```bash
|
||||
npm run start -- --locale fr
|
||||
```
|
||||
|
||||
Your localized site is accessible at [http://localhost:3000/fr/](http://localhost:3000/fr/) and the `Getting Started` page is translated.
|
||||
|
||||
:::caution
|
||||
|
||||
In development, you can only use one locale at a time.
|
||||
|
||||
:::
|
||||
|
||||
## Add a Locale Dropdown
|
||||
|
||||
To navigate seamlessly across languages, add a locale dropdown.
|
||||
|
||||
Modify the `docusaurus.config.js` file:
|
||||
|
||||
```js title="docusaurus.config.js"
|
||||
export default {
|
||||
themeConfig: {
|
||||
navbar: {
|
||||
items: [
|
||||
// highlight-start
|
||||
{
|
||||
type: 'localeDropdown',
|
||||
},
|
||||
// highlight-end
|
||||
],
|
||||
},
|
||||
},
|
||||
};
|
||||
```
|
||||
|
||||
The locale dropdown now appears in your navbar:
|
||||
|
||||
|
||||
|
||||
## Build your localized site
|
||||
|
||||
Build your site for a specific locale:
|
||||
|
||||
```bash
|
||||
npm run build -- --locale fr
|
||||
```
|
||||
|
||||
Or build your site to include all the locales at once:
|
||||
|
||||
```bash
|
||||
npm run build
|
||||
```
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"label": "个人资料",
|
||||
"position": 90,
|
||||
"link": {
|
||||
"type": "generated-index",
|
||||
"description": "无说明"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,241 @@
|
||||
---
|
||||
sidebar_position: 10
|
||||
title: Doris说明
|
||||
---
|
||||
# Doris说明
|
||||
|
||||
### DWD表开发
|
||||
|
||||
```properties
|
||||
1.加yml配置
|
||||
2.加step sql文件
|
||||
3.create_table_all.sql写好记录
|
||||
decimalv3 小数精度
|
||||
BIGINT 主键
|
||||
INT 常规数字
|
||||
datetime
|
||||
varchar 字符
|
||||
4.定时任务加执行地址 http://10.1.67.76:19999/
|
||||
5.window执行完定时自动加入
|
||||
```
|
||||
|
||||
|
||||
|
||||
### 网页说明
|
||||
|
||||
##### 数据集
|
||||
|
||||
```
|
||||
1.新增数据集: 录入已创建的dwd表
|
||||
2.dwd表新增了字段: 图表来源-更多-编辑数据集, 选择列-从原数据同步列 (交换数据集是啥?)
|
||||
3.增加指标: 图表来源-更多-编辑数据集, 选择指标-增加条件
|
||||
4.删除亮哥的指标: 后缀加 _del
|
||||
|
||||
```
|
||||
|
||||
##### 图表
|
||||
|
||||
```
|
||||
|
||||
```
|
||||
|
||||
##### 看板
|
||||
|
||||
```
|
||||
1.可以全局筛选, 可以局部筛选, 可以联动筛选
|
||||
|
||||
2.展示:
|
||||
数量不要小数
|
||||
金额不要小数
|
||||
比率用1位小数
|
||||
```
|
||||
|
||||
##### sql工具箱
|
||||
|
||||
```
|
||||
|
||||
```
|
||||
|
||||
### code对应表
|
||||
|
||||
```
|
||||
city_id -> city_name
|
||||
1 北京
|
||||
2 杭州
|
||||
5 苏州
|
||||
6 太原
|
||||
7 天津
|
||||
8 南京
|
||||
9 上海
|
||||
15 成都
|
||||
18 郑州
|
||||
19 无锡
|
||||
20 武汉
|
||||
67 广州
|
||||
672 广州PARK
|
||||
|
||||
|
||||
contract_state_code -> contract_state
|
||||
1000100070001 已签约
|
||||
1000100070003 已作废
|
||||
1000100070004 已续约
|
||||
1000100070005 解约中
|
||||
1000100070006 已解约
|
||||
1000100070008 续约中
|
||||
1000100070009 签约中
|
||||
1000100070010 草稿
|
||||
|
||||
signing_route_code -> signing_route
|
||||
--非太原/太原
|
||||
1000100790001/1000100820001 AMS纸版签约
|
||||
1000100790002/1000100820002 APP电子签约
|
||||
|
||||
contract_type_code -> contract_type
|
||||
SF 委托
|
||||
CF 承租
|
||||
|
||||
property_check_state_code -> property_check_state
|
||||
1000300270001 待审核
|
||||
1000300270002 审核已通过
|
||||
1000300270003 审核未通过
|
||||
1000300270004 待补充
|
||||
1000300270005 待客户确认
|
||||
|
||||
jy_type_code -> jy_type
|
||||
--非太原/太原
|
||||
1000100800010001/1000100830010001 AMS纸质解约
|
||||
1000100800010002/1000100830010001 APP电子解约
|
||||
```
|
||||
|
||||
|
||||
|
||||
##### ODS是原材料，DWD是清洗好的零件，DWS是组装好的半成品，那么ADS就是摆在货架上成品。
|
||||
|
||||
### ods
|
||||
|
||||
```properties
|
||||
设计ods表,数据类型按全城市的最大值创建
|
||||
|
||||
#流程
|
||||
定时去拉去AMS的数据到ods表 , 链路猜测是ogg->spark->ods
|
||||
全量定时: 每天全刷
|
||||
增量定时: 几分钟一刷
|
||||
```
|
||||
|
||||
### dwd
|
||||
|
||||
```properties
|
||||
application.yml 里配置了dwd需要执行哪些sql
|
||||
dwd-micro: 业务
|
||||
dws-ads-micro: 数据组用
|
||||
zipper: ods备份表,比如监控到发生变化,就insert一条,时间是zip_valid_start,对应字段在项目的superset_fields_xxx文件
|
||||
|
||||
|
||||
classpath配置里dwd的建表语句,写法像视图,11
|
||||
${group}: sfContract
|
||||
${dwdTable}: dwd_fact_sf
|
||||
${odsTable}: ods_wk_sf_contract
|
||||
${odsTables}: 都写的这个,但是实际用的时候还是odsTable
|
||||
${isFull}: 是否全量
|
||||
${lookbackSeconds}: 增量数据,前60秒的,一般不用
|
||||
${jobParam}: XXL-JOB参数
|
||||
${initSplitPredicate}: isFull=true且数据量很大时, 拆成多个小任务执行
|
||||
```
|
||||
|
||||
|
||||
|
||||
### 自己尝试
|
||||
|
||||
```yml
|
||||
dwd_fact_agreement:
|
||||
enabled: true
|
||||
ods-tables:
|
||||
ods_wiwj_agreement_info:
|
||||
enabled: true
|
||||
sql-files:
|
||||
- classpath:sql/dwd/sfContract/dwd_fact_sf_agreement_step1.sql
|
||||
```
|
||||
|
||||
```sql
|
||||
--委托协议测试表
|
||||
DROP TABLE IF EXISTS warehouse.dwd_fact_agreement;
|
||||
CREATE TABLE IF NOT EXISTS warehouse.dwd_fact_agreement (
|
||||
dw_cityid INT COMMENT '城市ID',
|
||||
agreement_id BIGINT COMMENT '协议ID',
|
||||
city_name VARCHAR(20) COMMENT '城市',
|
||||
contract_id BIGINT COMMENT '合同ID',
|
||||
contract_type VARCHAR(40) COMMENT '协议类型(收房出房)',
|
||||
confer_id BIGINT COMMENT '协议类型字典',
|
||||
confer_name BIGINT COMMENT '协议类型名称',
|
||||
status VARCHAR(100) COMMENT '协议风控审核状态',
|
||||
letdatechange VARCHAR(2) COMMENT '首个招租期是否变更',
|
||||
cycleLetDaysChange VARCHAR(2) COMMENT '托管招租期是否变更',
|
||||
create_time DATETIME COMMENT '创建时间',
|
||||
--共通
|
||||
op_type VARCHAR(20) COMMENT '是否被物理删除',
|
||||
etl_time DATETIMEV2(3) DEFAULT CURRENT_TIMESTAMP(3) COMMENT 'ETL 加载时间'
|
||||
)
|
||||
UNIQUE KEY(dw_cityid, agreement_id)
|
||||
COMMENT '委托协议测试表'
|
||||
DISTRIBUTED BY HASH(dw_cityid, agreement_id) BUCKETS 16
|
||||
PROPERTIES (
|
||||
"replication_num" = "3",
|
||||
"enable_unique_key_merge_on_write" = "true"
|
||||
);
|
||||
```
|
||||
|
||||
##### [dwd_fact_sf_agreement_step1.sql](C:\project\doris-microbatch-executor\src\main\resources\sql\dwd\sfContract\dwd_fact_sf_agreement_step1.sql)
|
||||
|
||||
```sql
|
||||
INSERT INTO dwd_fact_agreement
|
||||
(
|
||||
dw_cityid,
|
||||
agreement_id,
|
||||
city_name,
|
||||
contract_id,
|
||||
contract_type,
|
||||
confer_id,
|
||||
confer_name,
|
||||
status,
|
||||
letdatechange,
|
||||
cycleLetDaysChange,
|
||||
create_time,
|
||||
op_type,
|
||||
etl_time
|
||||
)
|
||||
SELECT
|
||||
s.dw_cityid as dw_cityid,
|
||||
s.ID as agreement_id,
|
||||
dc.dict_name as city_name,
|
||||
s.CONTRACTSID as contract_id,
|
||||
s.CONTRACTTYPE as contract_type,
|
||||
s.CONFERID as confer_id,
|
||||
ods_conferid.DICTNAME as confer_name,
|
||||
s.STATUS as status,
|
||||
detail.letdatechange AS letdatechange,
|
||||
detail.cycleLetDaysChange AS cycleLetDaysChange,
|
||||
s.CREATETIME as create_time,
|
||||
s.op_type,
|
||||
s.etl_time
|
||||
FROM ${odsTable} s
|
||||
left join dict_config dc on dc.dict_id = s.dw_cityid and dc.dict_type = 'city'
|
||||
left join ods_taw_system_dicttype ods_conferid on ods_conferid.dw_cityid = s.dw_cityid and ods_conferid.dictid = s.conferid
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
dw_cityid,
|
||||
CONFERID,
|
||||
MAX(CASE WHEN name = 'letDateChange' AND value = 'Y' THEN 'Y' ELSE 'N' END) AS letdatechange,
|
||||
MAX(CASE WHEN name = 'cycleLetDaysChange' AND value = 'Y' THEN 'Y' ELSE 'N' END) AS cycleLetDaysChange
|
||||
FROM ods_wiwj_agreement_detail_info
|
||||
WHERE name IN ('letDateChange', 'cycleLetDaysChange')
|
||||
GROUP BY dw_cityid, CONFERID
|
||||
) detail ON detail.dw_cityid = s.dw_cityid AND detail.CONFERID = s.id
|
||||
INNER JOIN dwd_batch_window b
|
||||
ON b.dwd_group = '${group}'
|
||||
AND b.dwd_table = '${dwdTable}'
|
||||
AND b.ods_table = '${odsTable}'
|
||||
WHERE s.pos > b.batch_start_pos
|
||||
AND s.pos <= b.batch_end_pos
|
||||
AND s.CONTRACTTYPE = 'SF';
|
||||
```
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"label": "相寓资料",
|
||||
"position": 1,
|
||||
"link": {
|
||||
"type": "generated-index",
|
||||
"description": "相寓系统资料"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
---
|
||||
sidebar_position: 99
|
||||
title: 上线相关
|
||||
---
|
||||
# 上线相关
|
||||
|
||||
### 替换
|
||||
|
||||
#### 北京替换文件
|
||||
```
|
||||
theme.css
|
||||
applicationContext-all.xml
|
||||
applicationContext-hession.xml
|
||||
applicationContext-interface-task.xml
|
||||
applicationContext-solr.xml
|
||||
applicationContext-resources.xml
|
||||
bankconfig-alipay.xml
|
||||
acp_sdk.properties
|
||||
pay_zfb_config.properties
|
||||
server-config.properties
|
||||
web.xml
|
||||
pos-config.properties
|
||||
signatrue-ruleNo.properties
|
||||
role-config.properties
|
||||
cuxEbsLog.jsp
|
||||
unionpay_config.properties
|
||||
jrProperties.properties）
|
||||
```
|
||||
|
||||
#### 分公司替换文件
|
||||
```
|
||||
server-config.properties
|
||||
role-config.properties
|
||||
rabbitmq
|
||||
roleId-houseViewNum.properties
|
||||
signatrue-ruleNo.properties
|
||||
applicationContext-solr.xml
|
||||
applicationContext-resources.xml
|
||||
applicationContext-ehcache.xml
|
||||
applicationContext-all.xml
|
||||
applicationContext-interface-task.xml
|
||||
bankconfig-alipay.xml
|
||||
bankconfig-wxpay-V3-app.xml
|
||||
bankconfig-wxpay-V3-wx.xml
|
||||
applicationContext-solr.xml
|
||||
pay_zfb_config.properties
|
||||
role-config.properties
|
||||
pos-config.properties
|
||||
web.xml
|
||||
unionpay_config.properties
|
||||
jrProperties.properties
|
||||
```
|
||||
{/* truncate */}
|
||||
@@ -0,0 +1,162 @@
|
||||
---
|
||||
sidebar_position: 1
|
||||
title: 系统相关
|
||||
---
|
||||
# 系统相关
|
||||
|
||||
## 各系统地址
|
||||
| 类型 | 地址 | 备注 |
|
||||
| :----------------- | :----------------------------------------------------------- | :------------------------------ |
|
||||
| 数据对接平台 | http://dts-yscvue.1zu.com/ | 前端 |
|
||||
| | http://dts-ysc.1zu.com | 后端 |
|
||||
| 催缴中台测试 | srvmid-testvue.1zu.com | 前端 |
|
||||
| | srvmid-test.1zu.com | 后端 |
|
||||
| 催缴中台预生产 | https://srvmidtest.1zu.com:20031/ | admin/srvmid@220930 |
|
||||
| 催缴中台测试猫头鹰 | base_url=http://srvmidtest.1zu.com:20099/ | |
|
||||
| 禅道地址 | https://zentao-xy.1zu.com/zentaopms/www/my/ | |
|
||||
| 相寓+APP | https://www.pgyer.com/xiangyu-crm-android-test | |
|
||||
| 相寓测试APP | https://testapp.1zu.com/ | admin/testappXY@123 |
|
||||
| yapi | http://testall.1zu.com:20061/group/154 | |
|
||||
| mq | http://rabbitmq-web.cbs-public.sit-2.private.com/#/ | |
|
||||
| solr | https://solrtest.1zu.com/solr/index.html#/ | |
|
||||
| | https://solrtest.1zu.com/solr/index.html#/home/dataimport/dataimport | |
|
||||
| git | http://testall.1zu.com:20027 | uNCz3DhERDjM |
|
||||
| 日志测试 | https://vrtest.1zu.com/xiangyulog/init | xiangyuLog/7_LjIh0hkRF3z |
|
||||
| 日志生产 | https://videovr.1zu.com/xiangyulog/init | 废弃 |
|
||||
| | https://xylog-down.1zu.com/xiangyulog/init | 最新 |
|
||||
| 云闪付账号 | https://open.unionpay.com/tjweb/support/faq/mchlist?id=4 | |
|
||||
| | 6226 0900 0000 0048/张三/510265790128303/18100000000/ 123456 | 示例 |
|
||||
| 定时 | http://xy-job-test.1zu.com/jobadmin/ | xytest/Kp8@Qw7$Rt3# |
|
||||
| PINPOINT | pinpoint.1zu.com | |
|
||||
| superset 数仓 | https://superset-test.1zu.com/ | 8349076/8349076xy |
|
||||
| IT中心网盘 | \\10.1.74.52\控股相寓it公用 | xiangyu/YTVh7> xydev/Q{'<'}[MT= |
|
||||
| 相寓官网业主推荐 | https://www.1zu.com/contract/contractOnline.htm | 应该crm接手废弃了 |
|
||||
| | http://10.1.74.43:8087/contract/contractOnline.htm | 本地 |
|
||||
| 签章服务器 | http://10.10.115.205:9230/Seal/login.do | 已改为本地签 |
|
||||
| | http://10.10.115.204:9230/Seal/login.do | |
|
||||
| | D:\IT_center\40_开发\10_计划\房源-委托-组织架构\签章证书 | |
|
||||
| 前后端分离项目安装 | D:\IT_center\99_文档工具\10_相关软件工具\srvmid | |
|
||||
| | http://101.251.221.146:20024/admin/admin/login.htm | admin/123456 |
|
||||
| 委托组计划地址 | D:\IT_center\40_开发\10_计划\房源-委托-组织架构\开发计划 | |
|
||||
| 总结/计划 | D:\IT_center\70_述职\2022年 | |
|
||||
| 脚本上传位置 | D:\projects\IT_center\60_发布\01_上线配套的脚本页面设置等 | |
|
||||
| 数据库码表 | D:\IT_center\40_开发\数据库密码表_新.xlsx | |
|
||||
| 地图坐标网站 | https://api.map.baidu.com/lbsapi/getpoint/index.html | |
|
||||
| 图片背景透明 | https://www.aigei.com/bgremover/ | |
|
||||
|
||||
## 开发维护文档
|
||||
| 类型 | 地址 | 备注 |
|
||||
| :----------- | :------------------------------------------------------------ | :----------- |
|
||||
| 催缴中台 | D:\IT_center\40_开发\01_中台管理\01开发基准 | 开发规范书 |
|
||||
| | D:\IT_center\40_开发\01_中台管理\03设计书 | 维护字典 |
|
||||
| 数据对接平台 | D:\IT_center\40_开发\05_数据对接平台\01设计相关\字典管理.xlsx | 维护字典 |
|
||||
| | D:\IT_center\40_开发\05_数据对接平台\04环境更新脚本 | 上线脚本存放 |
|
||||
|
||||
|
||||
## svn地址
|
||||
|
||||
| 类型 | 地址 |
|
||||
| :-------------------------- | :-------------------------------------------------------------------------------------------- |
|
||||
| 所有资料 | https://10.20.126.1/svn/IT_center |
|
||||
| 代码-北京 | https://10.20.126.1/svn/src_houtai/5i5j/branch/SrcPhase4_Api_20161129_Ver29787 |
|
||||
| | https://10.20.126.1/svn/src_houtai/5i5j/branch/SrcPhase4_Houtai_20161129_Ver30394 |
|
||||
| 代码-杭州 | https://10.20.126.1/svn/src_houtai/5i5j/branch/SrcPhase4_Api_20210818_Ver102341_HZ |
|
||||
| | https://10.20.126.1/svn/src_houtai/5i5j/branch/SrcPhase4_Houtai_20210818_Ver103075_HZ |
|
||||
| 代码-无锡 | https://10.20.126.1/svn/src_houtai/5i5j/branch/api_FenGongSi_FeiShouFang_20171107_Ver32829 |
|
||||
| | https://10.20.126.1/svn/src_houtai/5i5j/branch/Houtai_feiShouFang_shangHai_20190318_Ver55441 |
|
||||
| 代码-苏州、南京、郑州、天津 | https://10.20.126.1/svn/src_houtai/5i5j/branch/api_FenGongSi_FeiShouFang_20171107_Ver32829 |
|
||||
| | https://10.20.126.1/svn/src_houtai/5i5j/branch/Houtai_FenGongSi_FeiShouFang_20171107_Ver32465 |
|
||||
| 代码-太原 | https://10.20.126.1/svn/src_houtai/5i5j/branch/api_FenGongSi_ShouFang_20180402_Ver42086 |
|
||||
| | https://10.20.126.1/svn/src_houtai/5i5j/branch/Houtai_FenGongSi_ShouFang_20180402_Ver42157 |
|
||||
| 代码-成都、武汉、广州 | https://10.20.126.1/svn/src_houtai/5i5j/branch/SrcPhase4_Api_cdxyDirect_20221118_Ver122104 |
|
||||
| | https://10.20.126.1/svn/src_houtai/5i5j/branch/SrcPhase4_Houtai_cdxyDirect_20221118_Ver123302 |
|
||||
| 代码-上海 | https://10.20.126.1/svn/src_houtai/5i5j/branch/api_SH_20230406_Ver129717 |
|
||||
| | https://10.20.126.1/svn/src_houtai/5i5j/branch/Houtai_SH_20230406_Ver129724 |
|
||||
| 代码-APP中台 | https://10.20.126.1/svn/src_houtai/5i5j/branch/ams_mid |
|
||||
| 相寓官网 | https://10.20.126.1/svn/it_center/10_后台/20_代码/supplier/xiangyu |
|
||||
| | https://10.20.126.1/svn/it_center/10_后台/20_代码/supplier/common-xiangyu |
|
||||
| | https://10.20.126.1/svn/it_center/10_后台/20_代码/supplier/api_xiangyu |
|
||||
|
||||
## git地址
|
||||
| 类型 | 地址 |
|
||||
| :---------------- | :---------------------------------------------------------------------------- |
|
||||
| 代码-数据对接中台 | git clone http://zhupengying@testall.1zu.com:20027/r/5i5j_xy_datalink.git |
|
||||
| | git clone http://zhupengying@testall.1zu.com:20027/r/5i5j_xy_datalink_vue.git |
|
||||
| vr | git clone https://git.1zu.com/r/5i5j_vr.git |
|
||||
| spark | git clone https://git.1zu.com/r/5i5j_bigdata.git |
|
||||
|
||||
## 个人资料
|
||||
| 类型 | 地址 | 备注 |
|
||||
| :------- | :------------------------------------------------ | :--------------------- |
|
||||
| 企业邮箱 | 令狐天昊/linghutianhao@xiangyulife.com/Xiangyu123 | |
|
||||
| 公司wifi | 5I5J-WLAN | 使用员工编号和密码登录 |
|
||||
|
||||
|
||||
## 软件安装
|
||||
| 类型 | 地址 | 备注 |
|
||||
| :------------- | :--------------------------------------------------------------------------- | :-------------------- |
|
||||
| AMS软件 | \IT_center\99_文档工具\50_安全浏览器\21_WebClient\SayHiSetup_bjtest_v4.1.exe | |
|
||||
| | 在安装目录下创建Config.ini | 下方配置 |
|
||||
| cbs软件 | MyBrowser | 疑似 60_CBS安全浏览器 |
|
||||
| 催缴中台猫头鹰 | D:\Program Files (x86)\5i5j\GJBrowser_cjzt_self45 | |
|
||||
| mp文件 | \IT_center\99_文档工具\10_相关软件工具\MockPlus | 慕客 |
|
||||
|
||||
```
|
||||
[BaseConfig]
|
||||
|
||||
'北京测试
|
||||
base_url=http://testall.1zu.com:20009/
|
||||
|
||||
[TestConfig]
|
||||
__app__log__severity___=debug
|
||||
__show__test__menu___=yes
|
||||
```
|
||||
|
||||
## 项目启动事项
|
||||
### AMS
|
||||
#### 文档
|
||||
D:\IT_center\99_文档工具\10_相关软件工具\idea 配置AMS.doc
|
||||
#### tomcat VM
|
||||
```
|
||||
-XX:PermSize=728M
|
||||
-XX:MaxPermSize=1024M
|
||||
-Xms256m
|
||||
-Xmx1024m
|
||||
-Dfile.encoding=UTF-8
|
||||
-Djava.library.path="D:\develop\opencv\build\java\x64"
|
||||
-XX:+HeapDumpOnOutOfMemoryError
|
||||
-XX:HeapDumpPath=$LOG_DIR/java.hprof"
|
||||
```
|
||||
#### opencv
|
||||
D:\IT_center\99_文档工具\10_相关软件工具\opencv-2.4.13.6-vc14.exe
|
||||
#### 配置文件修改(前期可不修改)
|
||||
```
|
||||
picUploadUrlAliOSS=http\://10.1.74.43:8080/newPath/
|
||||
picUploadUrlOSS=http\://10.1.74.43:8080/newPath/
|
||||
picUploadUrl=http\://10.1.74.43:8080/newPath/
|
||||
picUploadPath=D\:/images/
|
||||
webServerUrl = http://localhost:8080
|
||||
```
|
||||
#### idea编译内存不足
|
||||
Build -> Compiler -> Share build process heap size (Mbytes): 最少3000
|
||||
#### 本地签章
|
||||
D:\program\signSrc\ 目录下的东西
|
||||
|
||||
### 中台
|
||||
#### 文档
|
||||
D:\IT_center\40_开发\01_中台管理\04manual\中台开发环境构筑说明书.xlsx
|
||||
#### opencv
|
||||
D:\develop\opencv\build\java\x64\opencv_java2413.dll 放到 C:\WINDOWS\System32\ 之下
|
||||
|
||||
或者(未实践) opencv_java341.dll 复制到jre/bin
|
||||
|
||||
或者(未实践) -Djava.library.path="D:\develop\opencv\build\java\x64"
|
||||
|
||||
### 机器码
|
||||
#### AMS机器码
|
||||
admin-系统设置-安全管理-设备信息列表管理-新增设备
|
||||
#### cbs机器码
|
||||
各城市管理员账号- 设备管理 - 添加网络?(ipconfig /all 删掉中间的'-') - 配置设备
|
||||
|
||||
### pom oracle
|
||||
-mvn install:install-file -Dfile="D:\tools\Oracle_10g_10.2.0.4_JDBC_ojdbc14.jar" -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.4.0 -Dpackaging=jar
|
||||
Reference in New Issue
Block a user