Commit Graph

444 Commits

Author SHA1 Message Date
360557ad25 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-26 17:01:26 +08:00
90fb24ad8d feat(REQ-3581) - 调整用印申请审批的监听处理 2025-02-26 16:58:36 +08:00
125ce90a3c Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-26 16:56:01 +08:00
378f0b6bf0 feat(REQ-3300) - 通知消息增加 visaId 2025-02-26 16:55:50 +08:00
39e70e0877 feat(REQ-3581) - 调整用印申请审批的监听处理 2025-02-26 16:53:03 +08:00
chenwenjian
5c69a5b55c feat(REQ-3300): 过滤空的关联单据 2025-02-26 16:52:18 +08:00
d63beeb53b feat(REQ-3581) - 增加监听电子签的事件 2025-02-26 16:50:23 +08:00
李龙
ac3e0ca9e0 feat:(feature/REQ-3581) 增加mq的消费日志,方便排查问题 2025-02-26 16:11:52 +08:00
00e439cfec feat(REQ-3581) - 调整变洽签详情页响应模型 2025-02-26 15:28:38 +08:00
chenwenjian
d27982e977 feat(REQ-3581): buildVisaChangeApproveCreateReqByVisaId调用调整 2025-02-26 15:11:23 +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
b0daccc763 feat(REQ-3581) - 调整发起审批时,新增传入变洽签单据主 ID 2025-02-26 14:52:06 +08:00
李龙
9d7cd87d11 feat:(feature/REQ-3581) 取消用印时,把合同id要清空掉 2025-02-26 14:51:03 +08:00
chenwenjian
808670c5ef feat(REQ-3300): NPE 2025-02-26 14:20:43 +08:00
5e2d60d8d3 feat(REQ-3581) - 调整发起审批的 businessKey 2025-02-26 14:17:27 +08:00
yanglin
1534ede9b6 REQ-3581: 调整接口 2025-02-26 13:46:56 +08:00
chenwenjian
cd447d58c4 feat(REQ-3300): NPE 2025-02-26 11:49:45 +08:00
chenwenjian
da5c4b0570 feat(REQ-3300): 去除导出excel表头 2025-02-26 11:44:53 +08:00
chenwenjian
d1684732d9 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-26 11:42:22 +08:00
xudawei
341b751a18 feat: (REQ-3300) 数据权限放开mock 2025-02-26 10:58:23 +08:00
chenwenjian
6a51936305 feat(REQ-3300): 提交审批关联单据值空指针处理 2025-02-26 10:44:24 +08:00
4216b56de9 feat(REQ-3581) - 调整 Bean 注入 2025-02-26 09:55:30 +08:00
wangli
4153a82f67 feat(REQ-3581) - 调整用印申请的单位创建流程的逻辑 2025-02-25 21:43:54 +08:00
wangli
df1fd9286c feat(REQ-3581) - 增加单位用印申请的审批结果处理 2025-02-25 21:32:55 +08:00
wangli
ff56ab10a8 feat(REQ-3581) - 增加单位用印申请的审批结果处理 2025-02-25 21:32:23 +08:00
4322137f97 feat(REQ-3581) - 申请用印逻辑完善,增加移除上一次操作的逻辑,以及审批人设置 2025-02-25 18:48:01 +08:00
chenwenjian
9f54bee47d feat(REQ-3300): 导出列顺序调整 2025-02-25 18:36:29 +08:00
fa6b2926e3 feat(REQ-3581) - 申请用印逻辑完善,增加移除上一次操作的逻辑 2025-02-25 18:07:56 +08:00
25cefce790 feat(REQ-3581) - 申请用印逻辑完善 2025-02-25 17:41:38 +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
66471b050a feat(REQ-3300) - 审批待办的参数根据前端要求增加 2025-02-25 15:09:34 +08:00
35a1bd10bc feat(REQ-3300) - 完善校验逻辑 2025-02-25 14:55:58 +08:00
358ffa2eaa feat(REQ-3581) - 解决循环依赖 2025-02-25 14:06:03 +08:00
df3c628941 Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-25 13:49:46 +08:00
53738a66ef feat(REQ-3300) - 完善申请用印逻辑 2025-02-25 13:48:58 +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
chenwenjian
865acf47ff feat(REQ-3300): 发生区域校验查询接口替换 2025-02-25 10:51:02 +08:00
chenwenjian
0f17c98d70 feat(REQ-3300): 发生区域校验查询接口替换 2025-02-25 10:31:01 +08:00
e805a9019a feat(REQ-3300) - 完善申请用印逻辑 2025-02-25 10:10:43 +08:00
97ad4ee895 Merge branch 'feature/REQ-3300' into feature/REQ-3581
# Conflicts:
#	visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaButtonTypeEnum.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/impl/ChangeRecordRelationServiceImpl.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
2025-02-24 20:57:10 +08:00
39fc04339c feat(REQ-3300) - 放开打印按钮的取值逻辑 2025-02-24 20:07:21 +08:00
ae46fdc096 feat(REQ-3300) - 放开打印按钮的取值逻辑 2025-02-24 19:32:40 +08:00
fa63dc1ebb feat(REQ-3300) - 放开打印按钮的取值逻辑 2025-02-24 18:14:57 +08:00
36386a4e4e feat(REQ-3300) - 放开打印按钮的取值逻辑 2025-02-24 18:02:29 +08:00
d1ca4744ec feat(REQ-3300) - 屏蔽一段代码 2025-02-24 17:20:42 +08:00
xudawei
e65734ebd3 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-24 17:06:14 +08:00
xudawei
0d15dc3ec7 feat: (REQ-3300) 数据权限添加 2025-02-24 17:06:09 +08:00
d2b79199a8 feat(REQ-3300) - 1.打印按钮回显控制;2.IM 群聊操作按钮移除校验 2025-02-24 16:19:36 +08:00