Commit Graph

376 Commits

Author SHA1 Message Date
李龙
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
a77d1e1033 Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-20 09:37:14 +08:00
xudawei
d053c01abe feat: (REQ-3300) 操作日志去重 2025-02-19 20:58:49 +08:00
828f581131 Merge branch 'feature/REQ-3300' into feature/REQ-3581 2025-02-19 20:42:20 +08:00
xudawei
91186a4cf2 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-19 20:29:03 +08:00
xudawei
ad91954fba feat: (REQ-3300) 操作日志去重 2025-02-19 20:28:58 +08:00
da0963f723 feat(REQ-3300) - 优化发起审批的表单提交逻辑 2025-02-19 20:19:44 +08:00
80d84f8cce feat(REQ-3300) - 优化发起审批的表单提交逻辑 2025-02-19 19:30:16 +08:00
79469b821a feat(REQ-3300) - 优化日志处理 2025-02-19 19:26:49 +08:00
51de521605 feat(REQ-3300) - 添加审批任务通过时的发起人判断 2025-02-19 17:04:08 +08:00
xudawei
eb7f521098 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-19 16:29:54 +08:00
xudawei
95ad5354f9 feat: (REQ-3300) 没有发起申请则不展示打印按钮 2025-02-19 16:29:49 +08:00
5d97dd9cef feat(REQ-3300) - 调整单据状态校验 2025-02-19 16:28:25 +08:00
chenwenjian
386547c1fc Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-19 16:20:01 +08:00
chenwenjian
da0ede55c8 feat(REQ-3300): 去除状态编辑限制 2025-02-19 16:19:44 +08:00
李龙
65f4ed5b41 feat:(feature/REQ-3581) visaRelation增加updateAt返回,用印进展需要看到审核时间,审核时没有增加审核时间做记录,设计的人说用updateAt来做处理 2025-02-19 15:45:39 +08:00
李龙
d071b83c85 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3581 2025-02-19 15:42:05 +08:00
cc3ce0764e feat(REQ-3300) - 完善调用 changeStatus 的入参 2025-02-19 15:40:04 +08:00
chenwenjian
4923cdec9c Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-19 14:47:33 +08:00
chenwenjian
a404028a11 feat(REQ-3300): 表单校验单据类型位置调整 2025-02-19 14:47:20 +08:00
xudawei
38438d261f feat: (REQ-3300) 操作日志顺序调整 2025-02-19 14:42:34 +08:00
xudawei
274385bff8 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-19 14:22:18 +08:00
xudawei
79479ecb36 feat: (REQ-3300) 监听审批流-所有结点审批通过/发起审批去掉 2025-02-19 14:22:13 +08:00
a38a434130 feat(REQ-3300) - 调整发起人在IM 群中,特定状态下按钮展示逻辑 2025-02-19 14:20:17 +08:00
c52dff8232 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-19 14:03:41 +08:00
d5b8e0c9f1 feat(REQ-3300) - 优化 IM 群聊按钮触发逻辑中的异常文案 2025-02-19 14:03:30 +08:00
chenwenjian
8f6f5aa168 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-19 13:44:55 +08:00
chenwenjian
3bca1b47ca feat(REQ-3300): 发起人岗位优先取未退场人员 2025-02-19 13:44:28 +08:00
0cf5c86803 feat(REQ-3300) - 完成重新发起的发送群消息的逻辑 2025-02-19 13:41:17 +08:00
chenwenjian
1cd0e311df feat(REQ-3300): 单号项目唯一性校验编辑模式跳过自身 2025-02-19 11:24:43 +08:00
xudawei
f21a340a46 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-19 10:50:33 +08:00
xudawei
5a7cd9fe3e feat: (REQ-3300) 查询变更签证集合接口优化 2025-02-19 10:50:23 +08:00
chenwenjian
1984808c9a feat(REQ-3300): 分页查询筛选校验加强 2025-02-19 10:39:14 +08:00
wangli
a8f0abb6ed feat(REQ-3581) - 增加用印状态在列表以及按钮的逻辑 2025-02-18 21:51:24 +08:00
xudawei
619c5bc196 feat: (REQ-3300) 增加查询变更签证列表接口 2025-02-18 18:48:26 +08:00
xudawei
99d0480bfb Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-18 18:47:10 +08:00
xudawei
d7c372b150 feat: (REQ-3300) 增加查询变更签证列表接口 2025-02-18 18:47:04 +08:00
1299ce8a70 feat(REQ-3300) - 调整变洽签单据关联的逻辑 2025-02-18 18:40:13 +08:00
chenwenjian
c2a56737d4 feat(REQ-3300): 关联单据问题修复 2025-02-18 18:33:32 +08:00
88ff8976ab feat(REQ-3300) - 添加单据首次完成审批时,状态更改为"未用印" 2025-02-18 18:13:29 +08:00
chenwenjian
f9218cdaba feat(REQ-3300): 发起审批校验 2025-02-18 17:47:35 +08:00
chenwenjian
df61815c6c feat(REQ-3300): 发起人列表进行权限过滤 2025-02-18 17:31:27 +08:00
chenwenjian
f27ffdd308 feat(REQ-3300): 关联单据选择器适配统一主单据字段 2025-02-18 17:23:25 +08:00