 wangzhijiang
|
eb6ab02004
|
设计、验证、prehomo流程发起人退回，发消息内容完善。
|
2022-07-05 18:33:34 +08:00 |
|
|
wangzhijiang
|
09551f2434
|
设计、验证、prehomo删除dre工程师接口完善。
|
2022-07-05 16:46:45 +08:00 |
|
|
wangzhijiang
|
76d9490cd0
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-05 16:22:05 +08:00 |
|
|
wangzhijiang
|
0a0902cba6
|
设计、prehomo、验证 下发dre，判断是否发过消息。
|
2022-07-05 16:20:45 +08:00 |
|
|
wangzhijiang
|
53ac7c5566
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-05 14:57:53 +08:00 |
|
|
wangzhijiang
|
093b37bb3a
|
任务确认-发送飞书消息404问题修改。
|
2022-07-05 14:47:23 +08:00 |
|
|
wangzhijiang
|
0760302759
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-05 14:23:40 +08:00 |
|
|
wangzhijiang
|
950bbcb66f
|
设计、prehomo、验证符合性流程，发起人退回发消息内容完善。
|
2022-07-05 14:21:58 +08:00 |
|
|
wangzhijiang
|
bf7bf93c92
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-07-04 18:03:35 +08:00 |
|
|
wangzhijiang
|
8c36f0c2fa
|
法规-流程历史表-列表查询接口开发。
|
2022-07-04 18:02:41 +08:00 |
|
|
wangzhijiang
|
30fd6b7f89
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-07-04 17:45:46 +08:00 |
|
|
wangzhijiang
|
52e8f9d5fb
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-07-04 17:45:17 +08:00 |
|
|
wangzhijiang
|
53f97b5d62
|
批量添加评估结果接口。
|
2022-07-04 17:44:54 +08:00 |
|
|
wangzhijiang
|
c353fbc6f6
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-04 17:20:14 +08:00 |
|
|
wangzhijiang
|
0185003adb
|
法规清单，展示清单确认状态修改。
|
2022-07-04 17:20:02 +08:00 |
|
|
wangzhijiang
|
ecbf1abd00
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-07-04 17:01:51 +08:00 |
|
|
wangzhijiang
|
ab1dfcba6c
|
法规参数收集。
|
2022-07-04 17:01:26 +08:00 |
|
|
wangzhijiang
|
d3fa631771
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-04 16:00:54 +08:00 |
|
|
wangzhijiang
|
b63d720da0
|
任务确认流程-分配dre给dre发消息，内容修改。
|
2022-07-04 16:00:09 +08:00 |
|
|
wangzhijiang
|
0231ddddd0
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-04 15:48:53 +08:00 |
|
|
wangzhijiang
|
373afeff46
|
流程相关-消息类型修改。
|
2022-07-04 15:47:52 +08:00 |
|
|
wangzhijiang
|
2bafcd9ae7
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-04 15:06:31 +08:00 |
|
|
wangzhijiang
|
2a4f848d7e
|
设计、prehomo、验证符合性流程，发起人审核退回，给责任人发消息（模板需要提供）
|
2022-07-04 15:06:15 +08:00 |
|
|
wangzhijiang
|
1a813cc0dd
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-07-04 13:59:50 +08:00 |
|
|
wangzhijiang
|
7d2998cd52
|
法规意见收集，列表数据处理。
|
2022-07-04 13:59:11 +08:00 |
|
|
wangzhijiang
|
c3d02f6996
|
法规清单-角色中英文切换完善
|
2022-07-02 09:12:32 +08:00 |
|
|
wangzhijiang
|
eee6db760d
|
法规清单-选择角色中英文切换。
|
2022-07-01 19:16:49 +08:00 |
|
|
wangzhijiang
|
37606d0306
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-01 18:51:20 +08:00 |
|
|
wangzhijiang
|
b82a067d10
|
设计、prehomo、验证符合性流程，dre提交，给责任人发消息。
|
2022-07-01 18:50:57 +08:00 |
|
|
wangzhijiang
|
43e98bbbf0
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-01 18:29:05 +08:00 |
|
|
wangzhijiang
|
2e2f07f1d7
|
设计、prehomo、验证符合性流程，责任人回复dre发送消息。
|
2022-07-01 18:28:43 +08:00 |
|
|
wangzhijiang
|
d156de1ce8
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-01 17:29:15 +08:00 |
|
|
wangzhijiang
|
d65bac3c2b
|
法规清单列表查询 清单确认状态修改（增加了四种）。
法规清单确认，法规、认证工程师 通过、拒绝时 发送消息 - 55228bug处理。
|
2022-07-01 17:28:47 +08:00 |
|
|
wangzhijiang
|
77accc3efd
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-01 15:09:10 +08:00 |
|
|
wangzhijiang
|
00069bf0da
|
工作流数据库sql更新。
|
2022-07-01 15:08:29 +08:00 |
|
|
wangzhijiang
|
82e254e0d3
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-01 14:52:23 +08:00 |
|
|
wangzhijiang
|
43797582ac
|
设计、prehomo、验证符合性流程，分配工程师校验（不能分配给自己）。
|
2022-07-01 14:51:54 +08:00 |
|
|
wangzhijiang
|
946a8f44b3
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-01 14:02:58 +08:00 |
|
|
wangzhijiang
|
37d1d71f22
|
法规清单列表查询优化-列表查询转换字典值方式修改
|
2022-07-01 14:02:32 +08:00 |
|
|
wangzhijiang
|
278f60a0f0
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-06-30 15:47:51 +08:00 |
|
|
wangzhijiang
|
6f50ba4da1
|
流程相关定时器，格式化日期修改。
|
2022-06-30 15:46:48 +08:00 |
|
|
wangzhijiang
|
828a705731
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-06-30 15:03:37 +08:00 |
|
|
wangzhijiang
|
13cf7620d9
|
法规意见收集流程定时器：当前日期大于数据截止日期，自动提交未提交的任务以及更新状态。
|
2022-06-30 15:02:46 +08:00 |
|
|
wangzhijiang
|
8302c5cfa3
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-06-23 14:57:05 +08:00 |
|
|
wangzhijiang
|
ba05f52c00
|
法规意见收集流程相关开发。
|
2022-06-23 14:56:37 +08:00 |
|
|
wangzhijiang
|
3255cafac8
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-06-23 09:17:19 +08:00 |
|
|
wangzhijiang
|
05fe5584be
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-06-22 16:34:01 +08:00 |
|
|
wangzhijiang
|
5f72aef0dd
|
法规意见收集流程开发：
法规意见收集-评估结果表。
法规意见收集表。
法规-流程历史表。
表SQL。
|
2022-06-22 16:33:38 +08:00 |
|
|
wangzhijiang
|
1a8a3461c4
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-06-21 10:49:41 +08:00 |
|
|
wangzhijiang
|
76ebd33e0d
|
bug54621处理。消息内容 跳转页面带项目名称、项目年代号。
|
2022-06-21 10:49:20 +08:00 |
|
|
wangzhijiang
|
6b4a11afb3
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-06-21 10:13:15 +08:00 |
|
|
wangzhijiang
|
3dc4ac411c
|
bug54574处理，复制法规清单，同步任务清单表数据。
|
2022-06-21 10:12:39 +08:00 |
|
|
wangzhijiang
|
f9d6dd4bbe
|
bug54600处理。
|
2022-06-21 09:49:50 +08:00 |
|
|
wangzhijiang
|
68fadab0f5
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-06-20 18:13:53 +08:00 |
|
|
wangzhijiang
|
41d1e36261
|
发送消息，跳转至项目详情页，带参数 projectName
|
2022-06-20 18:13:13 +08:00 |
|
|
wangzhijiang
|
1693108753
|
Merge remote-tracking branch 'origin/master'
|
2022-06-17 16:47:49 +08:00 |
|
|
wangzhijiang
|
59762ab65c
|
update
|
2022-06-17 16:47:30 +08:00 |
|
|
wangzhijiang
|
dad4498342
|
bug 54015
|
2022-06-17 10:58:37 +08:00 |
|
|
wangzhijiang
|
d303b5e811
|
Merge remote-tracking branch 'origin/master'
|
2022-06-16 10:01:31 +08:00 |
|
|
wangzhijiang
|
1ea29cda84
|
设计、验证、prehomo流程，更新任务状态时，发送websocket
|
2022-06-16 09:55:22 +08:00 |
|
|
wangzhijiang
|
08eec96bcd
|
Merge remote-tracking branch 'origin/master'
|
2022-06-15 18:27:29 +08:00 |
|
|
wangzhijiang
|
130609a818
|
法规清单-催办接口开发。
|
2022-06-15 18:26:55 +08:00 |
|
|
wangzhijiang
|
f89512acdd
|
Merge remote-tracking branch 'origin/master'
|
2022-06-15 11:49:29 +08:00 |
|
|
wangzhijiang
|
eec228e426
|
Merge remote-tracking branch 'origin/master'
|
2022-06-15 11:49:03 +08:00 |
|
|
wangzhijiang
|
149f06fb33
|
流程-定时任务加日志。
|
2022-06-15 11:48:50 +08:00 |
|
|
wangzhijiang
|
d3ce6b6543
|
bug修改。
|
2022-06-15 11:02:55 +08:00 |
|
|
wangzhijiang
|
7cdd670fde
|
Merge remote-tracking branch 'origin/master'
|
2022-06-15 10:57:21 +08:00 |
|
|
wangzhijiang
|
a81a2cef78
|
登录-获取用户角色信息
|
2022-06-15 10:57:02 +08:00 |
|
|
wangzhijiang
|
676a51f23a
|
Merge remote-tracking branch 'origin/master'
|
2022-06-15 09:34:37 +08:00 |
|
|
wangzhijiang
|
64ed4d04b0
|
查询法规清单-条件修改。
|
2022-06-15 09:34:16 +08:00 |
|
|
wangzhijiang
|
0b3eb8b229
|
Merge remote-tracking branch 'origin/master'
|
2022-06-11 16:25:25 +08:00 |
|
|
wangzhijiang
|
74a5f5d0b1
|
法规清单-导出word，获取word模板完善。
|
2022-06-11 16:24:41 +08:00 |
|
|
wangzhijiang
|
e9d2db2e2a
|
Merge remote-tracking branch 'origin/master'
|
2022-06-11 13:32:37 +08:00 |
|
|
wangzhijiang
|
d9e69f1d5c
|
Merge remote-tracking branch 'origin/master'
|
2022-06-11 13:31:50 +08:00 |
|
|
wangzhijiang
|
eb0047f617
|
法规清单-导出word修改。只导英文，模板更新。
|
2022-06-11 13:31:36 +08:00 |
|
|
wangzhijiang
|
6baf1c3ba4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
|
2022-06-06 15:07:28 +08:00 |
|
|
wangzhijiang
|
a1f1679d1f
|
项目库-项目与角色关系表开发。
|
2022-06-06 15:06:06 +08:00 |
|
|
wangzhijiang
|
d4a8855af3
|
流程 - 提交任务 发送webSocket消息。
|
2022-06-01 10:44:51 +08:00 |
|
|
wangzhijiang
|
8da0bb6b94
|
Merge remote-tracking branch 'origin/master'
|
2022-05-31 09:36:41 +08:00 |
|
|
wangzhijiang
|
ff93603d5a
|
流程发送消息-定时器统一修改
|
2022-05-31 09:36:10 +08:00 |
|
|
wangzhijiang
|
dcd334f5e8
|
Merge remote-tracking branch 'origin/master'
|
2022-05-30 11:21:42 +08:00 |
|
|
wangzhijiang
|
f4c7b32440
|
任务清单-验证符合性审查流程待办明细表id返回。
|
2022-05-30 11:19:55 +08:00 |
|
|
wangzhijiang
|
3795959af8
|
Merge remote-tracking branch 'origin/master'
|
2022-05-30 10:42:22 +08:00 |
|
|
wangzhijiang
|
993e47ba48
|
法规清单-update
|
2022-05-30 10:41:39 +08:00 |
|
|
wangzhijiang
|
4f68733643
|
法规清单-update
|
2022-05-30 10:40:30 +08:00 |
|
|
wangzhijiang
|
752d06446e
|
Merge remote-tracking branch 'origin/master'
|
2022-05-29 11:12:39 +08:00 |
|
|
wangzhijiang
|
215dfa906a
|
法规清单-导出word报告完善。
法规清单-编辑流程 发起人 责任人 设置空值。
设计、验证、prehomo 责任人填写工程交付增加历史。
|
2022-05-29 11:12:15 +08:00 |
|
|
wangzhijiang
|
c577d1260b
|
Merge remote-tracking branch 'origin/master'
|
2022-05-27 09:07:47 +08:00 |
|
|
wangzhijiang
|
c8d8237fa0
|
流程相关 消息修改
|
2022-05-26 19:52:42 +08:00 |
|
|
wangzhijiang
|
70a0649bf1
|
Merge remote-tracking branch 'origin/master'
|
2022-05-26 17:05:11 +08:00 |
|
|
wangzhijiang
|
4b1d2fca5c
|
任务清单列表查询 - 使用stream使用流进行多字段排序（法规创建日期、法规号）。
流程中涉及到发送消息 - 去掉 (project name) 内容。
|
2022-05-26 15:29:59 +08:00 |
|
|
wangzhijiang
|
d3d9eed559
|
Merge remote-tracking branch 'origin/master'
|
2022-05-25 18:01:23 +08:00 |
|
|
wangzhijiang
|
1a14907922
|
变更接口完善。
studio编辑法规清单，同步影响设计符合性流程、prehomo确认流程、验证符合性流程。
|
2022-05-25 18:00:52 +08:00 |
|
|
wangzhijiang
|
9dd4d7d43b
|
下载word报告、变更接口完善。
|
2022-05-24 19:04:53 +08:00 |
|
|
wangzhijiang
|
802ab04594
|
下载法规清单word文件接口开发。
根据项目库id 查询当前登陆人在该项目中是什么角色接口开发。
|
2022-05-24 17:30:48 +08:00 |
|
|
wangzhijiang
|
45a5780138
|
Merge remote-tracking branch 'origin/master'
|
2022-05-24 09:59:17 +08:00 |
|
|
wangzhijiang
|
f7919d7cb1
|
下载报告，导出pdf版本。
|
2022-05-24 09:58:48 +08:00 |
|
|
wangzhijiang
|
fd5bc08fc0
|
Merge remote-tracking branch 'origin/master'
|
2022-05-23 20:30:43 +08:00 |
|
|
wangzhijiang
|
79c4014ed3
|
增加配置文件 导出pdf临时文件路径 设置 、 仿宋体字体文件路径 设置
增加iText导出pdf文件依赖。
|
2022-05-23 20:30:26 +08:00 |
|
|
wangzhijiang
|
d59a93ade1
|
Merge remote-tracking branch 'origin/master'
|
2022-05-23 15:27:50 +08:00 |
|