Commit Graph

637 Commits

Author SHA1 Message Date
chenwenjian
da17676553 feat(REQ-3982): 审批流程状态调整 2025-04-19 17:53:43 +08:00
59317f814e feat(REQ-3982) - 调整价款审批发起的校验逻辑提示语 2025-04-19 17:49:34 +08:00
14e0add626 feat(REQ-3982) - 完善审批通知发送内部逻辑 2025-04-19 17:37:57 +08:00
74aebf1880 feat(REQ-3982) - 处理日志发送和内容变更,调整流程实例监听逻辑 2025-04-19 17:29:18 +08:00
yanglin
0ed4f10f36 REQ-3982: 备份 2025-04-19 17:20:36 +08:00
yanglin
58d91d48dc REQ-3982: 备份 2025-04-19 16:51:51 +08:00
yanglin
e0b8183982 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-19 16:30:40 +08:00
yanglin
237bb8c98d REQ-3982: 备份 2025-04-19 16:30:37 +08:00
chenwenjian
2207e2465a Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-19 15:21:10 +08:00
chenwenjian
4329d406f8 feat(REQ-3982): 详情页顶部按钮调整 2025-04-19 15:20:29 +08:00
yanglin
58e98bc6dd Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-19 15:11:28 +08:00
yanglin
10db6afc8b REQ-3982: 备份 2025-04-19 15:11:25 +08:00
2096568714 feat(REQ-3982) - 价款表单更新主业务相关单据,并正式发起审批 2025-04-19 14:56:49 +08:00
chenwenjian
53a8d32d4d feat(REQ-3982): 调用方法调整 2025-04-19 13:41:45 +08:00
chenwenjian
c7714a0615 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-19 11:21:43 +08:00
chenwenjian
cc5f601a3f feat(REQ-3982): 导出新增价款审批通过时间 2025-04-19 11:21:32 +08:00
chenwenjian
9c59afeb5f feat(REQ-3982): 导出新增价款审批通过时间 2025-04-19 11:20:54 +08:00
chenwenjian
5499e20838 feat(REQ-3982): 通过visaId获取关联单据 2025-04-19 11:09:08 +08:00
9d898fe451 feat(REQ-3982) - 新增价款确认审批表单提交 API 2025-04-19 10:55:08 +08:00
yanglin
db33c1967c REQ-3982: 处理报错 2025-04-19 10:40:04 +08:00
yanglin
69c82b3d51 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982
# Conflicts:
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
2025-04-19 10:14:49 +08:00
yanglin
17765f4f32 REQ-3982: 备份 2025-04-19 10:13:11 +08:00
chenwenjian
a273cd5116 feat(REQ-3982): 发起页新增合同相关字段 2025-04-19 09:33:25 +08:00
chenwenjian
f4cab3bff7 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-18 18:47:58 +08:00
chenwenjian
8e16ba250f feat(REQ-3982): 列表页查询 2025-04-18 18:46:55 +08:00
41e584acf0 feat(REQ-3982) - 新增价款确认审批表单提交 API 2025-04-18 18:03:37 +08:00
670b2f5583 feat(REQ-3982) - 调整枚举,以及实体 2025-04-18 17:22:12 +08:00
chenwenjian
54e347643c Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-18 16:57:50 +08:00
chenwenjian
cfa6edf9a2 feat(REQ-3982): 流程状态枚举定义 2025-04-18 11:34:09 +08:00
yanglin
c05e084b9b REQ-3982: 处理群聊横幅逻辑 2025-04-18 10:15:25 +08:00
cf5b11d61c feat(REQ-3581) - 补全审批完成后的通知逻辑 2025-03-20 15:58:12 +08:00
45aa2b9515 feat(REQ-3581) - 补全审批完成后的通知逻辑 2025-03-20 14:08:51 +08:00
2e0d4ef253 feat(REQ-3581) - 补全审批完成后的通知逻辑 2025-03-20 14:03:25 +08:00
c5e23cc7cd feat(REQ-3581) - 添加调用消息的通知日志打印 2025-03-20 11:43:17 +08:00
6913a23b25 feat(REQ-3581) - 添加调用消息的通知日志打印 2025-03-19 16:15:08 +08:00
e05dc34ff6 feat(REQ-3581) - 调整通知模板参数 2025-03-13 18:40:44 +08:00
7e9a50acaf feat(REQ-3581) - 完善腾讯撤销合同的逻辑 2025-03-13 17:54:41 +08:00
41bb353ae5 feat(REQ-3581) - 完善腾讯撤销合同的逻辑 2025-03-13 17:44:31 +08:00
cd3db49e9c feat(REQ-3581) - 补充用印申请待办的消息变量 2025-03-13 17:41:06 +08:00
ee5849c1b1 feat(REQ-3581) - 添加变洽签单据通知事件 code 默认值 2025-03-13 17:32:01 +08:00
d5041605de feat(REQ-3581) - 审批结束后发送自定义通知 2025-03-13 16:01:54 +08:00
1490e166f7 Merge remote-tracking branch 'origin/master' into feature/REQ-3581
# Conflicts:
#	visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/WorkflowGateway.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/VisaHelper.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
2025-03-13 15:42:17 +08:00
ca82d1f905 feat(REQ-3798) - 调整班组类型协同关系登录人的审批人获取逻辑 2025-03-12 17:03:01 +08:00
5c4e99b061 feat(REQ-3798) - 调整班组类型协同关系登录人的审批人获取逻辑 2025-03-12 16:41:36 +08:00
54afee381e feat(REQ-3581) - 调整如何没传图片,不再向流程转发 2025-03-12 16:35:45 +08:00
d4ba9cb11c feat(REQ-3581) - 调整用印文件按钮响应方式 2025-03-12 16:21:03 +08:00
5c0636578f feat(REQ-3798) - 调整施工区域的名称拼接 2025-03-12 14:45:50 +08:00
651c2e1365 feat(REQ-3798) - 调整施工区域的名称拼接 2025-03-12 10:10:44 +08:00
李龙
556411cdc6 feat:(feature/REQ-3581) 修改自动完成用印的逻辑判断,处理已经完成用印的情况 2025-03-11 18:25:22 +08:00
4b849575a9 feat(REQ-3581) - 解决变洽签列表是否应该返回申请用印按钮 2025-03-11 15:18:21 +08:00
e0d420981e feat(REQ-3581) - 解决变洽签列表是否应该返回申请用印按钮 2025-03-11 14:32:32 +08:00
932f7baf0e Merge remote-tracking branch 'origin/feature/REQ-3581' into feature/REQ-3581 2025-03-11 14:12:11 +08:00
7ef94bf45b feat(REQ-3581) - 调整文案 2025-03-11 14:11:58 +08:00
李龙
6bca45e162 feat:(feature/REQ-3581) 修改自动完成用印的逻辑判断,处理已经完成用印的情况 2025-03-11 14:08:51 +08:00
cbf78e5449 feat(REQ-3581) - 充解析印章返回的人 2025-03-11 11:41:29 +08:00
feafb4eea9 feat(REQ-3581) - 解决部分单位退场,nodeId 被删除的情况 2025-03-07 17:20:20 +08:00
6b815fe467 feat(REQ-3581) - 解决部分单位退场,nodeId 被删除的情况 2025-03-07 17:17:47 +08:00
5e6fd676a3 feat(REQ-3581) - 解决申请用印时,单位退场校验 2025-03-07 16:50:15 +08:00
bd6202d5d9 feat(REQ-3581) - 解决 API 调用解析异常 2025-03-07 16:30:00 +08:00
bea991f15d feat(REQ-3581) - 调整发起用印的日志 2025-03-07 15:15:39 +08:00
f468d75192 feat(REQ-3581) - 调整发起用印时,对每个单位传入的章有效性校验 2025-03-07 15:00:58 +08:00
94f3109908 feat(REQ-3798) - 完善撤销合同处理 2025-03-07 14:45:11 +08:00
李龙
b5f4bb0fdb feat:(feature/REQ-3581) 修改自动完成用印的逻辑判断,处理已经完成用印的情况 2025-03-07 13:38:25 +08:00
e11f73bceb feat(REQ-3798) - 完善节点处理 2025-03-07 13:37:46 +08:00
1fd603206a feat(REQ-3798) - 完善节点处理 2025-03-07 12:28:22 +08:00
5372642b2d feat(REQ-3581) - 增加腾讯小程序中撤销合同的处理逻辑 2025-03-07 12:18:58 +08:00
xudawei
4f479f1547 feat: (REQ-3798) 详情接口中区域优化 2025-03-06 17:14:56 +08:00
99ec5f738b feat(REQ-3798) - 处理签章合同创建逻辑 2025-03-06 16:27:12 +08:00
e788989e0a feat(REQ-3798) - 处理签章合同创建逻辑 2025-03-06 16:15:25 +08:00
b18e1f55c9 feat(REQ-3798) - 添加业务节点的处理 2025-03-06 14:58:33 +08:00
a0fbf84e29 feat(REQ-3798) - 添加业务节点的处理 2025-03-06 13:57:04 +08:00
227563ec40 feat(REQ-3581) - 兼容审批操作人未空 2025-03-06 10:30:05 +08:00
b586f20471 feat(REQ-3581) - 添加用印相关按钮只有发起人能使用 2025-03-06 10:29:30 +08:00
wangli
5c9c306f48 feat(REQ-3798) - 新增查询指定岗位的人的逻辑 2025-03-05 22:46:47 +08:00
7ce9279c68 feat(REQ-3798) - 调整 IM 群 Tips 操作浮条按钮逻辑 2025-03-05 14:42:20 +08:00
b4a2b4d1f8 feat(REQ-3798) - 针对需求对状态枚举进行变更 2025-03-05 14:36:40 +08:00
ec01a411f9 feat(REQ-3798) - 针对需求对状态枚举进行变更 2025-03-05 14:32:09 +08:00
6be3aecad9 feat(REQ-3798) - 针对需求对状态枚举进行变更 2025-03-05 14:11:20 +08:00
李龙
5560818d31 feat:(feature/REQ-3581) 修改自动完成用印的逻辑判断,要排除当前完成用印的数据 2025-03-05 11:16:54 +08:00
cc54310544 feat(REQ-3581) - 完善用印日志的处理 2025-03-05 10:42:40 +08:00
chenwenjian
9b651a8dd6 feat(REQ-3798): 施工区域与专业展示优化 2025-03-05 10:38:01 +08:00
chenwenjian
2e3f4cf060 feat(REQ-3798): 变洽签单据状态露出驳回待提报和决策中 2025-03-05 10:18:41 +08:00
chenwenjian
5ad3d762b6 feat(REQ-3798): 单据名称存储调整与适配 2025-03-04 18:23:36 +08:00
a4a34c89c4 feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 17:42:21 +08:00
f12ba26657 feat(REQ-3581) - 完善用印日志的处理 2025-03-04 15:49:55 +08:00
d0239ac1bf feat(REQ-3581) - 完善用印日志的处理 2025-03-04 15:28:20 +08:00
8bd8a5f385 feat(REQ-3581) - 完善用印日志的处理 2025-03-04 15:19:03 +08:00
2536c5b44c feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 14:52:24 +08:00
d3ee8df03a feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 14:51:42 +08:00
5bf6461a4d feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 14:32:49 +08:00
5fe4dd68de feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 14:31:10 +08:00
3e760facdd feat(REQ-3300) - 兼容用印进展中的单个单位申请用印 2025-03-04 11:43:30 +08:00
4b6e5a4945 feat(REQ-3300) - 合并 3300 2025-03-04 11:15:20 +08:00
414bc47042 Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3581
# Conflicts:
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
2025-03-04 11:14:47 +08:00
f362485fb7 feat(REQ-3300) - 增加变更签创建人记录 2025-03-04 11:11:30 +08:00
bf7314a0ca feat(REQ-3300) - 增加是否申请过用印的标识 2025-03-03 20:49:33 +08:00
4688034cac feat(REQ-3300) - 增加是否申请过用印的标识 2025-03-03 20:30:59 +08:00
d666810be2 feat(REQ-3300) - 增加一些校验逻辑,和日志补全 2025-03-03 17:20:56 +08:00
df7e95018f feat(REQ-3300) - 增加一些校验逻辑,和日志补全 2025-03-03 17:00:39 +08:00
chenwenjian
ea93847f19 feat(REQ-3300): 发起审批流填充参数确认人过滤工人 2025-03-03 15:09:10 +08:00