|
|
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 |
|
|
|
c69c09a4fa
|
Merge branch 'feature/REQ-3300' into feature/REQ-3581
|
2025-02-26 20:24:41 +08:00 |
|
chenwenjian
|
4829fa2d7f
|
feat(REQ-3300): 专业非必填
|
2025-02-26 19:52:18 +08:00 |
|
|
|
00e439cfec
|
feat(REQ-3581) - 调整变洽签详情页响应模型
|
2025-02-26 15:28:38 +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 |
|
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 |
|
|
|
df3c628941
|
Merge branch 'feature/REQ-3300' into feature/REQ-3581
|
2025-02-25 13:49:46 +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 |
|
|
|
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 |
|
xudawei
|
0d15dc3ec7
|
feat: (REQ-3300) 数据权限添加
|
2025-02-24 17:06:09 +08:00 |
|
xudawei
|
64cde32329
|
feat: (REQ-3300) 审批中与已完成才有打印按钮优化
|
2025-02-24 15:50:57 +08:00 |
|
|
|
1dc8218bfc
|
feat(REQ-3300) - 移除 only 接口中的跳过参数的设置
|
2025-02-24 14:07:07 +08:00 |
|
李龙
|
276e1e871d
|
feat:(feature/REQ-3581) 变更签证用印申请操作时记录日志
|
2025-02-24 10:22:20 +08:00 |
|
李龙
|
9459e626a8
|
feat:(feature/REQ-3581) 变更签证记录增加合同id返回
|
2025-02-24 09:38:14 +08:00 |
|
|
|
3933b714dd
|
feat(REQ-3300) - 增加申请用印的实现
|
2025-02-21 18:37:38 +08:00 |
|
|
|
1cb9c1b5e7
|
feat(REQ-3300) - 发起审批的表单提交参数增加 workspaceName
|
2025-02-21 17:24:27 +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
|
f4f8484e8e
|
feat: (REQ-3300) 详情中增加无效的变更签证id集合
|
2025-02-21 14:54:01 +08:00 |
|
李龙
|
1ebf29d8b8
|
feat:(feature/REQ-3581) changeRecordRelation增加contentExt查询条件
|
2025-02-21 14:15:36 +08:00 |
|
李龙
|
5aeee5f48f
|
feat:(feature/REQ-3581) visaChange的list接口增加VisaStampStatusEnum返回
|
2025-02-21 14:01:09 +08:00 |
|
李龙
|
ccf8aa321b
|
feat:(feature/REQ-3581) 支持取消用印操作
|
2025-02-21 13:44:22 +08:00 |
|
xudawei
|
e96dfcc5cd
|
feat: (REQ-3300) 单独上传附件加上日志-入参加上workspaceId
|
2025-02-21 10:47:52 +08:00 |
|
李龙
|
b26be5fcb2
|
feat:(feature/REQ-3581) 提供通用的更新变更签证记录的接口，没有记录操作日志和发送mq
|
2025-02-21 10:29:18 +08:00 |
|
|
|
2ed1b5d079
|
Merge branch 'feature/REQ-3300' into feature/REQ-3581
|
2025-02-21 09:46:58 +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 |
|
|
|
9111961327
|
feat(REQ-3300) - 移除一些无用代码
|
2025-02-20 17:36:43 +08:00 |
|
|
|
26255e8fdd
|
feat(REQ-3300) - 调整发起工作流的人员信息拼接逻辑
|
2025-02-20 17:23:52 +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 |
|
李龙
|
ccac6feff8
|
feat:(feature/REQ-3581) visaRelation增加createBy,updateBy返回
|
2025-02-20 13:48:10 +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 |
|
|
|
ca344761dd
|
feat(REQ-3300) - 调整按钮枚举
|
2025-02-20 11:12:09 +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
|
7438e47cde
|
feat: (REQ-3300) 编辑页面与详情页面，直接提交审批时，操作日志优化
|
2025-02-20 10:41:29 +08:00 |
|
xudawei
|
9f99b2ff61
|
feat: (REQ-3300) 按钮排序
|
2025-02-20 10:14:21 +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 |
|
|
|
8143ef17b7
|
feat(REQ-3300) - 调整处理拉取审批列表的接口入参模型校验
|
2025-02-19 15:17:16 +08:00 |
|
xudawei
|
5a7cd9fe3e
|
feat: (REQ-3300) 查询变更签证集合接口优化
|
2025-02-19 10:50:23 +08:00 |
|
wangli
|
a8f0abb6ed
|
feat(REQ-3581) - 增加用印状态在列表以及按钮的逻辑
|
2025-02-18 21:51:24 +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 |
|
|
|
d3fe9e1bc5
|
feat(REQ-3300) - 添加按钮枚举
|
2025-02-18 18:30:46 +08:00 |
|
|
|
833f9aa083
|
feat(REQ-3300) - 添加用印状态枚举
|
2025-02-18 18:09:06 +08:00 |
|
chenwenjian
|
df61815c6c
|
feat(REQ-3300): 发起人列表进行权限过滤
|
2025-02-18 17:31:27 +08:00 |
|
chenwenjian
|
6a9c9c5022
|
feat(REQ-3300): 关联单据选择器适配统一主单据字段
|
2025-02-18 16:42:39 +08:00 |
|
chenwenjian
|
684a491c4d
|
feat(REQ-3300): 关联单据选择器适配统一主单据字段
|
2025-02-18 16:19:54 +08:00 |
|
chenwenjian
|
74569127f4
|
feat(REQ-3300): 获取子单据关联的主单据api
|
2025-02-18 14:03:51 +08:00 |
|
|
|
1afa46c21a
|
feat(REQ-3300) - 完善群解散功能
|
2025-02-17 17:26:54 +08:00 |
|
|
|
a2d052dcde
|
feat(REQ-3300) - 调整变洽签关联表的枚举类型
|
2025-02-17 14:51:59 +08:00 |
|
chenwenjian
|
8257e22bfb
|
Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
|
2025-02-17 13:44:23 +08:00 |
|
chenwenjian
|
86e8f065bf
|
feat(REQ-3300): 保存签证记录发起人nodeId
|
2025-02-17 13:44:12 +08:00 |
|
|
|
20135c3a9b
|
feat(REQ-3300) - 调整待办变量名
|
2025-02-17 11:29:03 +08:00 |
|
|
|
c085dfa689
|
feat(REQ-3300) - 调整待办变量名
|
2025-02-17 11:20:03 +08:00 |
|
chenwenjian
|
f9f3fd79f5
|
Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
|
2025-02-17 09:36:17 +08:00 |
|
chenwenjian
|
fde489fb47
|
feat(REQ-3300): 单据选择器过滤不可选状态单据
|
2025-02-17 09:35:15 +08:00 |
|
wangli
|
7f7eb28317
|
feat(REQ-3300) - 细化单据创建流程的逻辑
|
2025-02-15 00:38:21 +08:00 |
|
xudawei
|
d21a2d3bd2
|
Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
|
2025-02-14 18:23:16 +08:00 |
|
xudawei
|
9faf2a277f
|
feat: (REQ-3300) 详情页按钮放开
|
2025-02-14 18:23:11 +08:00 |
|
|
|
ccc76ced42
|
feat(REQ-3300) - 调整IM横条的响应模型
|
2025-02-14 16:53:01 +08:00 |
|
chenwenjian
|
701c8ff24c
|
feat(REQ-3300): 发生内容及说明添加图框id
|
2025-02-14 14:42:59 +08:00 |
|
xudawei
|
4b0a4f5669
|
feat: (REQ-3300) 详情中加上相关确认人的头像与岗位
|
2025-02-13 18:50:38 +08:00 |
|
xudawei
|
1f5aab0fb7
|
Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
|
2025-02-13 17:37:49 +08:00 |
|
xudawei
|
a98d601068
|
feat: (REQ-3300) 详情中加上相关确认人的头像与岗位
|
2025-02-13 17:37:44 +08:00 |
|
|
|
9fce1e5698
|
feat(REQ-3300) - 调整仅发起审批时，调整单号唯一性校验
|
2025-02-13 16:09:33 +08:00 |
|
xudawei
|
59acbbf2b5
|
Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
|
2025-02-13 14:34:02 +08:00 |
|
xudawei
|
2afb9b1715
|
feat: (REQ-3300) 提交审批时，单独加上校验接口
|
2025-02-13 14:33:57 +08:00 |
|
chenwenjian
|
35e126307f
|
feat(REQ-3300): 变更金额与搜索日期修正
|
2025-02-13 11:26:10 +08:00 |
|
xudawei
|
96e0170c00
|
feat: (REQ-3300) 分页列表-按钮权限优化
|
2025-02-12 18:50:55 +08:00 |
|
chenwenjian
|
92a2f7c9e6
|
feat(REQ-3300): 暂存-关联单据模型调整适配
|
2025-02-12 11:26:11 +08:00 |
|
|
|
a870a25ae6
|
feat(REQ-3300) - 调整变洽签主单据保存的入参模型
|
2025-02-12 10:10:49 +08:00 |
|
chenwenjian
|
b268bfd727
|
feat(REQ-3300): 分页列表-操作列及状态列调整
|
2025-02-11 18:00:05 +08:00 |
|
xudawei
|
a791c7180c
|
feat: (REQ-3300) 列表页重新复制属性,待提报:TO_REPORT/REPORT_FROM_APPROVE,决策中:DECIDING/DECIDING_FROM_APPROVE
|
2025-02-11 17:41:25 +08:00 |
|
|
|
cdbf8606af
|
Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
|
2025-02-11 14:28:39 +08:00 |
|
|
|
e25d227d1f
|
feat(REQ-3300) - 调整变更金额的必填逻辑
|
2025-02-11 14:28:32 +08:00 |
|
xudawei
|
cdbc22518f
|
feat: (REQ-3300) 发起人与决策人,添加打印按钮
|
2025-02-11 14:20:40 +08:00 |
|
chenwenjian
|
2cb42d034f
|
feat(REQ-3300): 导出调试修复
|
2025-02-10 20:46:30 +08:00 |
|
chenwenjian
|
228190f217
|
feat(REQ-3300): 导出调整
|
2025-02-10 18:27:06 +08:00 |
|
chenwenjian
|
d66c56b36f
|
feat(REQ-3300): 删除按钮-调整
|
2025-02-10 17:15:30 +08:00 |
|
chenwenjian
|
3a53fd28b1
|
feat(REQ-3300): 删除按钮
|
2025-02-10 16:43:12 +08:00 |
|
xudawei
|
f1aaaf828c
|
Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
# Conflicts:
# visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
|
2025-02-10 14:49:59 +08:00 |
|
xudawei
|
fb8d81bf7c
|
feat: (REQ-3300) 变更单详情-加上示例:区域/专业
|
2025-02-10 14:47:54 +08:00 |
|
chenwenjian
|
f85ea2e404
|
feat(REQ-3300): 发起群聊响应对象调整
|
2025-02-10 14:37:04 +08:00 |
|
|
|
cdc830ec96
|
feat(REQ-3300) - 调整查询变洽签关联的审批信息集合
|
2025-02-10 14:30:27 +08:00 |
|
xudawei
|
c09bae37c2
|
Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
# Conflicts:
# visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
|
2025-02-10 11:38:47 +08:00 |
|
xudawei
|
b40f421abb
|
feat: (REQ-3300) 变更单详情-专业与区域优化
|
2025-02-10 11:35:13 +08:00 |
|
chenwenjian
|
a44561b38b
|
feat(REQ-3300): 作废单据，取消关联单据和图纸
|
2025-02-10 11:05:17 +08:00 |
|
|
|
05580f6aa0
|
feat(REQ-3300) - PRD 更新，更随调整 IM 群浮条的展示逻辑，已经新增的文案
|
2025-02-08 17:36:20 +08:00 |
|
