Commit Graph

518 Commits

Author SHA1 Message Date
chenwenjian
e8bf96d92c Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-27 10:46:31 +08:00
yanglin
cccf8b6d96 Revert "REQ-3581: 同意/拒绝尝试使用同步发送"
This reverts commit 046f2e80d6.
2025-02-27 10:46:11 +08:00
yanglin
046f2e80d6 REQ-3581: 同意/拒绝尝试使用同步发送 2025-02-27 10:45:57 +08:00
chenwenjian
19185780fe feat(REQ-3300): 编辑态提交审批或保存数据,校验单据状态 2025-02-27 10:45:49 +08:00
chenwenjian
3c2c4ab54d feat(REQ-3300): 编辑态提交审批或保存数据,校验单据状态 2025-02-27 10:42:44 +08:00
6b36692dbe Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-27 10:15:55 +08:00
3910c71b8e Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-27 10:13:35 +08:00
dc9d02e5b2 feat(REQ-3581) - 通知增加ouId 和 workspaceID 2025-02-27 10:13:20 +08:00
chenwenjian
3b8acc5e2c feat(REQ-3300): 编辑态提交审批,校验单据状态 2025-02-27 10:12:58 +08:00
chenwenjian
8211956aa2 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-26 20:28:26 +08:00
chenwenjian
23c8ffcee1 feat(REQ-3300): 文案 2025-02-26 20:27:59 +08:00
c69c09a4fa Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-26 20:24:41 +08:00
d0c0f4d2b4 feat(REQ-3581) - 通知增加visaId 2025-02-26 20:23:28 +08:00
9e8d5769c7 feat(REQ-3581) - 调整 gateway 的处理逻辑 2025-02-26 20:07:24 +08:00
0b0ecfff24 feat(REQ-3581) - 调整 gateway 的处理逻辑 2025-02-26 20:06:40 +08:00
chenwenjian
bded0f5621 feat(REQ-3300): 关联单据提示文案统一 2025-02-26 19:48:56 +08:00
chenwenjian
e99d6856f6 feat(REQ-3300): 关联单据提示文案统一 2025-02-26 19:24:52 +08:00
xudawei
39d21c1449 feat: (REQ-3300) 提交审核日志去重 2025-02-26 17:58:57 +08:00
xudawei
39da7452d3 feat: (REQ-3300) 数据权限放去掉mock 2025-02-26 17:10:00 +08:00
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
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
李龙
14fc797797 feat:(feature/REQ-3581) 增加自动完成用印状态机 2025-02-24 15:54:34 +08:00
67b6919ad8 feat(REQ-3300) - 调整上传附件的处理方式 2025-02-24 15:47:35 +08:00
d59dd18b06 feat(REQ-3300) - 调整操作浮条 2025-02-24 14:44:56 +08:00
1cc9c17620 feat(REQ-3300) - 调整引用 2025-02-24 14:28:20 +08:00
8e9359ab40 feat(REQ-3300) - 调整群主在群众的操作条的数据响应 2025-02-24 14:18:55 +08:00
1dc8218bfc feat(REQ-3300) - 移除 only 接口中的跳过参数的设置 2025-02-24 14:07:07 +08:00
ada63fbd56 feat(REQ-3300) - 附件上传功能调整传入给审批的数据 2025-02-24 13:46:55 +08:00
chenwenjian
7240ba6d2a Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-24 13:33:20 +08:00
chenwenjian
5f2c939786 feat(REQ-3300): 发生区域校验 2025-02-24 13:32:42 +08:00
9b00b5a710 feat(REQ-3300) - 附件上传功能移除校验判断 2025-02-24 12:45:50 +08:00
chenwenjian
2acd078895 feat(REQ-3300): 关联变更单单据只能是已完成状态 2025-02-24 11:46:05 +08:00
chenwenjian
93b21b4b7a Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-24 11:28:27 +08:00
chenwenjian
05a8a3a52f feat(REQ-3300): 发生区域校验 2025-02-24 11:28:16 +08:00
yanglin
f2853c074c Merge remote-tracking branch 'origin/feature/REQ-3581' into feature/REQ-3581 2025-02-24 11:06:09 +08:00
yanglin
7c5f22f69a REQ-3581: 添加bizCode 2025-02-24 11:06:05 +08:00
李龙
276e1e871d feat:(feature/REQ-3581) 变更签证用印申请操作时记录日志 2025-02-24 10:22:20 +08:00
93ff2494d9 feat(REQ-3300) - 审批完成的单据,不允许添加附件 2025-02-24 10:02:20 +08:00
wangli
b1f86e251c feat(REQ-3581) - 增加流程处理逻辑中,对指定的业务 ID 过滤 2025-02-22 21:28:20 +08:00
yanglin
13c5606de1 REQ-3581: 改字段名称 2025-02-21 18:47:00 +08:00
7d73c62e92 feat(REQ-3300) - 增加合同 ID 2025-02-21 18:37:59 +08:00
3933b714dd feat(REQ-3300) - 增加申请用印的实现 2025-02-21 18:37:38 +08:00
chenwenjian
ba5a641616 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-21 18:11:34 +08:00
chenwenjian
959761aa8b feat(REQ-3300): 编辑状态下调用选择器需要返回不可选数据3 2025-02-21 18:10:37 +08:00
5bfd395d5b feat(REQ-3300) - 发起审批的表单提交参数增加 workspaceName 2025-02-21 17:59:48 +08:00
李龙
e17ed751cf feat:(feature/REQ-3581) 补充用印申请模板的模板id 2025-02-21 17:24:49 +08:00
1cb9c1b5e7 feat(REQ-3300) - 发起审批的表单提交参数增加 workspaceName 2025-02-21 17:24:27 +08:00
48352bb5b7 feat(REQ-3300) - 增加群聊重新发起的校验逻辑 2025-02-21 17:12:16 +08:00
2e8b54a37f feat(REQ-3300) - 增加群聊重新发起的校验逻辑 2025-02-21 17:08:33 +08:00
chenwenjian
eb4ec3161c feat(REQ-3300): 编辑状态下调用选择器需要返回不可选数据3 2025-02-21 16:50:56 +08:00
李龙
103843092f feat:(feature/REQ-3581) 完成用印审批时,如果所有用印审批都完成了,则自动完成签证的用印申请 2025-02-21 16:49:16 +08:00
chenwenjian
a58ba5e883 feat(REQ-3300): 编辑状态下调用选择器需要返回不可选数据2 2025-02-21 16:24:03 +08:00
chenwenjian
97226e8706 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-21 15:12:35 +08:00
chenwenjian
77e1151ce2 feat(REQ-3300): 编辑状态下调用选择器需要返回不可选数据 2025-02-21 15:06:14 +08:00
xudawei
76e2688e40 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-21 14:54:07 +08:00
xudawei
f4f8484e8e feat: (REQ-3300) 详情中增加无效的变更签证id集合 2025-02-21 14:54:01 +08:00
cca98d43bc feat(REQ-3300) - 增加群聊重复创建的校验 2025-02-21 14:45:20 +08:00
李龙
1ebf29d8b8 feat:(feature/REQ-3581) changeRecordRelation增加contentExt查询条件 2025-02-21 14:15:36 +08:00
李龙
7c07d0ced7 feat:(feature/REQ-3581) visaChange的list接口增加VisaStampStatusEnum返回 2025-02-21 14:02:27 +08:00
李龙
ccf8aa321b feat:(feature/REQ-3581) 支持取消用印操作 2025-02-21 13:44:22 +08:00
chenwenjian
5a6129880e Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-21 13:43:36 +08:00
xudawei
547bb4e03f feat: (REQ-3300) 单独上传附件加上日志-入参加上workspaceId 2025-02-21 11:30:39 +08:00
xudawei
eb003ab0ab feat: (REQ-3300) 单独上传附件加上日志-入参加上workspaceId 2025-02-21 11:07:07 +08:00
a66f315ef7 feat(REQ-3300) - 校验操作时的单据状态 2025-02-21 10:41:41 +08:00
李龙
06e1e1763e feat:(feature/REQ-3581) 解决冲突 2025-02-21 10:33:41 +08:00
2ad07b7122 feat(REQ-3300) - 校验操作时的单据状态 2025-02-21 10:30:14 +08:00
李龙
b26be5fcb2 feat:(feature/REQ-3581) 提供通用的更新变更签证记录的接口,没有记录操作日志和发送mq 2025-02-21 10:29:18 +08:00
chenwenjian
b4a4994e95 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-21 09:53:51 +08:00
2ed1b5d079 Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-21 09:46:58 +08:00
xudawei
f59ab77535 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-21 09:41:01 +08:00
xudawei
73b787fe9e feat: (REQ-3300) 单独上传附件加上日志 2025-02-21 09:40:56 +08:00
wangli
f5fd872c3e feat(REQ-3581) - 增加用印申请的逻辑 2025-02-20 22:56:59 +08:00
chenwenjian
21beb78801 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-20 19:11:45 +08:00
a6f7ac6445 feat(REQ-3300) - 调整 IM 群内浮条的状态显示 2025-02-20 19:02:01 +08:00
chenwenjian
ce4a496008 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-20 19:01:04 +08:00
chenwenjian
13ab5b5498 feat(REQ-3300): 提出时间校验范围调整 2025-02-20 19:00:48 +08:00
xudawei
7d1f1241c7 feat: (REQ-3300) 操作日志保存小数点后2位 2025-02-20 18:42:34 +08:00
9111961327 feat(REQ-3300) - 移除一些无用代码 2025-02-20 17:36:43 +08:00
xudawei
e5ef81f459 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-20 17:29:10 +08:00
xudawei
192b15f11a feat: (REQ-3300) 点击保存加上日志 2025-02-20 17:29:05 +08:00
26255e8fdd feat(REQ-3300) - 调整发起工作流的人员信息拼接逻辑 2025-02-20 17:23:52 +08:00
chenwenjian
8b4efdc2a2 feat(REQ-3300): 同步图纸绑定关系至图纸方
审批不通过和废止时同步取消绑定关系,提交审批时同步绑定关系
2025-02-20 17:12:31 +08:00
李龙
057dab9188 feat:(feature/REQ-3581) visaRelation增加id查询条件 2025-02-20 16:26:57 +08:00
d8a20a094c Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-20 16:17:36 +08:00
51abbefa23 feat(REQ-3300) - 调整创建群聊及发送卡片的逻辑 2025-02-20 16:01:56 +08:00
26e4e6c8bf feat(REQ-3300) - 优化主单据创建群聊时,就发送卡片,而不再监听事件 2025-02-20 15:06:44 +08:00
1452b1f3e0 feat(REQ-3300) - 强制 MQ 监听抛出异常 2025-02-20 14:55:20 +08:00
xudawei
86f6709a9a feat: (REQ-3300) 金额更改加上日志 2025-02-20 14:16:14 +08:00
李龙
ccac6feff8 feat:(feature/REQ-3581) visaRelation增加createBy,updateBy返回 2025-02-20 13:48:10 +08:00
xudawei
4f391a4914 feat: (REQ-3300) 状态更改加上日志 2025-02-20 13:09:25 +08:00
xudawei
fe8b3cd32c feat: (REQ-3300) fix-complier-error 2025-02-20 12:51:46 +08:00
xudawei
45fecbf8d6 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-20 11:55:31 +08:00
xudawei
39c3a295a2 feat: (REQ-3300) 金额变更/附件的操作日志优化 2025-02-20 11:55:27 +08:00
58ba4c5678 Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-20 11:48:53 +08:00
2c0c3266ee feat(REQ-3300) - 调整处理枚举转换逻辑 2025-02-20 11:23:10 +08:00
bec3ba7439 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/VisaHelper.java
2025-02-20 11:09:02 +08:00
xudawei
d4ef303ca7 feat: (REQ-3300) 编辑页面与详情页面,直接提交审批时,操作日志优化 2025-02-20 10:51:41 +08:00
xudawei
6317a9bf0f Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-20 10:41:45 +08:00
xudawei
7438e47cde feat: (REQ-3300) 编辑页面与详情页面,直接提交审批时,操作日志优化 2025-02-20 10:41:29 +08:00
47a6e6f2c0 feat(REQ-3300) - 优化处理添加群成员的事件处理逻辑 2025-02-20 10:34:37 +08:00
d93e369048 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-20 10:23:54 +08:00
1c2939e59f feat(REQ-3300) - 优化处理添加群成员的事件处理逻辑 2025-02-20 10:23:36 +08:00
xudawei
9f99b2ff61 feat: (REQ-3300) 按钮排序 2025-02-20 10:14:21 +08:00