Commit Graph

647 Commits

Author SHA1 Message Date
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
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
5c0636578f feat(REQ-3798) - 调整施工区域的名称拼接 2025-03-12 14:45:50 +08:00
651c2e1365 feat(REQ-3798) - 调整施工区域的名称拼接 2025-03-12 10:10:44 +08:00
李龙
556411cdc6 feat:(feature/REQ-3581) 修改自动完成用印的逻辑判断,处理已经完成用印的情况 2025-03-11 18:25:22 +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
feafb4eea9 feat(REQ-3581) - 解决部分单位退场,nodeId 被删除的情况 2025-03-07 17:20:20 +08:00
6b815fe467 feat(REQ-3581) - 解决部分单位退场,nodeId 被删除的情况 2025-03-07 17:17:47 +08:00
5e6fd676a3 feat(REQ-3581) - 解决申请用印时,单位退场校验 2025-03-07 16:50:15 +08:00
bd6202d5d9 feat(REQ-3581) - 解决 API 调用解析异常 2025-03-07 16:30:00 +08:00
bea991f15d feat(REQ-3581) - 调整发起用印的日志 2025-03-07 15:15:39 +08:00
f468d75192 feat(REQ-3581) - 调整发起用印时,对每个单位传入的章有效性校验 2025-03-07 15:00:58 +08:00
94f3109908 feat(REQ-3798) - 完善撤销合同处理 2025-03-07 14:45:11 +08:00
李龙
b5f4bb0fdb feat:(feature/REQ-3581) 修改自动完成用印的逻辑判断,处理已经完成用印的情况 2025-03-07 13:38:25 +08:00
e11f73bceb feat(REQ-3798) - 完善节点处理 2025-03-07 13:37:46 +08:00
1fd603206a feat(REQ-3798) - 完善节点处理 2025-03-07 12:28:22 +08:00
5372642b2d feat(REQ-3581) - 增加腾讯小程序中撤销合同的处理逻辑 2025-03-07 12:18:58 +08:00
xudawei
4f479f1547 feat: (REQ-3798) 详情接口中区域优化 2025-03-06 17:14:56 +08:00
99ec5f738b feat(REQ-3798) - 处理签章合同创建逻辑 2025-03-06 16:27:12 +08:00
e788989e0a feat(REQ-3798) - 处理签章合同创建逻辑 2025-03-06 16:15:25 +08:00
b18e1f55c9 feat(REQ-3798) - 添加业务节点的处理 2025-03-06 14:58:33 +08:00
a0fbf84e29 feat(REQ-3798) - 添加业务节点的处理 2025-03-06 13:57:04 +08:00
227563ec40 feat(REQ-3581) - 兼容审批操作人未空 2025-03-06 10:30:05 +08:00
b586f20471 feat(REQ-3581) - 添加用印相关按钮只有发起人能使用 2025-03-06 10:29:30 +08:00
wangli
5c9c306f48 feat(REQ-3798) - 新增查询指定岗位的人的逻辑 2025-03-05 22:46:47 +08:00
7ce9279c68 feat(REQ-3798) - 调整 IM 群 Tips 操作浮条按钮逻辑 2025-03-05 14:42:20 +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
6be3aecad9 feat(REQ-3798) - 针对需求对状态枚举进行变更 2025-03-05 14:11:20 +08:00
李龙
5560818d31 feat:(feature/REQ-3581) 修改自动完成用印的逻辑判断,要排除当前完成用印的数据 2025-03-05 11:16:54 +08:00
cc54310544 feat(REQ-3581) - 完善用印日志的处理 2025-03-05 10:42:40 +08:00
chenwenjian
9b651a8dd6 feat(REQ-3798): 施工区域与专业展示优化 2025-03-05 10:38:01 +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
a4a34c89c4 feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 17:42:21 +08:00
f12ba26657 feat(REQ-3581) - 完善用印日志的处理 2025-03-04 15:49:55 +08:00
d0239ac1bf feat(REQ-3581) - 完善用印日志的处理 2025-03-04 15:28:20 +08:00
8bd8a5f385 feat(REQ-3581) - 完善用印日志的处理 2025-03-04 15:19:03 +08:00
2536c5b44c feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 14:52:24 +08:00
d3ee8df03a feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 14:51:42 +08:00
5bf6461a4d feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 14:32:49 +08:00
5fe4dd68de feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 14:31:10 +08:00
3e760facdd feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 11:43:30 +08:00
4b6e5a4945 feat(REQ-3300) - 合并 3300 2025-03-04 11:15:20 +08:00
414bc47042 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3581
# Conflicts:
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
2025-03-04 11:14:47 +08:00
f362485fb7 feat(REQ-3300) - 增加变更签创建人记录 2025-03-04 11:11:30 +08:00
bf7314a0ca feat(REQ-3300) - 增加是否申请过用印的标识 2025-03-03 20:49:33 +08:00
4688034cac feat(REQ-3300) - 增加是否申请过用印的标识 2025-03-03 20:30:59 +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
chenwenjian
ea93847f19 feat(REQ-3300): 发起审批流填充参数确认人过滤工人 2025-03-03 15:09:10 +08:00
e0588f42be feat(REQ-3300) - 调整单据列表响应按钮的逻辑 2025-03-03 13:59:02 +08:00
b4270af838 Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-28 15:28:11 +08:00
6496538598 feat(REQ-3300) - 调整相关单位的响应逻辑 2025-02-28 15:26:23 +08:00
chenwenjian
caf4c39ec9 feat(REQ-3300): 获取工程列表接口调整 2025-02-28 14:25:18 +08:00
4dbed2ec61 feat(REQ-3300) - 调整相关单位的响应逻辑 2025-02-28 11:18:54 +08:00
9aa1ecc942 feat(REQ-3300) - 调整相关单位的响应逻辑 2025-02-28 11:03:20 +08:00
1f2963b07f feat(REQ-3300) - 调整相关单位的响应逻辑 2025-02-28 10:44:50 +08:00
wangli
158a90aaa6 feat(REQ-3300) - 调整单据详情响应逻辑 2025-02-27 22:44:38 +08:00
wangli
65d8967cb8 feat(REQ-3300) - 调整退场人员校验问题 2025-02-27 22:14:48 +08:00
whymechen
014db66761 feat(3300): 退场人员校验调整 2025-02-27 21:40:12 +08:00
480f80c6af feat(REQ-3581) - 调整处理电子签事件的逻辑 2025-02-27 18:53:17 +08:00
f740808933 feat(REQ-3581) - 调整处理电子签事件的逻辑 2025-02-27 18:48:12 +08:00
15672ad566 feat(REQ-3581) - 处理编译问题 2025-02-27 17:42:10 +08:00
3dbd162014 feat(REQ-3581) - 完善处理逻辑 2025-02-27 17:31:02 +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
dc67260e9c feat(REQ-3581) - 完善投票信息的逻辑 2025-02-27 11:33:10 +08:00
chenwenjian
a1bc033746 feat(REQ-3300): 编辑态提交审批或保存数据,校验单据状态 2025-02-27 11:17:01 +08:00
chenwenjian
4ba6669021 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-27 10:47:07 +08:00
yanglin
9210b99256 REQ-3300: 同意/拒绝尝试使用同步发送 2025-02-27 10:46:49 +08:00
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
4829fa2d7f feat(REQ-3300): 专业非必填 2025-02-26 19:52:18 +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
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