Commit Graph

272 Commits

Author SHA1 Message Date
chenwenjian
3a53fd28b1 feat(REQ-3300): 删除按钮 2025-02-10 16:43:12 +08:00
xudawei
031ad73050 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-10 16:24:41 +08:00
xudawei
8fb3e221e5 feat: (REQ-3300) 变更单详情-加上主题topic 2025-02-10 16:24:36 +08:00
f1f77e2d24 feat(REQ-3300) - 调整提交审批的逻辑 2025-02-10 15:00:47 +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
1d528a92e6 feat(REQ-3300) - 解决编译问题 2025-02-10 14:31:57 +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
chenwenjian
d791d2b7f7 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-08 18:44:25 +08:00
chenwenjian
2c3ad3ce17 feat(REQ-3300): 导出 2025-02-08 18:44:07 +08:00
a7dfbc31cd feat(REQ-3300) - 添加 IM 群中重新发起后,需要重新发送卡片消息 2025-02-08 18:00:44 +08:00
31cfa5f152 feat(REQ-3300) - 添加 IM 群中重新发起后,需要重新发送卡片消息 2025-02-08 17:59:14 +08:00
6113aaeab8 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-08 17:36:34 +08:00
05580f6aa0 feat(REQ-3300) - PRD 更新,更随调整 IM 群浮条的展示逻辑,已经新增的文案 2025-02-08 17:36:20 +08:00
chenwenjian
5aaf8853ed Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-08 17:28:48 +08:00
chenwenjian
a018e89e85 feat(REQ-3300): 暂存编辑创建人问题修复 2025-02-08 17:28:37 +08:00
120b084158 feat(REQ-3300) - 增加一些 todo 项 2025-02-08 17:23:43 +08:00
2ada1a4031 feat(REQ-3300) - 完善不显示横条的逻辑 2025-02-08 17:22:08 +08:00
74989c04aa feat(REQ-3300) - 调整 IM 群中 tips 的文案 2025-02-08 16:31:37 +08:00
chenwenjian
a83ad7b79b Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-08 15:59:08 +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
chenwenjian
92ecc974e8 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-08 15:48:39 +08:00
d656d68a7f feat(REQ-3300) - 完善发送卡片时的变量赋值 2025-02-08 15:37:49 +08:00
chenwenjian
033dab1511 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-08 15:36:10 +08:00
chenwenjian
d7643685de feat(REQ-3300): nacos可配置项抽取 2025-02-08 15:35:56 +08:00
d253c15437 feat(REQ-3300) - 新增变洽签追加附件的功能逻辑 2025-02-08 15:08:11 +08:00
5e161d7456 feat(REQ-3300) - 新增变洽签追加附件的功能逻辑 2025-02-08 14:59:26 +08:00
chenwenjian
7184ee9395 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-08 14:08:13 +08:00
chenwenjian
e5e57973c9 feat(REQ-3300): 发起人信息构建调整 2025-02-08 14:08:00 +08:00
e132c28eff feat(REQ-3300) - code format 2025-02-08 13:48:29 +08:00
b5a38c78c3 feat(REQ-3300) - 完事多次重复审批,正确记录审批 ID 的逻辑 2025-02-08 13:47:17 +08:00
xudawei
934c693db7 feat: (REQ-3300) 审批流审批不通过/单个审批流审批通过记录操作日志 2025-02-08 11:38:04 +08:00
9859e8d29a feat(REQ-3300) - 添加变洽签日志事件处理类 2025-02-08 11:24:56 +08:00
0d5b31c217 feat(REQ-3300) - 添加变洽签日志事件处理类 2025-02-08 11:19:45 +08:00
chenwenjian
be52bd2741 feat(REQ-3300): 发起人信息构建调整 2025-02-08 10:54:23 +08:00
chenwenjian
debd0b1805 feat(REQ-3300): 分页查询校验调整 2025-02-08 10:29:48 +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
xudawei
65a484a194 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-07 18:26:10 +08:00
xudawei
15aa6efbb7 feat: (REQ-3300) fix-NPE 2025-02-07 18:26:06 +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
chenwenjian
6dfbf95f36 feat(REQ-3300): 暂存调试修复 2025-02-07 17:23:05 +08:00
09fce24189 feat(REQ-3300) - 添加 IM Feign 接口 2025-02-07 17:06:49 +08:00
a803b802f7 feat(REQ-3300) - 添加可 nacos 动态更新的属性 2025-02-07 17:06:19 +08:00
41e69ea0c7 feat(REQ-3300) - 添加 IM 相关事件的监听处理逻辑 2025-02-07 17:05:56 +08:00
a1f33a364d feat(REQ-3300) - 调整 IM 群成员变动后,需操作对应的投票记录 2025-02-07 17:04:38 +08:00
34bbba9f01 feat(REQ-3300) - 调整查询 IM 群成员的档案信息逻辑 2025-02-07 17:03:29 +08:00
82cad613ad Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-07 16:50:42 +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
bea156f7ee feat(REQ-3300) - 添加可用于 nacos 动态刷新的配置 Bean 2025-02-07 16:12:31 +08:00
chenwenjian
f540de8ff0 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-07 14:54:44 +08:00
chenwenjian
c3cb2ca3a1 feat(REQ-3300): 群聊提交审批数据构建 2025-02-07 14:54:05 +08:00
xudawei
7410c8fdb4 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-07 14:00:48 +08:00
xudawei
b9d4ccd59d feat: (REQ-3300) VisaHelper保存操作日志优化 2025-02-07 14:00:42 +08:00
chenwenjian
7db033260d feat(REQ-3300): 提交审批校验 2025-02-07 11:44:00 +08:00
xudawei
84b18ee6f6 feat: (REQ-3300) change_record_bill增加visaType 2025-02-07 10:31:12 +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
chenwenjian
f5a7ba894d feat(REQ-3300): 通过visaId构建审批提交对象 2025-02-06 18:43:02 +08:00
xudawei
692d1f3e37 feat: (REQ-3300) 专业加上demo 2025-02-06 18:22:08 +08:00
xudawei
78ccbbc7ca feat: (REQ-3300) ProjectApiGateway冲突修复 2025-02-06 17:55:47 +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
6ed96dd26d feat(REQ-3300): 适配VisaChangeTempCreateReq模型调整 2025-02-06 15:45:57 +08:00
chenwenjian
a0750551d1 feat(REQ-3300): 适配VisaChangeTempCreateReq模型调整 2025-02-06 15:37:55 +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
xudawei
3aa67ead16 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-06 10:41:04 +08:00
xudawei
b668855ea4 feat: (REQ-3300) 修复启动报错Bean冲突 2025-02-06 10:40:55 +08:00
88c815ee86 feat(REQ-3300) - 调整 IM 群聊 Tips 的模型 2025-02-06 10:35:28 +08:00
22363f0a1a feat(REQ-3300) - 调整中止审批流的中止原因 2025-02-06 10:19:20 +08:00
ac46449b80 feat(REQ-3300) - 增加变洽签废止功能 2025-02-06 10:11:06 +08:00
wangli
984af6df3e feat(REQ-3300) - 完善创建群聊的逻辑 2025-02-05 23:51:45 +08:00
xudawei
5614cdbbb0 feat: (REQ-3300) fix-complier-error 2025-02-05 20:37:36 +08:00
xudawei
8679cd1806 feat: (REQ-3300) 包路径增加nanopart 2025-02-05 20:24:33 +08:00
chenwenjian
96f5b89a41 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
# Conflicts:
#	visa/visa-server/src/main/java/cn/axzo/visa/server/service/ChangeRecordRelationService.java
#	visa/visa-server/src/main/java/cn/axzo/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
2025-02-05 20:15:45 +08:00
chenwenjian
1430cc3239 feat(REQ-3300): 暂存记录日志 2025-02-05 20:13:19 +08:00
7e4f684713 feat(REQ-3300) - 添加 IM 相关的横条操作功能 2025-02-05 20:12:28 +08:00
chenwenjian
d005acc350 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-05 19:57:15 +08:00
chenwenjian
81b2f14700 feat(REQ-3300): 编辑变更签证记录 2025-02-05 19:52:15 +08:00
54afa43a64 feat(REQ-3300) - 完善按钮枚举 2025-02-05 19:33:59 +08:00
xudawei
075cc9afc4 feat: (REQ-3300) 没有审批记录则详情中不在展示[查看审批记录] 2025-02-05 17:22:17 +08:00
xudawei
c089a68931 feat: (REQ-3300) VisaBillDto更改类型 2025-02-05 17:22:17 +08:00
xudawei
b878555256 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-05 16:35:48 +08:00
xudawei
4c102eeb60 feat: (REQ-3300) 变更签证列表权限开发 2025-02-05 16:35:42 +08:00
07e9749c30 feat(REQ-3300) - 跳转附件的模型 2025-02-05 15:02:45 +08:00
48ee448103 feat(REQ-3300) - 添加创建流程时,提交初始表单数据 2025-02-05 15:02:04 +08:00
d75b6fca45 feat(REQ-3300) - 解决编译问题 2025-02-05 13:44:42 +08:00
f629fe0d29 feat(REQ-3300) - 完善保持变洽签时,创建审批 2025-02-05 13:40:34 +08:00
xudawei
484a6acad2 feat: (REQ-3300) 新增或者编辑变更签证-操作日志记录 2025-02-05 11:23:29 +08:00
xudawei
33229ef538 feat: (REQ-3300) 新增或者编辑变更签证-操作日志记录 2025-02-05 10:37:21 +08:00
xudawei
d757be6b15 feat: (REQ-3300) 变更单详情-附件优化 2025-01-23 17:01:38 +08:00
xudawei
ee59b432e4 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-01-23 15:56:13 +08:00
xudawei
40192d8b6b feat: (REQ-3300) 变更签证状态变更与操作日志优化 2025-01-23 15:56:08 +08:00
chenwenjian
606f24903a Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
# Conflicts:
#	visa/visa-server/pom.xml
2025-01-23 15:17:00 +08:00
chenwenjian
7cd4dcaab1 feat(REQ-3300): 导出临时提交 2025-01-23 15:16:05 +08:00
chenwenjian
e2f09ad541 feat(REQ-3300): 导出临时提交 2025-01-23 15:15:16 +08:00
xudawei
82afc72ceb Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
# Conflicts:
#	visa/visa-server/src/main/java/cn/axzo/visa/server/service/ChangeRecordConfirmService.java
2025-01-23 15:05:42 +08:00
xudawei
85edcb0046 feat: (REQ-3300) 变更签证状态变更与操作日志优化 2025-01-23 15:05:13 +08:00
chenwenjian
ee4016c163 feat(REQ-3300): 编译修复 2025-01-22 11:33:41 +08:00
chenwenjian
72951f7132 feat(REQ-3300): 获取发起人列表实现 2025-01-22 11:27:33 +08:00
chenwenjian
2eca94cc67 feat(REQ-3300): 查询实现临时提交 2025-01-21 18:43:09 +08:00
xudawei
c801a5a3bd feat: (REQ-3300) 变更签证详情中增加相关单位/确认人 2025-01-21 17:20:01 +08:00
xudawei
9c274160b6 feat: (REQ-3300) 变更签证详情中增加关联任务单\整改单\变更单 2025-01-21 16:01:00 +08:00
chenwenjian
bcc845fe84 feat(REQ-3300): 暂存实现 2025-01-21 13:49:58 +08:00
chenwenjian
ea096d1f34 feat(REQ-3300): 暂存实现 2025-01-21 13:49:37 +08:00
chenwenjian
60c05a7d62 feat(REQ-3300): 冲突处理 2025-01-21 09:41:16 +08:00
chenwenjian
7ea7ff1e53 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
# Conflicts:
#	visa/visa-server/src/main/java/cn/axzo/visa/server/service/ChangeRecordRelationService.java
#	visa/visa-server/src/main/java/cn/axzo/visa/server/service/impl/ChangeRecordServiceImpl.java
2025-01-20 21:02:13 +08:00
chenwenjian
88edaaad59 feat(REQ-3300): 暂存变更签证临时提交 2025-01-20 20:57:39 +08:00
xudawei
d73cd16956 feat: (REQ-3300) 新增visa_change_record_bill:变更签证记录单据关系表 2025-01-20 20:10:12 +08:00
xudawei
1f0a41fca8 feat: (REQ-3300) 单据详情页接口优化 2025-01-20 16:07:16 +08:00
496e5a4cb1 feat(REQ-3300) - 增加流程已有的事件监听逻辑,并发送变更单据日志 MQ 2025-01-20 15:50:31 +08:00
e40c0b27e4 feat(REQ-3300) - 增加流程已有的事件监听逻辑,并发送变更单据日志 MQ 2025-01-20 10:48:49 +08:00
ab4fa5059d Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-01-17 19:05:06 +08:00
9eb76df3d2 feat(REQ-3300) - 集成 MQ,兼容流程的广播,并发送变洽签单据日志 MQ 事件 2025-01-17 19:04:53 +08:00
chenwenjian
b4cf3fc960 feat(REQ-3300): 字段名调整 2025-01-17 19:03:05 +08:00
xudawei
d1e6df0f2f feat: (REQ-3300) 单据详情页接口优化 2025-01-17 18:55:01 +08:00
xudawei
60540c23b3 feat: (REQ-3300) 单据详情页接口添加 2025-01-17 18:12:32 +08:00
chenwenjian
0f124a15b6 feat(REQ-3300): 添加导出、单据选择器变更签证接口定义 2025-01-17 18:04:50 +08:00
xudawei
956d6cd06e feat: (REQ-3300) 按钮权限功能添加 2025-01-17 16:26:38 +08:00
e85882aecc feat(REQ-3300) - 添加 MQ 配置 2025-01-17 16:23:52 +08:00
e556fbf701 feat(REQ-3300) - 添加工作流的 starter 依赖 2025-01-17 11:04:17 +08:00
b67950bd81 feat(REQ-3300) - 添加 jar 依赖 2025-01-17 10:18:04 +08:00
chenwenjian
02861537eb feat(REQ-3300): 添加导出变更签证接口定义 2025-01-16 18:55:20 +08:00
chenwenjian
79a98c2e3a feat(REQ-3300): 包名统一 2025-01-16 17:19:14 +08:00
chenwenjian
ef1f8d8400 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
# Conflicts:
#	visa/visa-api/src/main/java/cn/axzo/visa/api/changerecord/ChangeRecordApi.java
#	visa/visa-api/src/main/java/cn/axzo/visa/api/request/VisaChangePageSearchReq.java
2025-01-16 17:17:01 +08:00
chenwenjian
a28acc123b feat(REQ-3300): 添加变更签证分页查询接口定义 2025-01-16 17:14:00 +08:00
xudawei
fd0e1a22da feat: (REQ-3300) 更改变签状态添加API 2025-01-16 16:57:21 +08:00