Commit Graph

325 Commits

Author SHA1 Message Date
3c3b1821f1 fix 根据重新获取任务间隔 2024-06-14 16:35:38 +08:00
0452fca141 fix 调整创建人1 2024-06-14 11:30:00 +08:00
b9b96f1bfc fix 用户同步和设备ignoreTenant 2024-06-14 10:17:14 +08:00
0e1ba8446d fix 升级数据权限问题 2024-06-13 15:29:49 +08:00
15c67a4f78 fix 增加部门名称,数据权限控制 2024-06-13 14:26:46 +08:00
5d9dcc3752 fix 心跳间隔为0默认为活跃状态 2024-06-12 12:17:55 +08:00
1975e37294 fix 补充缺少字段 2024-06-12 12:17:55 +08:00
d3a9cb62c3 fix 任务根据设备心跳状态获取 2024-06-12 12:17:55 +08:00
478965a23a fix 设备组重组 2024-06-12 12:17:55 +08:00
a15e0f5754 fix 任务根据设备心跳状态获取 2024-06-12 12:11:42 +08:00
b51c2cd642 fix 设备组重组 2024-06-12 12:11:42 +08:00
51b0397763 feat 档案人脸分页状态 2024-06-12 12:11:41 +08:00
f1bf86ec0c fix 门禁首页统计优化 2024-06-12 12:11:41 +08:00
82a3994d4d fix 任务根据设备心跳状态获取 2024-06-12 12:11:41 +08:00
0a7898cd73 fix 设备组重组 2024-06-12 12:11:41 +08:00
73d8d67504 feat 数据敏感分配角色可见,切换基地,定时任务lock 2024-06-12 12:11:41 +08:00
a052e77e53 fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除 2024-06-12 12:11:41 +08:00
47e92be51f feat 内部余额写入 2024-06-10 19:13:43 +08:00
a3f4950df2 fix 任务获取支持根据厂区 2024-06-07 18:05:29 +08:00
b93cff743c fix 工作地海宁餐补处理 2024-06-05 15:42:46 +08:00
7a63d23706 fix 海宁储能餐补 2024-06-05 15:16:59 +08:00
582393e45d fix 并发执行问题,保密人员余额迁移 2024-06-04 21:38:12 +08:00
9af6472be6 fix 数据处理 2024-06-04 14:40:52 +08:00
95f55732cc test usercode 2024-06-04 14:26:56 +08:00
0a7fc847f0 test 处理第一个数据异常问题 2024-06-04 14:23:51 +08:00
a2d97f25af test data 2024-06-04 14:15:05 +08:00
9812275c8f test 数据检查 2024-06-04 14:10:21 +08:00
60aac5a03a test 查询数据count 2024-06-04 13:14:48 +08:00
16f0d75f22 test ignore 2024-06-04 13:13:08 +08:00
1a338f9fa3 test 测试异常数据数量 2024-06-04 12:22:16 +08:00
1c709652f5 fix 海宁餐补 2024-05-31 22:07:15 +08:00
7f14b1fdc5 fix 优化任务分配速度 2024-05-30 23:01:21 +08:00
5c30638274 fix 优化datetime格式 2024-05-30 20:44:41 +08:00
75bd31d4a5 feat 外包人员,框架升级 2024-05-30 19:37:27 +08:00
Kurris
5aaaa81353 fix 移除人员判断语句 2024-05-27 09:43:32 +08:00
Kurris
47cb34d4c6 fix 补充日志调试 2024-05-27 09:20:38 +08:00
Kurris
aa1a84a5a7 fix 减少获取同步数据 2024-05-27 09:08:02 +08:00
Kurris
9f5f1652ae fix 表达式错误 2024-05-27 09:01:40 +08:00
Kurris
22c450519b fix 表达式错误 2024-05-27 08:52:06 +08:00
Kurris
a39f792edd fix 数据过滤调整 2024-05-25 01:53:59 +08:00
7e2c0c7e39 fix 外包人员,餐补导入,人员列表 2024-05-24 15:28:31 +08:00
1422d6836c feat 获取出差信息 2024-05-24 15:11:17 +08:00
9885c8d9ae feat 组织架构 2024-04-23 19:10:23 +08:00
089f020110 fix 优化代码 2024-04-22 14:09:58 +08:00
e6071b47f1 fix 获取日志最后一条处理 2024-04-21 09:39:14 +08:00
fa8ffb5cf6 fix 字典获取值问题 2024-04-21 09:35:09 +08:00
b3b1952ba0 fix 恢复注释代码 2024-04-20 15:37:08 +08:00
f8d1997ddd Squashed commit of the following:
commit 528cdd51c05d26437f0b23f415e06311b667e9f7
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Wed Apr 17 15:37:30 2024 +0800

    feat 访客预约

commit e73a3fcd9307f86aba2c39578495c03cde1d41f9
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Apr 16 16:15:16 2024 +0800

    feat 业务curd

commit b98b6e2764fea875866e11f790f388ccf3c234b5
Merge: a3dcec3 965e84b
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Apr 16 14:56:30 2024 +0800

    Merge branch 'feat-visitorAppointments' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-visitorAppointments

commit a3dcec30e1289fbb09de8f85009d3931d971337a
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:57:49 2024 +0800

    fix appsettings

commit 766fbec0c45a3852a75a7a37686b885ac3b0a77a
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:37:01 2024 +0800

    add dockerfile

commit 86731d41fee97ba073065ed1b807987760a371a7
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Sun Apr 14 20:11:56 2024 +0800

    fix 测试websocket链接

commit 1301b126a9ba9a7d97cf45967cf2915e1169c505
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:57:49 2024 +0800

    fix appsettings

commit 081f3a67896c67891c3f80edde82a440b8736851
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:37:01 2024 +0800

    add dockerfile

commit 271b6c5898b5732a35ccfa0629ce89442ac49143
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:34:26 2024 +0800

    test 提交测试代码

commit 965e84b6f3b7f925f8021c9b996cce961b896dea
Merge: 578eb6a 6a6fad1
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Mon Apr 15 17:06:45 2024 +0800

    Merge branch 'feat-visitorAppointments' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-visitorAppointments

commit 578eb6afbd96f0bfe4aaf8058fd4743309c74d62
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Sun Apr 14 20:11:56 2024 +0800

    fix 测试websocket链接

commit 114511f1daea64b7dbf9c3c38b73e28b6d0301e6
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:57:49 2024 +0800

    fix appsettings

commit 5eacfa8af8087eade8553266a12a2cf42305716b
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:37:01 2024 +0800

    add dockerfile

commit b2ffff1f099be343d89690014d05cb859776acbb
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:34:26 2024 +0800

    test 提交测试代码

commit 6a6fad1d1b8772eebf5df12cd74cfd5c955ff560
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Sun Apr 14 20:11:56 2024 +0800

    fix 测试websocket链接

commit 9ce3c4d6f63957c175d65370d9a6b80e10f4254f
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:57:49 2024 +0800

    fix appsettings

commit c637fd89850cf289d7da457c6c6f47354b5beed3
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:37:01 2024 +0800

    add dockerfile

commit 58c39815b1c45a99aea0caf503fcb1365c957f03
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Fri Apr 12 17:34:26 2024 +0800

    test 提交测试代码
2024-04-20 15:29:52 +08:00
a2c121eadc fix 时间变更,在线订单转离线情况 2024-04-19 16:10:18 +08:00
c4393d46ce fix 补充werks记录 2024-04-18 16:22:14 +08:00