Commit Graph

461 Commits

Author SHA1 Message Date
jiang f527ce1bda 问题修改 2025-10-13 19:16:40 +08:00
syruan 8ac9ac3dab 修改mapper 2025-10-13 19:16:20 +08:00
syruan 1de0d396b1 去冲冗余参数,修改对应mapper 2025-10-13 16:58:17 +08:00
syruan d6c8a97237 去冲冗余参数,修改对应mapper 2025-10-13 14:25:44 +08:00
jiang 59d67fbadc 问题修改 2025-10-12 14:16:35 +08:00
jiang a1d5f3ac04 问题修改 2025-10-10 21:51:34 +08:00
jiang 015a44309e 问题修改 2025-09-27 11:16:22 +08:00
jiang 04e2852366 问题修改 2025-09-25 19:20:28 +08:00
jiang 70f17ac59b 问题修改 2025-09-22 18:57:42 +08:00
jiang 04d000d0e2 Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-09-22 18:53:35 +08:00
jiang 742a8b31c4 问题修改 2025-09-22 18:53:28 +08:00
syruan d460556a4e Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-09-22 13:08:20 +08:00
syruan d17d536991 refactor: simplify CityScreenMapper queries by removing redundant conditions and adding longitude/latitude fields 2025-09-22 13:08:12 +08:00
jiang 264d2c96ad 问题修改 2025-09-22 10:00:27 +08:00
syruan fb0ec77c8f feat: update configuration and enhance MaType handling with new state grid property 2025-09-19 17:49:36 +08:00
syruan bd3f58d888 装备类型调整 2025-09-18 20:09:01 +08:00
syruan a08a45b216 enhance equipment management with new SysDeptVO and improved error handling 2025-09-17 18:10:01 +08:00
jiang 1e1db1892d 问题修改 2025-09-16 18:27:18 +08:00
syruan 8c16a8b9e7 fix(province): improve error handling and logging in equipment configuration retrieval 2025-09-16 18:12:03 +08:00
马三炮 97eb09437b 大屏 2025-09-16 16:26:10 +08:00
jjLv 6edbbe9db3 地市大屏 2025-09-15 23:24:54 +08:00
马三炮 ec17584681 大屏 2025-09-15 23:21:46 +08:00
方亮 ac05148928 添加装备/装备台账 2025-09-15 23:19:41 +08:00
方亮 da7eea810d 添加装备/装备台账 2025-09-15 21:56:18 +08:00
haozq 92a57ff383 修改包 2025-09-15 20:42:21 +08:00
马三炮 e7228b3177 大屏 2025-09-15 09:46:49 +08:00
syruan 4f6c7d6b1a feat(device): 新增设备管理方式字段
- 在 DevInfo 类中添加 deviceType 字段,用于表示设备管理方式(0: 编码, 1: 数量)- 在 DevInfoMapper.xml 中添加
2025-09-15 00:09:22 +08:00
haozq 5ea33d61e5 修改包 2025-09-14 22:16:28 +08:00
haozq a22d10e8f9 修改包 2025-09-14 15:56:37 +08:00
syruan 154e17ad50 添加装备原值和规格名称字段
- 在 DevInfo 类中添加 buyPrice 和 itemTypeModel 字段
- 更新 DevInfoMapper.xml,增加新字段的映射和操作
2025-09-13 20:25:59 +08:00
jiang bbdb2ee405 装备配置管理 2025-08-12 18:52:34 +08:00
mashuai 6ed92f3bf9 大屏优化 2025-07-16 08:54:00 +08:00
lizhenhua 252136cfeb 装备管理 youhua 2025-07-12 14:37:38 +08:00
lizhenhua e4d2e7abf8 装备管理 youhua 2025-07-10 18:41:40 +08:00
lizhenhua 9af0b8e332 装备管理 youhua 2025-07-10 17:11:43 +08:00
lizhenhua 21e47c1c78 装备管理 youhua 2025-07-10 15:47:00 +08:00
lizhenhua 9d0d798e1a 装备管理 youhua 2025-07-10 10:46:43 +08:00
lizhenhua ef087b8e4a 装备管理 youhua 2025-07-09 12:32:07 +08:00
lizhenhua 8af623096c 装备管理 youhua 2025-07-09 09:42:47 +08:00
mashuai beef2f7944 优化 2025-07-07 19:14:16 +08:00
liang.chao 5bd24cec66 代码提交 2025-07-07 10:06:32 +08:00
liang.chao 3c694f2fd9 代码提交 2025-07-07 08:52:02 +08:00
liang.chao 9db8a043a9 代码提交 2025-07-04 16:37:48 +08:00
liang.chao 4085364894 装备编辑可修改装备租金 2025-07-04 09:33:49 +08:00
liang.chao e46bca6cdb 大屏页面优化接口开发 2025-07-03 17:06:46 +08:00
bonus 50a4660f10 大屏类型在租次数修改 2025-04-25 11:24:45 +08:00
马三炮 368cf57386 bug修复 2025-03-26 17:55:16 +08:00
mashuai 96adeade60 优化 2025-03-19 17:12:47 +08:00
mashuai 15f9818de6 优化 2025-03-19 12:38:59 +08:00
mashuai e4fd3d5dff 大屏二级页面 2025-03-18 18:15:52 +08:00
马三炮 6e29cea504 二级页面 2025-03-18 18:12:17 +08:00
马三炮 62bad35573 二级页面 2025-03-18 13:14:38 +08:00
mashuai 56ce9e8f12 大屏二级页面 2025-03-18 12:18:22 +08:00
mashuai 266bd0f4ce 大屏 2025-03-18 10:59:58 +08:00
mashuai ae452f8598 Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-03-17 18:32:42 +08:00
马三炮 384287db5c 需求通知 2025-03-17 18:12:21 +08:00
mashuai 0e3276f618 11 2025-03-17 18:11:07 +08:00
mashuai ba6b3496d5 优化 2025-03-17 15:21:18 +08:00
mashuai 69938dc39f 大屏 2025-03-17 13:06:03 +08:00
马三炮 b63bde9f57 问题修复 2025-03-14 17:50:26 +08:00
mashuai ef8fd59d8b 大屏 2025-03-14 17:24:25 +08:00
mashuai 4ea5a3686e 大屏 2025-03-12 17:42:45 +08:00
mashuai 92f51eb9c0 通知公告 2025-03-12 14:52:48 +08:00
mashuai f2e39fd91a 优化 2025-03-11 16:23:51 +08:00
mashuai a87afeef23 优化 2025-03-11 15:05:03 +08:00
hongchao fddfd688a7 bug 修复 2025-03-10 16:57:28 +08:00
syruan a8a64cc426 新增企业专区接口,合同修改 2025-02-28 13:30:24 +08:00
mashuai 6f3f7d9c32 功能需求优化 2025-02-26 14:59:21 +08:00
syruan 7cd842073e 订单短信发送1 2025-02-25 17:10:55 +08:00
mashuai 50b984ba3b 功能需求优化 2025-02-25 16:50:16 +08:00
syruan 94c04684dc 订单短信发送 2025-02-25 13:54:46 +08:00
mashuai ff2d52126e 功能需求优化 2025-02-24 17:59:31 +08:00
mashuai f2b250e0b1 功能需求优化 2025-02-24 16:36:11 +08:00
syruan 21f8103961 优化问题 2025-02-24 15:49:21 +08:00
liang.chao 3827dad74a Merge remote-tracking branch 'origin/ah-simple' into ah-simple
# Conflicts:
#	bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
2025-02-21 18:44:19 +08:00
liang.chao 15515e28ee 合同协议功能开发 2025-02-21 18:43:12 +08:00
haozq a299791d26 Merge remote-tracking branch 'origin/ah-simple' into ah-simple
# Conflicts:
#	bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
2025-02-21 17:26:33 +08:00
haozq bab5c75074 订单号查询 2025-02-21 17:26:07 +08:00
mashuai e44616fc3f 功能需求优化 2025-02-21 17:16:55 +08:00
bonus f6bbc9d2f5 消息未读数开发 2025-02-14 09:24:40 +08:00
sxu 7f1e6de5f0 Merge branch 'master' into ah-simple 2025-01-23 10:16:41 +08:00
sxu 37caac54fc 代办优化 2025-01-23 10:15:35 +08:00
sxu 65afc2269d Merge branch 'master' into ah-simple 2025-01-23 10:01:27 +08:00
sxu dc217d8ac4 代办优化 2025-01-22 15:03:52 +08:00
sxu 6391be0117 Revert "代办优化"
This reverts commit e4f42a6456.
2025-01-22 13:53:39 +08:00
sxu e4f42a6456 代办优化 2025-01-22 09:57:13 +08:00
sxu 115de905e5 代办优化 2025-01-22 09:46:05 +08:00
liang.chao 670411c42d 消息已读功能修改 2025-01-21 18:26:50 +08:00
sxu 851297436b Merge branch 'master' into ah-simple 2025-01-15 09:24:11 +08:00
sxu 40e5c73bcd slideshow 2025-01-15 09:20:24 +08:00
sxu fa3a396d90 安徽简化版 2025-01-10 10:18:11 +08:00
sxu ff0a813807 大屏bug 2025-01-07 19:04:01 +08:00
sxu e1df8bf961 大屏bug 2025-01-07 18:10:59 +08:00
sxu 44f5f0c510 大屏bug 2025-01-07 17:48:26 +08:00
sxu 93996d1853 大屏bug 2025-01-07 17:40:32 +08:00
sxu 11534b3436 大屏bug 2025-01-07 16:04:59 +08:00
sxu 350150ac89 大屏bug 2025-01-07 15:41:05 +08:00
sxu a80aae8836 大屏:出租装备分析 2025-01-07 14:45:22 +08:00
sxu a94d150c5a 大屏:租赁需求分析 2025-01-07 14:30:52 +08:00
sxu 9fa708625b 大屏:装备共享排名 2025-01-07 13:29:22 +08:00
sxu 16efe3dbac 大屏:装备租赁互联 2025-01-06 17:59:37 +08:00
sxu b517031534 大屏:出租装备分析 2025-01-06 17:15:39 +08:00
sxu c7dde73e4f 大屏:闲置装备分析 2025-01-06 16:30:17 +08:00
sxu 8ce8e73ed3 需求详情 2025-01-02 18:08:33 +08:00
sxu 27b5de0b91 需求详情 2025-01-02 17:41:51 +08:00
sxu 3ed2059cde 订单消息 2025-01-02 15:44:46 +08:00
sxu 2b548896f0 大屏装备利用率计算 2025-01-02 14:30:31 +08:00
sxu cdb8193a75 装备上架按类型统计 2024-12-31 15:03:11 +08:00
sxu 2a15873c62 装备需求统计 2024-12-31 14:29:25 +08:00
sxu cde70380a4 装备租赁统计 2024-12-31 13:35:51 +08:00
sxu f2e848c0e4 装备租赁统计 2024-12-31 13:20:07 +08:00
sxu 9b007d4a0a 装备上架统计 2024-12-31 11:15:57 +08:00
sxu 9db2dd3c55 装备总数和上架总数 2024-12-31 10:21:35 +08:00
sxu 29b7988f83 搜索 2024-12-30 17:45:11 +08:00
liang.chao 71634e3ca3 快捷回复查询bug修改 2024-12-30 17:19:26 +08:00
sxu c8db2df18c Merge remote-tracking branch 'origin/master' 2024-12-27 18:59:24 +08:00
liang.chao f72c6fc29d 安全证书查询bug修改 2024-12-27 16:16:43 +08:00
liang.chao 7cc2b1410c 相关功能优化 2024-12-27 15:38:14 +08:00
sxu f30e571a10 todolist get order by code 2024-12-27 14:48:04 +08:00
sxu 44352c5b68 todolist taskStatus 2024-12-27 13:55:03 +08:00
sxu a521cf21a3 Merge remote-tracking branch 'origin/master' 2024-12-27 13:53:26 +08:00
sxu ea37a7df12 统计订单数,按角色 2024-12-27 13:51:46 +08:00
liang.chao 0352bc784c 装备详情质检证书取最新质检报告 2024-12-27 10:13:50 +08:00
sxu ab69f00a80 Merge remote-tracking branch 'origin/master' 2024-12-26 18:11:28 +08:00
liang.chao b9721cf32b 安全证书质检管理 维修保养、接单、审核、驳回发送消息 2024-12-26 18:09:29 +08:00
sxu e6ae06d412 购物车批量删除 2024-12-26 18:09:09 +08:00
liang.chao 95de8db2da 消息管理流程逻辑修复 装备质检以及接单存放消息功能 2024-12-26 10:36:27 +08:00
sxu f275562dc0 待办 2024-12-25 15:27:45 +08:00
sxu de8c05fef4 待办 2024-12-25 15:21:26 +08:00
sxu 6b876c137f 待办 2024-12-25 14:44:47 +08:00
sxu 9a0b35ce96 待办 2024-12-25 14:41:57 +08:00
sxu a7d37d89df 待办 2024-12-25 14:33:29 +08:00
sxu 34ee953d7e 待办 2024-12-25 13:58:09 +08:00
sxu 416fc2bf6c 待办 2024-12-25 13:42:04 +08:00
sxu 6e26b144ff 待办 2024-12-25 13:26:35 +08:00
sxu a9ca59b733 待办 2024-12-25 12:08:57 +08:00
liang.chao ae9d118c49 消息管理联调以及大屏接口开发 2024-12-24 17:55:55 +08:00
sxu 179ddfa584 fix conflict 2024-12-23 18:41:25 +08:00
sxu aaa5105fb1 消息 2024-12-23 18:40:08 +08:00
liang.chao 9fe6348c4e 消息管理 2024-12-23 18:39:40 +08:00
liang.chao 0f127d5b6a 消息管理 2024-12-23 17:04:21 +08:00
liang.chao 9dce8c3b3d 消息管理 2024-12-23 13:33:27 +08:00
sxu 73e4f593fe 消息 2024-12-23 11:07:09 +08:00
liang.chao 48d9ebf531 装备质检记录bug修改 2024-12-23 11:03:22 +08:00
liang.chao 63ec64e82a 装备列表返回质检周期 2024-12-23 10:15:42 +08:00
liang.chao 3821004d0e 详情增加检测记录图片 2024-12-23 10:07:37 +08:00
liang.chao 605d43b75d 消息通知 2024-12-20 20:19:28 +08:00
liang.chao a67e45e240 返回预警天数 2024-12-20 19:46:54 +08:00
liang.chao af018df883 消息通知 2024-12-20 19:45:24 +08:00
liang.chao accc93b0a6 装备编辑回显装备证书 2024-12-20 19:29:47 +08:00