Commit Graph

344 Commits

Author SHA1 Message Date
4fe7641b61 feat(REQ-3300) - 调整按钮相关的枚举返回 2025-02-17 14:32:40 +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
chenwenjian
297e9fb63e Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-17 11:21:48 +08:00
chenwenjian
df7303568f feat(REQ-3300): 单据选择器过滤不可选状态单据调整
数据过滤方案可能会导致分页存在每页不足数量的问题
2025-02-17 11:21:31 +08:00
c085dfa689 feat(REQ-3300) - 调整待办变量名 2025-02-17 11:20:03 +08:00
603e48012b feat(REQ-3300) - 调整从 IM 群中获取扩展信息 2025-02-17 10:45:36 +08:00
8e76906a5b feat(REQ-3300) - 调整IM创建群后,发送卡片和首条消息的逻辑 2025-02-17 10:34:47 +08:00
xudawei
2734265a49 feat: (REQ-3300) 详情中未查询到单据信息校验 2025-02-17 10:25:39 +08:00
xudawei
224902ff5f Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-17 10:15:06 +08:00
xudawei
d181c3d292 feat: (REQ-3300) 单据最新的状态是更新状态则返回false,不再抛出异常 2025-02-17 10:15:01 +08:00
2979389409 feat(REQ-3300) - 调整部分 gateway 的响应 2025-02-17 09:56:54 +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
8bb512d417 feat(REQ-3300) - 调整实体属性的更新逻辑 2025-02-15 18:11:47 +08:00
wangli
18b9e58cf0 feat(REQ-3300) - 优化审批结果监听 2025-02-15 12:51:31 +08:00
wangli
7f7eb28317 feat(REQ-3300) - 细化单据创建流程的逻辑 2025-02-15 00:38:21 +08:00
ff35b74ef0 feat(REQ-3300) - 调整创建审批的逻辑,以及审批完成后的一些异常处理 2025-02-14 18:36:51 +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
chenwenjian
1626f818ab Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-14 18:08:40 +08:00
chenwenjian
fc7b4700e3 feat(REQ-3300): 导出待提报数据仅发起人可见适配 2025-02-14 18:06:28 +08:00
f3d49d7ec4 feat(REQ-3300) - 调整创建审批的逻辑 2025-02-14 17:43:31 +08:00
ccc76ced42 feat(REQ-3300) - 调整IM横条的响应模型 2025-02-14 16:53:01 +08:00
chenwenjian
f26f5fcad4 feat(REQ-3300): 详情-变化金额 2025-02-14 16:52:16 +08:00
xudawei
3170512986 feat: (REQ-3300) 确认人岗位非空判断 2025-02-14 15:54:02 +08:00
chenwenjian
21d0a466d8 feat(REQ-3300): 分页查询单号与主题查询调整 2025-02-14 14:46:46 +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
3260fbf471 feat(REQ-3300) - 调整变洽签单据发起审批前的校验逻辑 2025-02-13 17:22:58 +08:00
74d5c87091 feat(REQ-3300) - 调整仅发起审批时,调整单号唯一性校验 2025-02-13 16:19:03 +08:00
9fce1e5698 feat(REQ-3300) - 调整仅发起审批时,调整单号唯一性校验 2025-02-13 16:09:33 +08:00
51786184a1 feat(REQ-3300) - 调整日期展示格式 2025-02-13 15:03:31 +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
ec0585233e feat(REQ-3300) - 调整发起审批的传参 2025-02-13 14:06:05 +08:00
chenwenjian
74908d6dff feat(REQ-3300): 发生内容及说明数量限制 2025-02-13 11:48:39 +08:00
chenwenjian
985ce3acf8 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-13 11:26:26 +08:00
chenwenjian
35e126307f feat(REQ-3300): 变更金额与搜索日期修正 2025-02-13 11:26:10 +08:00
9eb16e9595 feat(REQ-3300) - 调整日期展示格式 2025-02-13 11:21:03 +08:00
56f3d76495 feat(REQ-3300) - 调整变洽签单据在审批驳回时,单据被退回到待提报时,要解除一些关联 2025-02-12 19:04:01 +08:00
xudawei
96e0170c00 feat: (REQ-3300) 分页列表-按钮权限优化 2025-02-12 18:50:55 +08:00
xudawei
7262c9e525 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-12 18:49:33 +08:00
xudawei
ed9b79da3b feat: (REQ-3300) 分页列表-加上待提报只有发起人可以看到 2025-02-12 18:49:27 +08:00
chenwenjian
102d9f521f feat(REQ-3300): 任务单使用单号作为唯一键 2025-02-12 14:52:38 +08:00
chenwenjian
6b27021b5b feat(REQ-3300): 任务单使用单号作为唯一键 2025-02-12 14:51:11 +08:00
chenwenjian
ec5eb6628e feat(REQ-3300): 关联单据模型调整适配 2025-02-12 14:24:33 +08:00
chenwenjian
65675c9856 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-12 11:26:20 +08:00
chenwenjian
92a2f7c9e6 feat(REQ-3300): 暂存-关联单据模型调整适配 2025-02-12 11:26:11 +08:00
xudawei
f0579f5e17 feat: (REQ-3300) 编辑变更签证单,调用log-api保存变签快照至日志中 2025-02-12 11:15:04 +08:00
1a918ecade feat(REQ-3300) - 调整变洽签单据创建流程的入参模型 2025-02-12 10:21:04 +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
10f24a4258 feat: (REQ-3300) 列表页重新复制属性,待提报:TO_REPORT/REPORT_FROM_APPROVE,决策中:DECIDING/DECIDING_FROM_APPROVE 2025-02-11 17:43:12 +08:00
xudawei
a791c7180c feat: (REQ-3300) 列表页重新复制属性,待提报:TO_REPORT/REPORT_FROM_APPROVE,决策中:DECIDING/DECIDING_FROM_APPROVE 2025-02-11 17:41:25 +08:00
xudawei
5ed8b6775e feat: (REQ-3300) 列表页重新复制属性,待提报:TO_REPORT/REPORT_FROM_APPROVE,决策中:DECIDING/DECIDING_FROM_APPROVE 2025-02-11 16:29:27 +08:00
xudawei
b5bf13eaf7 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-11 16:17:01 +08:00
xudawei
2e7f0ebd68 feat: (REQ-3300) 提供列表页-personId/ouId/workspaceId获取角色 2025-02-11 16:16:56 +08:00
chenwenjian
f97e855cd9 feat(REQ-3300): 提交审批调整 2025-02-11 15:25:25 +08:00
chenwenjian
66f4bb59d4 feat(REQ-3300): 提交审批校验调整 2025-02-11 14:58:42 +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
463abb9e8d Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-11 14:20:45 +08:00
xudawei
cdbc22518f feat: (REQ-3300) 发起人与决策人,添加打印按钮 2025-02-11 14:20:40 +08:00
efe1dc2222 feat(REQ-3300) - 调整监听流程广播事件的枚举处理逻辑 2025-02-11 13:36:36 +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
60a6a64074 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300 2025-02-10 16:47:30 +08:00
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