Commit Graph

1345 Commits

Author SHA1 Message Date
e05dc34ff6 feat(REQ-3581) - 调整通知模板参数 2025-03-13 18:40:44 +08:00
7e9a50acaf feat(REQ-3581) - 完善腾讯撤销合同的逻辑 2025-03-13 17:54:41 +08:00
xudawei
1903d07e55 Merge remote-tracking branch 'origin/feature/REQ-3540' into feature/REQ-3540
# Conflicts:
#	doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsbase/WpsBaseManager.java
2025-03-13 17:52:19 +08:00
xudawei
c759f5bfb2 feat: (REQ-3540) wps对接-编辑实现 2025-03-13 17:51:45 +08:00
41bb353ae5 feat(REQ-3581) - 完善腾讯撤销合同的逻辑 2025-03-13 17:44:31 +08:00
cd3db49e9c feat(REQ-3581) - 补充用印申请待办的消息变量 2025-03-13 17:41:06 +08:00
ee5849c1b1 feat(REQ-3581) - 添加变洽签单据通知事件 code 默认值 2025-03-13 17:32:01 +08:00
yanglin
5fe7465120 REQ-3540: 换endpoint试试一些场景 2025-03-13 16:57:18 +08:00
yanglin
78473e8a8e REQ-3540: 换endpoint试试一些场景 2025-03-13 16:36:04 +08:00
yanglin
7f8b7b45ab Merge remote-tracking branch 'origin/feature/REQ-3581' into feature/REQ-3581 2025-03-13 16:02:10 +08:00
yanglin
5a0d047a80 REQ-3540: 换endpoint试试一些场景 2025-03-13 16:02:07 +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
yanglin
c1b559134f REQ-3540: 解决报错问题 2025-03-13 15:36:02 +08:00
yanglin
1996c2ebf3 REQ-3540: 避免报错 2025-03-13 14:14:23 +08:00
yanglin
a4cc104cb0 REQ-3540: 备份 2025-03-13 14:10:04 +08:00
yanglin
4a915078a7 REQ-3540: 设置AutoJumpBack 2025-03-13 14:07:05 +08:00
yanglin
deebc5066b Merge remote-tracking branch 'origin/feature/REQ-3581' into feature/REQ-3581 2025-03-13 13:38:25 +08:00
yanglin
5ca4ea2846 REQ-3540: 添加印章管理人员的时候,如果人员已经认证了, 就直接授权 2025-03-13 13:38:21 +08:00
xudawei
9ba3caf8d3 Merge remote-tracking branch 'origin/feature/REQ-3540' into feature/REQ-3540
# Conflicts:
#	doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsbase/WpsBaseController.java
#	doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsedit/WpsEditController.java
2025-03-12 20:51:35 +08:00
xudawei
08fa7ccd75 feat: (REQ-3540) wps对接-manager实现 2025-03-12 20:50:25 +08:00
ca82d1f905 feat(REQ-3798) - 调整班组类型协同关系登录人的审批人获取逻辑 2025-03-12 17:03:01 +08:00
5c4e99b061 feat(REQ-3798) - 调整班组类型协同关系登录人的审批人获取逻辑 2025-03-12 16:41:36 +08:00
54afee381e feat(REQ-3581) - 调整如何没传图片,不再向流程转发 2025-03-12 16:35:45 +08:00
d4ba9cb11c feat(REQ-3581) - 调整用印文件按钮响应方式 2025-03-12 16:21:03 +08:00
yanglin
60809b49e2 REQ-3540: 完善接口声明 2025-03-12 16:20:49 +08:00
yanglin
7ec2d28e92 REQ-3540: 完善接口声明 2025-03-12 16:19:43 +08:00
5c0636578f feat(REQ-3798) - 调整施工区域的名称拼接 2025-03-12 14:45:50 +08:00
yanglin
dd88e4d889 REQ-3540: 更新表 2025-03-12 11:44:15 +08:00
yanglin
cee6f39515 Merge remote-tracking branch 'origin/feature/REQ-3540' into feature/REQ-3540 2025-03-12 11:33:10 +08:00
yanglin
719a11869e REQ-3540: 更新表 2025-03-12 11:33:07 +08:00
651c2e1365 feat(REQ-3798) - 调整施工区域的名称拼接 2025-03-12 10:10:44 +08:00
xudawei
ee388defba feat: (REQ-3540) wps对接-resp改成response 2025-03-12 10:09:39 +08:00
xudawei
260eb55a17 Merge remote-tracking branch 'origin/feature/REQ-3540' into feature/REQ-3540 2025-03-12 09:47:37 +08:00
xudawei
ee8ff17fde feat: (REQ-3540) wps对接-增加重命名接口 2025-03-12 09:47:31 +08:00
yanglin
e115a65766 REQ-3540: 备份 2025-03-11 18:48:43 +08:00
yanglin
13ae8190f4 REQ-3540: 备份 2025-03-11 18:48:26 +08:00
李龙
556411cdc6 feat:(feature/REQ-3581) 修改自动完成用印的逻辑判断,处理已经完成用印的情况 2025-03-11 18:25:22 +08:00
yanglin
278e848224 Merge remote-tracking branch 'origin/feature/REQ-3540' into feature/REQ-3540 2025-03-11 18:13:23 +08:00
yanglin
39dcd621ed REQ-3540: 备份 2025-03-11 18:13:19 +08:00
xudawei
28d75d1400 feat: (REQ-3540) 与wps对接-用户/权限接口添加 2025-03-11 17:57:46 +08:00
xudawei
288b2157d7 feat: (REQ-3540) 与wps对接接口添加 2025-03-11 17:00:59 +08:00
4b849575a9 feat(REQ-3581) - 解决变洽签列表是否应该返回申请用印按钮 2025-03-11 15:18:21 +08:00
e0d420981e feat(REQ-3581) - 解决变洽签列表是否应该返回申请用印按钮 2025-03-11 14:32:32 +08:00
932f7baf0e Merge remote-tracking branch 'origin/feature/REQ-3581' into feature/REQ-3581 2025-03-11 14:12:11 +08:00
7ef94bf45b feat(REQ-3581) - 调整文案 2025-03-11 14:11:58 +08:00
李龙
6bca45e162 feat:(feature/REQ-3581) 修改自动完成用印的逻辑判断,处理已经完成用印的情况 2025-03-11 14:08:51 +08:00
cbf78e5449 feat(REQ-3581) - 充解析印章返回的人 2025-03-11 11:41:29 +08:00
yanglin
c0c674ae0e REQ-3540: 备份 2025-03-11 10:46:29 +08:00
yanglin
e07a6a7d8e REQ-3540: 备份 2025-03-11 10:45:50 +08:00