 liang.chao
|
78e2a37c9c
|
代码提交
|
2025-09-04 12:51:07 +08:00 |
|
liang.chao
|
11b34a6424
|
Merge remote-tracking branch 'origin/master'
|
2025-09-04 12:51:02 +08:00 |
|
liang.chao
|
bfb47f02dd
|
代码提交
|
2025-09-04 12:50:44 +08:00 |
 mashuai
|
19791eb436
|
功能优化
|
2025-09-04 12:24:37 +08:00 |
|
liang.chao
|
2e66fae328
|
代码提交
|
2025-09-04 12:22:41 +08:00 |
|
liang.chao
|
1b5b72fe0c
|
Merge remote-tracking branch 'origin/master'
|
2025-09-04 11:31:23 +08:00 |
|
liang.chao
|
17178c4dfb
|
代码提交
|
2025-09-04 11:28:32 +08:00 |
 hayu
|
23d74da2d1
|
修改
|
2025-09-04 11:27:12 +08:00 |
|
mashuai
|
a5274db2e3
|
功能优化
|
2025-09-04 11:07:53 +08:00 |
|
hayu
|
9d41f58598
|
修改
|
2025-09-04 10:59:40 +08:00 |
 syruan
|
635cabdc90
|
修复结算协议查询和费用计算相关问题- 移除了 SltAgreementInfoMapper.xml 中的协议编码模糊查询条件
- 修改了未结算协议的查询逻辑，增加了对 is_slt 字段为空的处理- 修正了租赁费用计算条件，将 > 0 改为 >= 1，确保当天领当天退也能正常计算费用
- 更新了日期计算方法，确保领料日期和退料日期相同时算作 1 天
|
2025-09-04 07:50:31 +08:00 |
|
mashuai
|
8d4fc5ce0b
|
Merge remote-tracking branch 'origin/master'
|
2025-09-04 00:57:16 +08:00 |
|
mashuai
|
1f98abc54a
|
功能优化
|
2025-09-04 00:56:59 +08:00 |
|
hayu
|
d0057cee18
|
修改
|
2025-09-03 23:25:15 +08:00 |
 hongchao
|
72cb20d447
|
问题修复
|
2025-09-03 21:37:00 +08:00 |
|
hongchao
|
38276744f6
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-03 21:21:27 +08:00 |
|
hongchao
|
dc0dd59f06
|
问题修复
|
2025-09-03 21:21:12 +08:00 |
|
hayu
|
52b43766aa
|
修改
|
2025-09-03 20:57:05 +08:00 |
|
hayu
|
e2e9527f4d
|
修改
|
2025-09-03 20:51:54 +08:00 |
|
hayu
|
af9225d66f
|
修改
|
2025-09-03 20:22:07 +08:00 |
|
hongchao
|
a7207dc9bf
|
Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
|
2025-09-03 17:22:28 +08:00 |
|
hongchao
|
7d53a34a5e
|
问题修复
|
2025-09-03 17:22:15 +08:00 |
|
hayu
|
12f9f4a850
|
修改
|
2025-09-03 15:56:05 +08:00 |
|
hongchao
|
beefd3e461
|
直转审核流程修改领料数量
|
2025-09-03 12:14:58 +08:00 |
|
mashuai
|
714959eb41
|
功能优化
|
2025-09-03 02:29:08 +08:00 |
|
hayu
|
ed8924f9bc
|
修改
|
2025-09-02 23:57:30 +08:00 |
|
hongchao
|
f08ce31bd0
|
直转审核流程
|
2025-09-02 22:50:48 +08:00 |
|
hayu
|
082330c4a2
|
修改
|
2025-09-02 11:53:53 +08:00 |
|
hayu
|
e21189cf9b
|
Merge remote-tracking branch 'origin/master'
|
2025-09-02 11:32:56 +08:00 |
|
hayu
|
5f15a736fc
|
修改
|
2025-09-02 11:31:47 +08:00 |
|
hongchao
|
5598a935be
|
直转审核bug
|
2025-09-02 11:31:11 +08:00 |
|
hayu
|
5df71896fd
|
Merge remote-tracking branch 'origin/master'
|
2025-09-02 01:59:20 +08:00 |
|
hayu
|
caf103e9d1
|
修改
|
2025-09-02 01:58:57 +08:00 |
|
mashuai
|
6e32f84495
|
Merge remote-tracking branch 'origin/master'
|
2025-09-02 01:58:46 +08:00 |
|
mashuai
|
a921294a14
|
功能优化
|
2025-09-02 01:58:32 +08:00 |
|
syruan
|
09d69775da
|
优化未结算报表查询性能
- 添加 totalCount 查询接口，避免全表扫描
- 重构列表查询逻辑，提高查询效率
- 优化数据处理方式，减少冗余操作
-增加参数预处理，提升 SQL 执行效率
|
2025-09-02 01:57:50 +08:00 |
|
hayu
|
01d5b2bdb4
|
修改
|
2025-09-02 01:30:40 +08:00 |
|
syruan
|
6262a382c2
|
Merge remote-tracking branch 'frps/master' into frp-master
|
2025-09-01 22:17:31 +08:00 |
|
syruan
|
8d79e7c931
|
未结算协议查询修正
|
2025-09-01 22:17:27 +08:00 |
|
hayu
|
e37b4bfb7b
|
修改
|
2025-09-01 20:53:11 +08:00 |
|
hayu
|
015c852ede
|
修改
|
2025-09-01 16:28:30 +08:00 |
|
hayu
|
27f942d77d
|
修改
|
2025-09-01 14:15:19 +08:00 |
|
mashuai
|
7a2a10372f
|
Merge remote-tracking branch 'origin/master'
|
2025-09-01 13:32:04 +08:00 |
|
mashuai
|
dab38a5b9c
|
功能优化
|
2025-09-01 13:31:50 +08:00 |
|
hayu
|
4598a2d5ea
|
修改
|
2025-09-01 13:22:58 +08:00 |
|
syruan
|
40c7c19aa8
|
增加消耗性物资结算功能
- 新增消耗性物资的租赁费用计算逻辑
- 增加安全工器具的结算相关字段和功能
- 优化已结算和未结算协议的处理流程
-调整数据库查询以支持新的结算类型
|
2025-09-01 01:39:44 +08:00 |
|
mashuai
|
aea731d3b8
|
Merge remote-tracking branch 'origin/master'
|
2025-08-31 22:41:19 +08:00 |
|
hayu
|
c2343ece82
|
修改
|
2025-08-31 22:33:53 +08:00 |
jiang
|
17ceb7b0c5
|
接口对接
|
2025-08-31 22:12:38 +08:00 |
|
mashuai
|
14d3bc2040
|
功能优化
|
2025-08-31 22:05:06 +08:00 |