|
|
d6829fce27
|
fix(#10):修复空指针
|
2023-08-11 15:31:24 +08:00 |
|
|
|
683907b363
|
fix(#10): 计算相关读取数据部分debug完成
|
2023-08-11 13:13:45 +08:00 |
|
|
|
c1b84d1fbb
|
Merge branch '0.2' of https://git.archgrid.xyz/free-lancers/electricity_bill_calc_service into 0.2
|
2023-08-11 11:00:32 +08:00 |
|
|
|
2021d67d03
|
fix(#10):修复空指针
|
2023-08-11 10:59:53 +08:00 |
|
|
|
b988ffcb75
|
fix(pooled): 增加缺少字段loss
|
2023-08-11 10:57:45 +08:00 |
|
|
|
361b302407
|
Merge branch '0.2' of https://git.archgrid.xyz/free-lancers/electricity_bill_calc_service into 0.2
|
2023-08-11 10:37:40 +08:00 |
|
|
|
d8f470e660
|
fix(#10): 修复部分计算错误，遗留问题在pooled中的deteminePublicMeterConsumpyions里时间为空错误
|
2023-08-11 10:37:17 +08:00 |
|
|
|
c472eb4196
|
fix(#17):修复有绑定表计的商户迁出时无法迁出的错误
|
2023-08-11 09:02:57 +08:00 |
|
|
|
98866a8de5
|
fix(#16):修复商户入驻时间为指定日期，并非当前日期
|
2023-08-10 16:33:41 +08:00 |
|
|
|
c89a5f20ad
|
fix(doc): 注释优化
|
2023-08-10 16:13:12 +08:00 |
|
|
|
01e944cb5a
|
fix(meter): 修改结构体MeterCreationForm中的字段名称，和此结构体的调用处
|
2023-08-10 16:12:13 +08:00 |
|
|
|
c2d43bd98e
|
fix（#15): 修复: 更换表计的时候，在代码中接收了参数未作任何处理
|
2023-08-10 15:27:59 +08:00 |
|
|
|
a543b33276
|
Merge branch '0.2' of https://git.archgrid.xyz/free-lancers/electricity_bill_calc_service into 0.2
|
2023-08-10 15:03:49 +08:00 |
|
|
|
6289257ac1
|
fix(#13):修复历史电费核算时未选择园区时显示园区中的数据，选中某一园区时显示不同园区的数据
|
2023-08-10 14:54:12 +08:00 |
|
|
|
5d997c14ee
|
Merge branch '0.2' of https://git.archgrid.xyz/free-lancers/electricity_bill_calc_service into 0.2
|
2023-08-10 10:49:47 +08:00 |
|
|
|
b50eabbca6
|
fix（meter): 修复：更换电表时的修改逻辑
|
2023-08-10 10:49:40 +08:00 |
|
|
|
a34aa6ad07
|
fix(#12):修复抄表记录与表记管理处无论选择任何表记类型只会显示全部错误
|
2023-08-10 09:54:57 +08:00 |
|
|
|
3d918eea85
|
fix(tenement): 解决向园区中指定商户下绑定一个新的表计时时间异常问题
|
2023-08-10 09:32:38 +08:00 |
|
|
|
7f46f2f36b
|
fix(calculate): 修复创建报表时的状态错误
|
2023-08-09 16:24:16 +08:00 |
|
|
|
ed10996a06
|
Merge branch '0.2' of https://git.archgrid.xyz/free-lancers/electricity_bill_calc_service into 0.2
|
2023-08-09 15:44:10 +08:00 |
|
|
|
2aa3729e03
|
fix(#12):修复抄表记录与表记管理处无论选择任何表记类型只会显示全部错误
|
2023-08-09 15:42:37 +08:00 |
|
|
|
7d59121c2f
|
fix(report): 调试，历史电费核算部分
|
2023-08-09 15:35:02 +08:00 |
|
|
|
b2efb972dc
|
fix(report): 调试，历史电费核算部分
|
2023-08-09 15:28:17 +08:00 |
|
|
|
5f750dd0e0
|
Merge branch '0.2' of https://git.archgrid.xyz/free-lancers/electricity_bill_calc_service into 0.7
|
2023-08-09 10:51:57 +08:00 |
|
|
|
dd6becc994
|
fix(#10):修复创建报表错误，但查出列出园区bug
|
2023-08-09 10:48:33 +08:00 |
|
|
|
b59e24333e
|
fix(report): 修复核算报表中园区获取错误
|
2023-08-09 09:18:51 +08:00 |
|
|
|
00cf35ec2a
|
fix(#10):修复创建报表错误，但查出列出园区bug
|
2023-08-08 17:41:16 +08:00 |
|
|
|
ed5a3f6c0a
|
fix(#5):修复为前端下列表记提供的接口
|
2023-08-08 15:21:12 +08:00 |
|
|
|
a593666542
|
fix(authorized_loss_rate): 修复获取系统中定义的基准核定线损率错误
|
2023-08-08 14:43:45 +08:00 |
|
|
|
8a4be5328e
|
fix(#8): 合并分支处理冲突时候遗留问题，并且注释中的问题未处理。
|
2023-08-08 14:02:20 +08:00 |
|
|
|
0135b81080
|
doc(settings): 设置基准线损率为7%
|
2023-08-08 13:57:05 +08:00 |
|
|
|
fb328514d1
|
fix(config): 优化redis的连接，同一调取配置文件内的
|
2023-08-08 13:51:00 +08:00 |
|
|
|
ad1b816795
|
fix(#5):修复抄表管理页面显示的表计信息多余数据库中的数据
|
2023-08-08 13:47:02 +08:00 |
|
|
|
fe7f8bd692
|
Merge branch '0.2' of https://git.archgrid.xyz/free-lancers/electricity_bill_calc_service into 0.2
|
2023-08-08 13:34:29 +08:00 |
|
|
|
f55cc07b1c
|
doc(gitignore):
|
2023-08-08 13:34:23 +08:00 |
|
|
|
a3d4dbfca5
|
fix:#6 解决表号为空时候的sql错误
|
2023-08-08 13:24:58 +08:00 |
|
|
|
2bab62512a
|
doc(gitignore)：禁止goland个性化配置上传
|
2023-08-08 10:33:48 +08:00 |
|
|
|
e3c34c96e2
|
enhance(sync):同步管理路由添加
|
2023-08-08 10:05:37 +08:00 |
|
|
|
a34fee8339
|
fix(meterDetail): 增加缺少字段display_ratio
|
2023-08-08 08:54:19 +08:00 |
|
|
|
69357f77dd
|
fix(report):修复更新指定的核算任务与初始化一个新的核算任务
|
2023-08-07 17:33:38 +08:00 |
|
|
|
27a499b8cc
|
fix(report): 修复启动指定核算任务的计算功能
|
2023-08-07 17:05:29 +08:00 |
|
|
|
568deaf972
|
enhance(report):
|
2023-08-07 17:00:46 +08:00 |
|
|
|
f995b89ea9
|
test(config):合并分时提交的配置文件
|
2023-08-07 15:32:10 +08:00 |
|
|
|
cd56f2b444
|
test(user): 用于合并分支
|
2023-08-07 15:30:50 +08:00 |
|
|
|
8163fd99ee
|
Merge pull request 'enhance(calculate): 完善计算部分' (#3) from Deka_123/electricity_bill_calc_service:newBranch into 0.2
Reviewed-on: free-lancers/electricity_bill_calc_service#3
|
2023-08-07 15:24:21 +08:00 |
|
|
|
0e365cdb6b
|
enhance(calculate): 完善计算部分
|
2023-08-07 15:15:11 +08:00 |
|
|
|
020e76b901
|
合并分支
|
2023-08-04 17:11:10 +08:00 |
|
|
|
79d55505a7
|
Merge pull request 'ZiHangQinBranch' (#2) from ZiHangQin/electricity_bill_calc_service:ZiHangQinBranch into 0.2
Reviewed-on: free-lancers/electricity_bill_calc_service#2
|
2023-08-04 15:01:24 +08:00 |
|
|
|
af359f4429
|
enhance(calculate): 增加方法：计算商户的合计电费信息，并归总与商户相关关联的表计记录
|
2023-08-04 14:38:03 +08:00 |
|
|
|
ce4c483bcb
|
[计算相关]计算已经启用的商铺面积和（完成)
|
2023-08-04 11:09:04 +08:00 |
|
