Commit Graph

1801 Commits

Author SHA1 Message Date
liang.chao 8e1aa0be95 代码提交 2025-09-05 09:33:45 +08:00
mashuai ce1c35d31c 功能优化 2025-09-04 23:28:15 +08:00
mashuai 3014474c88 功能优化 2025-09-04 22:54:30 +08:00
liang.chao 98ba908bf8 代码提交 2025-09-04 21:26:17 +08:00
liang.chao 7025f28b46 代码提交 2025-09-04 21:18:44 +08:00
liang.chao 64a0130fe5 代码提交 2025-09-04 21:01:32 +08:00
liang.chao f8fc86dc2c 代码提交 2025-09-04 21:00:15 +08:00
liang.chao 6ba1e886f3 Merge remote-tracking branch 'origin/master' 2025-09-04 20:57:12 +08:00
liang.chao 13aa60f1c5 代码提交 2025-09-04 20:57:07 +08:00
liang.chao 81f82e3007 代码提交 2025-09-04 19:54:59 +08:00
hongchao cd8f82eb1b 检修预警柱状图总公司接口修改 2025-09-04 18:52:02 +08:00
hongchao 0aa12bd997 大屏检修预警修复 2025-09-04 18:26:28 +08:00
syruan c3253543ce 添加冲账功能并优化区间费用计算
- 在 PeriodCostResultVo 中添加 markTime 字段,用于冲账日期- 在 SltAgreementInfoMapper 中添加 selectPeriodCostListForCharge 方法,用于查询冲账记录- 更新 SltAgreementInfoMapper.xml,添加新的 SQL 查询语句
- 修改 SltAgreementInfoServiceImpl 中的查询逻辑,加入冲账数据处理
- 优化区间费用汇总功能,增加对未填写协议编号的校验
2025-09-04 16:00:06 +08:00
liang.chao 4ca2b3e091 Merge remote-tracking branch 'origin/master' 2025-09-04 15:46:39 +08:00
liang.chao c66fc79469 代码提交 2025-09-04 15:46:32 +08:00
hayu b8cf2f3c2a 修改 2025-09-04 14:43:55 +08:00
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