wangna0328
|
b45766d377
|
项目人员模块代码更新
|
2025-08-08 09:17:54 +08:00 |
|
wangna0328
|
386561125e
|
项目人员模块代码更新
|
2025-08-07 18:00:40 +08:00 |
|
wangna0328
|
e1259d904a
|
接口类合并冲突解决
|
2025-08-07 17:54:45 +08:00 |
Mr.j
|
40c11dd974
|
实现审批台的基础查询功能
|
2025-08-07 16:47:42 +08:00 |
ybb
|
e356368b62
|
8/7,ybb文件夹和文件都实现了记录Id功能。
|
2025-08-07 16:06:15 +08:00 |
cuizhibin
|
3ec94f8487
|
删除convertsImpl
|
2025-08-07 15:40:31 +08:00 |
|
cuizhibin
|
e557a5df86
|
Merge branch 'merge'
# Conflicts:
# core/src/main/java/com/dite/znpt/domain/dto/FolderDto.java
# 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/domain/entity/EquipmentEntity.java
# core/src/main/java/com/dite/znpt/domain/page/PageBean.java
# core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoDetailResp.java
# core/src/main/java/com/dite/znpt/enums/HealthStatusEnum.java
# core/src/main/java/com/dite/znpt/enums/LocationStatusEnum.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/EmailService.java
# core/src/main/java/com/dite/znpt/service/ProjectBudgetInfoService.java
# core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java
# core/src/main/java/com/dite/znpt/service/impl/BusinessDataServiceImpl.java
# core/src/main/java/com/dite/znpt/service/impl/EmailServiceImpl.java
# core/src/main/java/com/dite/znpt/service/impl/EquipmentServiceImpl.java
# core/src/main/java/com/dite/znpt/service/impl/InMemoryVerificationCodeStore.java
# core/src/main/java/com/dite/znpt/service/impl/ProjectBudgetInfoServiceImpl.java
# core/src/main/resources/mapper/BusinessDataFileMapper.xml
# core/src/main/resources/mapper/BusinessDataMapper.xml
# web/src/main/java/com/dite/znpt/web/controller/BusinessDataController.java
# web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java
# web/src/main/java/com/dite/znpt/web/controller/EmailController.java
# web/src/main/java/com/dite/znpt/web/controller/EquipmentController.java
# web/src/main/java/com/dite/znpt/web/controller/PostController.java
# web/src/main/java/com/dite/znpt/web/controller/ProjectBudgetInfoController.java
|
2025-08-07 15:38:22 +08:00 |
|
cuizhibin
|
a996310f25
|
代码合并问题处理
|
2025-08-07 15:33:32 +08:00 |
|
Mr.j
|
c6d44f1787
|
忽略提交pom.xml，yaml文件，完成设备采购模块的新增和编辑功能
|
2025-08-07 14:35:43 +08:00 |
|
ybb
|
50659ef1a7
|
8/7,ybb文件夹和文件都实现了记录Id功能。
|
2025-08-07 11:26:02 +08:00 |
|
ybb
|
2a4ac18052
|
8/7,ybb文件夹和文件都实现了记录Id功能。
|
2025-08-07 09:50:34 +08:00 |
|
wangna0328
|
de02aa3891
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
|
2025-08-06 17:53:29 +08:00 |
|
wangna0328
|
854d311307
|
修复制度不显示问题
|
2025-08-06 17:51:42 +08:00 |
郝彬
|
0f67c55892
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
# Conflicts:
# pom.xml
|
2025-08-06 17:03:14 +08:00 |
|
Mr.j
|
e7d892f8a2
|
Merge remote-tracking branch 'origin/master'
|
2025-08-06 16:52:03 +08:00 |
|
郝彬
|
14ee89c4af
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
# Conflicts:
# core/src/main/java/com/dite/znpt/domain/entity/ProjectBudgetInfoEntity.java
# core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoReq.java
# core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoResp.java
# core/src/main/java/com/dite/znpt/service/impl/ProjectBudgetInfoServiceImpl.java
# core/src/main/resources/mapper/ProjectBudgetInfoMapper.xml
# web/src/main/java/com/dite/znpt/web/controller/PostController.java
|
2025-08-06 16:50:51 +08:00 |
|
wangna0328
|
39ec9a99bd
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
|
2025-08-06 16:25:08 +08:00 |
|
Mr.j
|
275cb94c02
|
完善jgq分支内容到master分支
|
2025-08-06 16:23:57 +08:00 |
|
Mr.j
|
64d40d0f84
|
Merge remote-tracking branch 'origin/jgq'
|
2025-08-06 16:08:40 +08:00 |
|
郝彬
|
67d943af61
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoImportReq.java
# core/src/main/java/com/dite/znpt/service/impl/UserServiceImpl.java
# core/src/main/resources/mapper/ProjectMapper.xml
# core/src/main/resources/mapper/UserMapper.xml
# pom.xml
# web/src/main/java/com/dite/znpt/web/controller/VideoController.java
|
2025-08-06 16:00:53 +08:00 |
高雄
|
7034fecc0b
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
|
2025-08-06 15:15:56 +08:00 |
|
高雄
|
adc074804e
|
岗位中增加部门信息，岗位列表查询条件支持按部门（及子部门）查询
|
2025-08-06 15:14:59 +08:00 |
|
cuizhibin
|
ac23b19b0a
|
合同新增字段
|
2025-08-06 15:03:03 +08:00 |
|
wangna0328
|
8bdbbdccd5
|
项目人员调度模块前端卡片接口联调
|
2025-08-06 14:43:11 +08:00 |
|
郝彬
|
dbbd3922f9
|
8-6 取消预算单同步删除数据库的使用记录，并撤回预算消费，创建项目时自动计算总预算
|
2025-08-06 14:30:30 +08:00 |
|
cuizhibin
|
4befd2d588
|
图片列表增加上传时间
|
2025-08-06 13:43:19 +08:00 |
|
cuizhibin
|
5aa29cc3dd
|
图片列表增加上传时间
|
2025-08-06 13:41:22 +08:00 |
|
郝彬
|
0548238a18
|
8-6 新增预算单同步修改数据库的使用记录
|
2025-08-06 10:02:38 +08:00 |
|
郝彬
|
1c136ed302
|
Merge remote-tracking branch 'origin/master'
|
2025-08-06 09:45:43 +08:00 |
|
郝彬
|
8c7a441662
|
8-6 根据项目id查询其相关预算汇总
|
2025-08-06 09:44:22 +08:00 |
|
wangna0328
|
f2d2800f79
|
修改部署后出现的报错
|
2025-08-06 09:38:41 +08:00 |
|
wangna0328
|
bce91a4951
|
修改后出现错误，版本回退
|
2025-08-06 09:21:21 +08:00 |
|
ybb
|
b94f7d3f44
|
Merge branch 'master' of https://gitee.com/xswl_123/dite-shixi-bakcend
|
2025-08-06 08:48:55 +08:00 |
|
ybb
|
d7066714e5
|
8/6,ybb文件模糊查询功能
|
2025-08-06 08:48:15 +08:00 |
|
cuizhibin
|
28ebad9966
|
文件列表排序
|
2025-08-05 21:42:16 +08:00 |
|
cuizhibin
|
9b963d43f5
|
被删除文件恢复
|
2025-08-05 21:38:54 +08:00 |
|
wangna0328
|
1544e3e829
|
消除分支冲突
|
2025-08-05 20:44:22 +08:00 |
|
wangna0328
|
ade816ab3f
|
代码修改部分重新提交
|
2025-08-05 20:31:52 +08:00 |
|
cuizhibin
|
8c3da0878e
|
合并问题
|
2025-08-05 20:27:44 +08:00 |
|
cuizhibin
|
ffbf766cee
|
1.手动批量上传文件夹图像到项目(单张)
|
2025-08-05 20:24:55 +08:00 |
|
cuizhibin
|
b818eec318
|
1.批量上传图像校验部件id是否存在
|
2025-08-05 20:24:55 +08:00 |
gaoxiong
|
0a446e5f66
|
招投标
|
2025-08-05 20:24:45 +08:00 |
|
Mr.j
|
8a1c5b04c5
|
优化设备请求类字段
|
2025-08-05 16:55:03 +08:00 |
|
Mr.j
|
5e21feb414
|
手动解决合并冲突
|
2025-08-05 16:44:00 +08:00 |
|
Mr.j
|
524faa18a5
|
完成设备采购需要的数据库跟新和完成分页查询功能
|
2025-08-05 16:24:31 +08:00 |
|
wangna0328
|
ec5cca1dab
|
自动检测初步代码，还未测试
|
2025-08-05 11:00:08 +08:00 |
|
郝彬
|
a49d01d23a
|
Merge branch 'master' of https://gitee.com/xswl_123/dite-shixi-bakcend
|
2025-08-05 10:15:11 +08:00 |
|
郝彬
|
351c8e0d8e
|
8-5 岗位字段新增
|
2025-08-05 10:14:30 +08:00 |
|
ybb
|
50c343402b
|
7-31 岗位查用户
|
2025-08-05 09:27:10 +08:00 |
|
Mr.j
|
facf7a8f51
|
Revert "实现设备中心模块编辑，删除，查看详情，查看"
This reverts commit 3ebacd55c1.
|
2025-08-04 22:47:56 +08:00 |
|
Mr.j
|
3ebacd55c1
|
实现设备中心模块编辑，删除，查看详情，查看
|
2025-08-04 22:29:32 +08:00 |
|
wangna0328
|
75dd5815d2
|
制度代码最终版
|
2025-08-04 22:17:46 +08:00 |
|
cuizhibin
|
47fb031221
|
1.手动批量上传文件夹图像到项目增加信息
|
2025-08-04 20:24:56 +08:00 |
|
高雄
|
345b931de9
|
招标信息模板下载和招标信息导入
|
2025-08-04 20:24:56 +08:00 |
|
高雄
|
8db8dec22b
|
招投标
|
2025-08-04 20:24:49 +08:00 |
|
gaoxiong
|
6c698b5256
|
招投标
|
2025-08-04 20:24:32 +08:00 |
|
高雄
|
3717cbc4ce
|
招投标
|
2025-08-04 20:24:01 +08:00 |
 admin123
