wangna0328
|
f8503e3382
|
Merge remote-tracking branch 'origin/development' into development
|
2025-08-13 14:40:24 +08:00 |
|
wangna0328
|
9585f6dd39
|
项目甘特图后端接口设计
|
2025-08-13 14:39:15 +08:00 |
Mr.j
|
2dec48a83f
|
Merge branch 'master' into development
|
2025-08-13 14:33:46 +08:00 |
|
Mr.j
|
4a9eca9387
|
Merge remote-tracking branch 'origin/development' into development
|
2025-08-13 11:37:18 +08:00 |
郝彬
|
a939b45246
|
Merge remote-tracking branch 'origin/development' into development
|
2025-08-13 10:31:39 +08:00 |
|
郝彬
|
bd7cf2123e
|
Merge branch 'master' into development
# Conflicts:
# core/src/main/java/com/dite/znpt/domain/entity/EquipmentEntity.java
# core/src/main/java/com/dite/znpt/domain/vo/ProjectTasksDetailResp.java
# core/src/main/java/com/dite/znpt/service/impl/ProjectTaskServiceImpl.java
# web/src/main/java/com/dite/znpt/web/controller/ProjectController.java
# web/src/main/java/com/dite/znpt/web/controller/ProjectTaskController.java
|
2025-08-13 10:31:04 +08:00 |
|
Mr.j
|
36720e7a38
|
实现设备盘库的分页查询
|
2025-08-13 10:19:30 +08:00 |
|
郝彬
|
f500082ea6
|
8-13 项目立项时使合同同步关联该项目
|
2025-08-13 10:08:35 +08:00 |
|
Mr.j
|
a66ac26002
|
Merge remote-tracking branch 'origin/development' into development
|
2025-08-13 09:29:09 +08:00 |
|
Mr.j
|
e19d849045
|
修复设备管理相关功能分页查询表格无法顺利下拉和分页条不固定问题
|
2025-08-13 09:28:41 +08:00 |
何德超
|
f55724cac5
|
Merge remote-tracking branch 'origin/development' into development
|
2025-08-13 09:12:22 +08:00 |
|
郝彬
|
3ad1389539
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
|
2025-08-12 17:58:43 +08:00 |
|
郝彬
|
86ce3a6a2f
|
8-12 查询所有未立项合同，新增项目时可直接选择对应合同
|
2025-08-12 17:57:54 +08:00 |
|
Mr.j
|
53aa75d37b
|
修复设备管理相关功能分页查询无法分页和正确获取总页数的问题
|
2025-08-12 17:49:17 +08:00 |
|
何德超
|
19e9bb7978
|
净空形变视频监测后端
|
2025-08-12 17:21:49 +08:00 |
|
何德超
|
2708a02588
|
净空形变视频监测后端
|
2025-08-12 17:20:09 +08:00 |
|
郝彬
|
71f39d8732
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
|
2025-08-12 11:41:06 +08:00 |
ybb
|
f7b877aef8
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
|
2025-08-12 11:35:20 +08:00 |
|
ybb
|
28b763fb2d
|
8月12，实现了能够按名称的拼音排序，和更改时间排序等。
|
2025-08-12 11:34:45 +08:00 |
|
郝彬
|
181cbfec80
|
8-12 施工规模(风机数量)下放至任务中管理，可以计算任务进度，项目总进度
|
2025-08-12 11:33:58 +08:00 |
cuizhibin
|
2701f7fd46
|
合同-修复查询问题
|
2025-08-12 10:40:50 +08:00 |
|
cuizhibin
|
7ce85c6e80
|
合同-修复查询问题
|
2025-08-12 10:06:05 +08:00 |
|
cuizhibin
|
987c4eeb38
|
合同，项目id更改为项目名称
|
2025-08-12 09:22:06 +08:00 |
|
wangna0328
|
5871635e4c
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
|
2025-08-11 18:04:55 +08:00 |
|
wangna0328
|
ba2f7ecbea
|
项目看板模块方法修改联调
|
2025-08-11 17:58:50 +08:00 |
|
Mr.j
|
2db53fd62e
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
|
2025-08-11 17:12:58 +08:00 |
|
Mr.j
|
1277b40705
|
修复设备采购状态图无法顺利依据流程变化的问题
|
2025-08-11 17:12:09 +08:00 |
|
wangna0328
|
15086236ea
|
项目人员模块crud方法联调
|
2025-08-11 15:23:39 +08:00 |
|
郝彬
|
36958212f0
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
|
2025-08-11 14:25:49 +08:00 |
|
郝彬
|
7496486a5e
|
8-11 项目立项时可初始化任务列表一次性增加多个属于该项目的任务（需设置任务名称、任务编号、计划开始/结束时间、任务组id、负责人id）
|
2025-08-11 14:23:52 +08:00 |
|
Mr.j
|
de2439e65d
|
实现了消息中心显示最新申请消息，并可以查看消息然后点击跳转到具体的审批台
|
2025-08-11 11:19:38 +08:00 |
 崔芝斌
