Commit Graph

213 Commits

Author SHA1 Message Date
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
74989c04aa feat(REQ-3300) - 调整 IM 群中 tips 的文案 2025-02-08 16:31:37 +08:00
xudawei
1414b9cf7f Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-08 15:48:50 +08:00
xudawei
6087aa5266 feat: (REQ-3300) 变更签证数据权限优化 2025-02-08 15:48:45 +08:00
5e161d7456 feat(REQ-3300) - 新增变洽签追加附件的功能逻辑 2025-02-08 14:59:26 +08:00
xudawei
934c693db7 feat: (REQ-3300) 审批流审批不通过/单个审批流审批通过记录操作日志 2025-02-08 11:38:04 +08:00
chenwenjian
ae7a384cec 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-08 10:01:05 +08:00
chenwenjian
51f1e42a4b feat(REQ-3300): 分页调试修复 2025-02-08 09:58:31 +08:00
cb54953be4 feat(REQ-3300) - 完善发送卡片的逻辑 2025-02-07 19:01:22 +08:00
26acc70573 feat(REQ-3300) - 调整 SuperBuilder 注解 2025-02-07 18:15:08 +08:00
b7358e4081 feat(REQ-3300) - 调整 SuperBuilder 注解 2025-02-07 18:02:28 +08:00
xudawei
92d80654a7 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-07 17:33:08 +08:00
xudawei
81a000e4d0 feat: (REQ-3300) VisaHelper保存操作日志checkstyle优化 2025-02-07 17:33:00 +08:00
41e69ea0c7 feat(REQ-3300) - 添加 IM 相关事件的监听处理逻辑 2025-02-07 17:05:56 +08:00
xudawei
38fb0ba163 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-07 16:15:48 +08:00
xudawei
df4d6a7827 feat: (REQ-3300) VisaHelper保存操作日志NPE判断 2025-02-07 16:15:43 +08:00
chenwenjian
c3cb2ca3a1 feat(REQ-3300): 群聊提交审批数据构建 2025-02-07 14:54:05 +08:00
chenwenjian
7db033260d feat(REQ-3300): 提交审批校验 2025-02-07 11:44:00 +08:00
xudawei
a918d028bb 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-07 10:22:12 +08:00
xudawei
3f260a9823 feat: (REQ-3300) 变更单详情加上发起人头像/发起人岗位/发起人公司 2025-02-07 10:15:30 +08:00
wangli
9194506e2a feat(REQ-3300) - 增加审批结束后,回退单据状态的逻辑 2025-02-06 23:49:04 +08:00
wangli
a8d01d2ca4 feat(REQ-3300) - 增加 IM 群聊中的重新发起和发起执行两个按钮的逻辑 2025-02-06 22:18:48 +08:00
wangli
b2bb2ec3d4 feat(REQ-3300) - 增加 IM 群聊中的重新发起和发起执行两个按钮的逻辑 2025-02-06 22:17:44 +08:00
7a7aae20c0 feat(REQ-3300) - 添加 IM 群聊Tips 的提交审批按钮 2025-02-06 18:52:28 +08:00
xudawei
6023ae8f82 feat: (REQ-3300) 变更签证详情-相关单据类型优化 2025-02-06 17:15:02 +08:00
xudawei
9cea4408d7 feat: (REQ-3300) FeignConfig加上thor 2025-02-06 16:53:10 +08:00
952f0e3d55 feat(REQ-3300) - 添加 IM 群聊Tips 按钮的操作接口 2025-02-06 15:59:30 +08:00
xudawei
34b7cfd5f0 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-06 15:48:11 +08:00
xudawei
bb3fa9b9d0 feat: (REQ-3300) 变更签证详情-代码优化 2025-02-06 15:47:57 +08:00
chenwenjian
b5d642eade feat(REQ-3300): 变更单被关联信息 2025-02-06 15:28:34 +08:00
chenwenjian
90720043f4 feat(REQ-3300): VisaChangeTempCreateReq模型调整 2025-02-06 15:08:23 +08:00
7a8babc487 feat(REQ-3300) - 调整入参模型 2025-02-06 15:05:22 +08:00
a7422eea5f feat(REQ-3300) - 调整入参模型 2025-02-06 15:04:21 +08:00
523848c319 feat(REQ-3300) - 调整入参模型 2025-02-06 14:45:55 +08:00
13ef670f85 feat(REQ-3300) - 调整入参模型 2025-02-06 14:32:59 +08:00
xudawei
d96ab83847 feat: (REQ-3300) 修复启动报错-类加载 2025-02-06 11:39:14 +08:00
88c815ee86 feat(REQ-3300) - 调整 IM 群聊 Tips 的模型 2025-02-06 10:35:28 +08:00
ac46449b80 feat(REQ-3300) - 增加变洽签废止功能 2025-02-06 10:11:06 +08:00