郝彬
|
e7df0aa244
|
Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development
# Conflicts:
# core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java
|
2025-08-14 17:56:27 +08:00 |
|
郝彬
|
8224c2105d
|
8-14 新增支出类型数据库，修复项目立项时未分配主负责人时后端异常问题
|
2025-08-14 17:53:27 +08:00 |
Mr.j
|
f57fe26166
|
完善收货状态随着流程变化，确保在采购审批后通过后才出现收货状态,添加支付状态和收获状态字段
|
2025-08-14 15:22:28 +08:00 |
|
郝彬
|
1083efd2bd
|
8-13 项目详细信息展示所有子任务
|
2025-08-13 17:46:28 +08:00 |
|
Mr.j
|
bcb9ce7014
|
Merge remote-tracking branch 'origin/development' into development
|
2025-08-13 16:47:01 +08:00 |
|
Mr.j
|
5ed374f06f
|
实现点击确认收货后直接入库
|
2025-08-13 16:46:42 +08:00 |
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
|
36720e7a38
|
实现设备盘库的分页查询
|
2025-08-13 10:19:30 +08:00 |
何德超
|
f55724cac5
|
Merge remote-tracking branch 'origin/development' into development
|
2025-08-13 09:12:22 +08:00 |
|
郝彬
|
86ce3a6a2f
|
8-12 查询所有未立项合同，新增项目时可直接选择对应合同
|
2025-08-12 17:57:54 +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 |
|
wangna0328
|
ba2f7ecbea
|
项目看板模块方法修改联调
|
2025-08-11 17:58:50 +08:00 |
|
wangna0328
|
15086236ea
|
项目人员模块crud方法联调
|
2025-08-11 15:23:39 +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 |
|
郝彬
|
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 |
|
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 |
|
ybb
|
e356368b62
|
8/7,ybb文件夹和文件都实现了记录Id功能。
|
2025-08-07 16:06:15 +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 |
|
cuizhibin
|
a5d5c0006d
|
回滚sip文件
|
2025-08-07 15:02:35 +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 |
|
郝彬
|
a589422315
|
退回崔工的application-dev
|
2025-08-06 17:14:15 +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 |
|
郝彬
|
d8c76f97af
|
8-6 先commit再pull
|
2025-08-06 16:48:33 +08:00 |
|
wangna0328
|
7665cdd2e0
|
项目人员调度模块前端卡片接口联调
|
2025-08-06 16:27:15 +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 |
高雄
|
adc074804e
|
岗位中增加部门信息，岗位列表查询条件支持按部门（及子部门）查询
|
2025-08-06 15:14:59 +08:00 |
|
郝彬
|
dbbd3922f9
|
8-6 取消预算单同步删除数据库的使用记录，并撤回预算消费，创建项目时自动计算总预算
|
2025-08-06 14:30:30 +08:00 |