|
8a968f1a49
|
Merge pull request '合并development代码到master' (#1) from development into master
Reviewed-on: http://pms.dtyx.net:3000/cuizhibin/znpt-backend/pulls/1
|
2025-08-11 09:25:53 +08:00 |
|
Mr.j
|
c15dd69cd9
|
Merge remote-tracking branch 'origin/development' into development
|
2025-08-11 09:18:27 +08:00 |
|
Mr.j
|
f63b96a178
|
修改配置文件数据库为znpt_dev
|
2025-08-11 09:16:12 +08:00 |
|
郝彬
|
70db15a6fd
|
Merge remote-tracking branch 'origin/development' into development
|
2025-08-08 17:55:38 +08:00 |
|
Mr.j
|
4f7d53aba7
|
合并最新代码
|
2025-08-08 17:47:48 +08:00 |
|
Mr.j
|
74550c615b
|
实现申请采购推送信息到审批台出现语音提示和闪烁提示
|
2025-08-08 17:35:06 +08:00 |
|
郝彬
|
078f0699fa
|
8-8 查询项目下的设备和任务完成进度
|
2025-08-08 16:25:07 +08:00 |
|
Mr.j
|
01455720be
|
实现审批台接收到采购申请信息
|
2025-08-08 15:43:27 +08:00 |
|
ybb
|
231faee0d0
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
# Conflicts:
# core/pom.xml
# core/src/main/java/com/dite/znpt/domain/entity/BusinessDataEntity.java
# core/src/main/java/com/dite/znpt/domain/entity/BusinessDataFileEntity.java
# core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java
# core/src/main/java/com/dite/znpt/mapper/BusinessDataMapper.java
# core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java
# core/src/main/java/com/dite/znpt/service/BusinessDataService.java
# core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java
# core/src/main/java/com/dite/znpt/service/impl/BusinessDataServiceImpl.java
# web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java
|
2025-08-08 15:17:51 +08:00 |
|
ybb
|
3b3aa95437
|
8/7,ybb文件夹和文件都实现了记录Id功能。
|
2025-08-08 15:15:26 +08:00 |
|
郝彬
|
386c7273ce
|
8-8 查询项目下的设备和任务完成进度
|
2025-08-08 15:09:21 +08:00 |
|
wangna0328
|
389c8a58b0
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
|
2025-08-08 15:03:00 +08:00 |
|
wangna0328
|
d4b06d9c66
|
消除人员重复bug
|
2025-08-08 14:52:14 +08:00 |
|
Mr.j
|
91c54aaf5e
|
Merge remote-tracking branch 'origin/jgq' into development
|
2025-08-08 10:49:39 +08:00 |
|
wangna0328
|
b45766d377
|
项目人员模块代码更新
|
2025-08-08 09:17:54 +08:00 |
|
wangna0328
|
386561125e
|
项目人员模块代码更新
|
2025-08-07 18:00:40 +08:00 |
|
wangna0328
|
32d43e5a3b
|
修复 ProjectMemberController 的合并冲突并完成修改
|
2025-08-07 17:56:30 +08:00 |
|
wangna0328
|
e1259d904a
|
接口类合并冲突解决
|
2025-08-07 17:54:45 +08:00 |
|
Mr.j
|
40c11dd974
|
实现审批台的基础查询功能
|
2025-08-07 16:47:42 +08:00 |