|
64d469210a
|
revert 3d7263248c
revert 1.增加项目日报功能
|
2025-08-04 20:07:07 +08:00 |
|
Mr.j
|
d3e0851413
|
Revert "制度模块按需求修改完成，且通过测试"
This reverts commit 258806b499.
|
2025-08-04 19:35:00 +08:00 |
|
wangna0328
|
6ceda40d18
|
恢复如初，但发现其他bug
|
2025-08-04 19:32:38 +08:00 |
|
Mr.j
|
075d1daf02
|
Revert "Merge branch 'jgq' into master"
This reverts commit d4883a7fb2, reversing
changes made to 258806b499.
|
2025-08-04 17:46:42 +08:00 |
|
wangna0328
|
a50dbd89ce
|
制度模块代码
|
2025-08-04 17:24:13 +08:00 |
|
ybb
|
141c95f63e
|
Merge branch 'master' of https://gitee.com/xswl_123/dite-shixi-bakcend
# Conflicts:
# core/src/main/java/com/dite/znpt/mapper/BusinessDataMapper.java
# core/src/main/java/com/dite/znpt/service/BusinessDataService.java
# core/src/main/java/com/dite/znpt/service/impl/BusinessDataServiceImpl.java
# core/src/main/resources/mapper/BusinessDataMapper.xml
# web/src/main/java/com/dite/znpt/web/controller/BusinessDataController.java
|
2025-08-04 16:11:06 +08:00 |
|
ybb
|
944681f334
|
7-31 岗位查用户
|
2025-08-04 16:10:14 +08:00 |
|
郝彬
|
14428ca9ae
|
8-4 项目与合同关联、项目预算
|
2025-08-04 16:02:39 +08:00 |
|
郝彬
|
b188cbd181
|
8-4 商务资料管理系统（ybb）
|
2025-08-04 15:48:14 +08:00 |
|
Mr.j
|
d4883a7fb2
|
Merge branch 'jgq' into master
|
2025-08-04 14:28:59 +08:00 |
|
wangna0328
|
258806b499
|
制度模块按需求修改完成，且通过测试
|
2025-08-01 17:18:01 +08:00 |
|
郝彬
|
f84e1b5aa8
|
7-31 岗位查用户
|
2025-08-01 16:06:50 +08:00 |
|
Mr.j
|
02f5447be3
|
实现设备中心模块编辑，删除，查看详情，查看
|
2025-08-01 15:14:05 +08:00 |
|
Mr.j
|
8fe29807a8
|
实现设备中心模块手动新增设备
|
2025-08-01 11:21:59 +08:00 |
|
Mr.j
|
023455be47
|
实现设备中心模块数据库设计以及设备分页查询功能
|
2025-08-01 09:42:08 +08:00 |
|
wangna0328
|
78c23c019c
|
制度模块按需求修改完成，且通过测试
|
2025-07-31 15:04:46 +08:00 |
|
wangna0328
|
72af3aa203
|
增加制度类型管理页面，相关方法已通过测试
|
2025-07-30 16:17:42 +08:00 |
|
郝彬
|
35fdcf14f6
|
7-29 修改用户查询的Mapper层查询SQL语句，去除岗位和角色的重复显示
|
2025-07-30 11:15:41 +08:00 |
|
郝彬
|
7dbadc7378
|
7-29 修改岗位新增时传入的状态逻辑，与数据库保持一致
|
2025-07-30 09:48:38 +08:00 |
|
Mr.j
|
4b46233805
|
实现培训计划查询
|
2025-07-30 09:43:29 +08:00 |
|
wangna0328
|
641266e549
|
移除讨论功能
|
2025-07-30 09:24:22 +08:00 |
|
wangna0328
|
d10cd352b0
|
移除制度模块中与投票相关的方法并修改相关逻辑
|
2025-07-29 20:11:46 +08:00 |
|
wangna0328
|
2b94b8846b
|
移除制度模块中与投票相关的方法
|
2025-07-29 19:44:34 +08:00 |
|
郝彬
|
849754b6c6
|
7-29 新增ConvertsImpl类，岗位信息返回创建时间及更新时间
|
2025-07-29 17:22:03 +08:00 |
|
郝彬
|
6e4c96b404
|
7-29-根据角色查询用户，过滤器条件修改
|
2025-07-29 09:47:38 +08:00 |
|
郝彬
|
4ac2b4314c
|
7-29-根据角色查询用户
|
2025-07-29 09:09:57 +08:00 |
|
wangna0328
|
d18690a3e8
|
制度相关功能后端开发
|
2025-07-28 18:13:35 +08:00 |
|
cuizhibin
|
3d7263248c
|
1.增加项目日报功能
|
2025-07-27 20:12:57 +08:00 |
|
cuizhibin
|
ea1e7576da
|
1.图片列表查询增加项目id参数
|
2025-07-27 16:31:28 +08:00 |
|
cuizhibin
|
14b0b60562
|
1.修复手动上传图片报错问题
|
2025-07-27 16:30:21 +08:00 |
|
cuizhibin
|
0f971f4689
|
1.图片集修改信息问题处理、优化
2.我的项目任务增加查询条件
3.项目信息查询sql优化
|
2025-07-27 16:21:30 +08:00 |
|
cuizhibin
|
1805dfc0d8
|
1.图片集修改信息优化
|
2025-07-25 11:19:43 +08:00 |
|
高雄
|
916d3dd04e
|
修复问题
|
2025-07-25 10:50:45 +08:00 |
|
cuizhibin
|
695a32f5ce
|
1.增加手动上传图片到项目下的接口
|
2025-07-24 19:58:33 +08:00 |
|
cuizhibin
|
c7bec730b4
|
1.调整图片信息预处理保存路径
|
2025-07-24 19:58:33 +08:00 |
|
高雄
|
d1603d5b14
|
修复问题
|
2025-07-24 17:43:35 +08:00 |
|
高雄
|
9267e19576
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
|
2025-07-24 17:20:50 +08:00 |
|
高雄
|
ae1cdc8689
|
设备管理以及设备借用归还完成
|
2025-07-24 17:18:54 +08:00 |
|
cuizhibin
|
55238c157c
|
1.图片信息增加预处理路径、预处理状态、项目id
2.增加预处理job，开发环境默认禁用
|
2025-07-24 14:57:21 +08:00 |
|
cuizhibin
|
3c7f8a22d7
|
设置信息时增加影像类型及影像类型描述字段
|
2025-07-24 09:33:12 +08:00 |
|
高雄
|
748067961f
|
Merge branch 'master' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend
|
2025-07-24 08:41:52 +08:00 |
|
高雄
|
3fde38da14
|
设备管理
|
2025-07-23 18:10:22 +08:00 |
|
cuizhibin
|
02560bc4bf
|
修复请求日志打印
|
2025-07-23 17:27:08 +08:00 |