Commit Graph

235 Commits

Author SHA1 Message Date
yanglin
e0b8183982 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-19 16:30:40 +08:00
yanglin
237bb8c98d REQ-3982: 备份 2025-04-19 16:30:37 +08:00
chenwenjian
2207e2465a Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-19 15:21:10 +08:00
chenwenjian
4329d406f8 feat(REQ-3982): 详情页顶部按钮调整 2025-04-19 15:20:29 +08:00
yanglin
58e98bc6dd Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-19 15:11:28 +08:00
yanglin
10db6afc8b REQ-3982: 备份 2025-04-19 15:11:25 +08:00
2096568714 feat(REQ-3982) - 价款表单更新主业务相关单据,并正式发起审批 2025-04-19 14:56:49 +08:00
chenwenjian
53a8d32d4d feat(REQ-3982): 调用方法调整 2025-04-19 13:41:45 +08:00
chenwenjian
c7714a0615 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-19 11:21:43 +08:00
chenwenjian
cc5f601a3f feat(REQ-3982): 导出新增价款审批通过时间 2025-04-19 11:21:32 +08:00
chenwenjian
5499e20838 feat(REQ-3982): 通过visaId获取关联单据 2025-04-19 11:09:08 +08:00
9d898fe451 feat(REQ-3982) - 新增价款确认审批表单提交 API 2025-04-19 10:55:08 +08:00
yanglin
69c82b3d51 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982
# Conflicts:
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
2025-04-19 10:14:49 +08:00
yanglin
17765f4f32 REQ-3982: 备份 2025-04-19 10:13:11 +08:00
chenwenjian
a273cd5116 feat(REQ-3982): 发起页新增合同相关字段 2025-04-19 09:33:25 +08:00
chenwenjian
f4cab3bff7 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-18 18:47:58 +08:00
chenwenjian
8e16ba250f feat(REQ-3982): 列表页查询 2025-04-18 18:46:55 +08:00
41e584acf0 feat(REQ-3982) - 新增价款确认审批表单提交 API 2025-04-18 18:03:37 +08:00
670b2f5583 feat(REQ-3982) - 调整枚举,以及实体 2025-04-18 17:22:12 +08:00
chenwenjian
54e347643c Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-18 16:57:50 +08:00
chenwenjian
cfa6edf9a2 feat(REQ-3982): 流程状态枚举定义 2025-04-18 11:34:09 +08:00
yanglin
c05e084b9b REQ-3982: 处理群聊横幅逻辑 2025-04-18 10:15:25 +08:00
e05dc34ff6 feat(REQ-3581) - 调整通知模板参数 2025-03-13 18:40:44 +08:00
7e9a50acaf feat(REQ-3581) - 完善腾讯撤销合同的逻辑 2025-03-13 17:54:41 +08:00
d5041605de feat(REQ-3581) - 审批结束后发送自定义通知 2025-03-13 16:01:54 +08:00
1490e166f7 Merge remote-tracking branch 'origin/master' into feature/REQ-3581
# Conflicts:
#	visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/WorkflowGateway.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
2025-03-13 15:42:17 +08:00
xudawei
4f479f1547 feat: (REQ-3798) 详情接口中区域优化 2025-03-06 17:14:56 +08:00
a0fbf84e29 feat(REQ-3798) - 添加业务节点的处理 2025-03-06 13:57:04 +08:00
wangli
5c9c306f48 feat(REQ-3798) - 新增查询指定岗位的人的逻辑 2025-03-05 22:46:47 +08:00
b4a2b4d1f8 feat(REQ-3798) - 针对需求对状态枚举进行变更 2025-03-05 14:36:40 +08:00
ec01a411f9 feat(REQ-3798) - 针对需求对状态枚举进行变更 2025-03-05 14:32:09 +08:00
chenwenjian
2e3f4cf060 feat(REQ-3798): 变洽签单据状态露出驳回待提报和决策中 2025-03-05 10:18:41 +08:00
chenwenjian
5ad3d762b6 feat(REQ-3798): 单据名称存储调整与适配 2025-03-04 18:23:36 +08:00
d666810be2 feat(REQ-3300) - 增加一些校验逻辑,和日志补全 2025-03-03 17:20:56 +08:00
df7e95018f feat(REQ-3300) - 增加一些校验逻辑,和日志补全 2025-03-03 17:00:39 +08:00
e80a52ab13 Merge branch 'feature/REQ-3300' into feature/REQ-3581
# Conflicts:
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
2025-02-27 17:28:04 +08:00
chenwenjian
b0a8fe2455 feat(REQ-3300): 表单校验模型调整 2025-02-27 16:35:39 +08:00
chenwenjian
ed0586ce8c feat(REQ-3300): 表单校验模型调整 2025-02-27 15:54:30 +08:00
311ed6518d feat(REQ-3581) - 调整发起用印的审批时传入给待办的参数 2025-02-27 15:31:37 +08:00
2e201c9296 feat(REQ-3581) - 调整发起用印的入参模型 2025-02-27 14:18:58 +08:00
c69c09a4fa Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-26 20:24:41 +08:00
chenwenjian
4829fa2d7f feat(REQ-3300): 专业非必填 2025-02-26 19:52:18 +08:00
00e439cfec feat(REQ-3581) - 调整变洽签详情页响应模型 2025-02-26 15:28:38 +08:00
chenwenjian
8c453a56c6 Merge branch 'feature/REQ-3300' into feature/REQ-3581
# Conflicts:
#	nanopart-server/src/main/java/cn/axzo/nanopart/config/exception/ExceptionAdviceHandler.java
2025-02-26 15:09:56 +08:00
xudawei
6552872a84 feat: (REQ-3300) 详情中返回当前登录人的personId 2025-02-25 16:13:05 +08:00
6ac9587e42 feat(REQ-3581) - 申请用印增加 uuid 2025-02-25 15:23:59 +08:00
df3c628941 Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-25 13:49:46 +08:00
2d85d1e3f2 feat(REQ-3300) - 完善申请用印逻辑 2025-02-25 11:49:16 +08:00
chenwenjian
5c769ba3c5 feat(REQ-3300): 详情确认人返回nodeId 2025-02-25 11:33:31 +08:00
e805a9019a feat(REQ-3300) - 完善申请用印逻辑 2025-02-25 10:10:43 +08:00