Commit Graph
1430 Commits
Author SHA1 Message Date
liyawei 9d93aefbe7 认证-参数项收集-认证工程师来源为项目基本信息 2022-07-02 16:29:33 +08:00
zhn 50a39809f7 月报填写 2022-07-02 16:21:54 +08:00
qq787203167 1507953aee 删除无用代码 2022-07-02 13:41:51 +08:00
liyawei 140944f67b 认证-参数项收集-切换角色日志-编辑修改 2022-07-02 12:46:10 +08:00
zhn bf68ee69c0 法规月报填写 2022-07-02 11:41:32 +08:00
liyawei ee95f79566 认证-参数清单-权限 2022-07-02 11:02:02 +08:00
liyawei 3ba874dfe8 认证-参数清单-配置标识接口 2022-07-02 09:52:01 +08:00
zer0Black aaefa47298 记录部署信息 2022-07-02 09:37:11 +08:00
liyawei b39a4b02dc Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-01 17:15:09 +08:00
liyawei e3a7672a03 认证-参数项收集-飞书发送卡片消息 2022-07-01 17:14:40 +08:00
zhn 98fa36c7b9 月报标题模板--上移下移 2022-07-01 16:32:45 +08:00
liyawei 1f5d9aa3ec Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-01 16:19:20 +08:00
liyawei e1b926e21c 认证-参数项收集-分页 2022-07-01 16:19:12 +08:00
李雪涛 7afd56d019 合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!30
2022-07-01 15:21:34 +08:00
zer0Black e3c2475947 处理代码合并漏了的问题 2022-07-01 15:21:19 +08:00
李雪涛 44161c5bd9 合并分支 'dev_third_stage' 到 'master'
Dev third stage

查看合并请求 laws-nio/laws-weilai!29
2022-07-01 15:15:37 +08:00
李雪涛 c2972f49d5 合并分支 'master' 到 'dev_third_stage'
Master

查看合并请求 laws-nio/laws-weilai!27
2022-07-01 15:13:59 +08:00
李雪涛 61d64f1e29 合并分支 'master' 到 'fix_bug_first_stage'
Master

查看合并请求 laws-nio/laws-weilai!26
2022-07-01 15:13:46 +08:00
zer0Black a696406651 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/components/uploadFileChangeDown/file.vue
2022-07-01 15:12:31 +08:00
liyawei de5193c5f9 认证-参数项收集-参数项收集切换角色日志 2022-07-01 15:08:52 +08:00
wangzhijiang 00069bf0da 工作流数据库sql更新。 2022-07-01 15:08:29 +08:00
zer0Black 419aeafdba Merge remote-tracking branch 'origin/dev_third_stage' 2022-07-01 15:01:16 +08:00
zer0Black 03031f6563 Merge branch 'dev_third_stage' 2022-07-01 15:00:48 +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
zer0Black 1e5eb47d97 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-01 14:51:15 +08:00
zer0Black b3be2ec395 转发加上地址 2022-07-01 14:51:05 +08:00
zhn 69a239a897 项目状态看板--时间轴节点名称优化 2022-07-01 14:29:42 +08:00
zhn 5f082ef210 月报标题模板 2022-07-01 14:09:50 +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
zer0Black 50342fcbe4 飞书发送卡片消息对接完成 2022-07-01 13:38:20 +08:00
zer0Black 73d3fdba36 所有消息,接入飞书 2022-07-01 12:05:46 +08:00
liyawei 07540b83fb 认证-参数清单-状态触发点修改 2022-07-01 10:53:47 +08:00
zer0Black c32ebf0818 消息类型添加 2022-07-01 10:43:57 +08:00
zer0Black 407d95f8a4 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-06-30 22:38:57 +08:00
zer0Black 4d26c3e22a 飞书卡片消息封装(未测试) 2022-06-30 22:38:51 +08:00
zhn f893555845 高级搜索--值为空的时候 2022-06-30 17:25:20 +08:00
liyawei 7e9d744e00 认证-参数清单-bug55182 2022-06-30 17:13:40 +08:00
liyawei ace469130f 认证-参数清单-bug55184 2022-06-30 17:04:56 +08:00
zhn c0bcff2954 项目状态看板时间轴--项目名称 2022-06-30 16:19:58 +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
zhn f0b7a5c054 pdf下载添加水印 2022-06-30 15:36:31 +08:00
liyawei f292de72a7 认证-参数项收集-列表查询优化 2022-06-30 15:34:49 +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
zer0Black e679550a6f 按照责任领域的名称进行了正向排序 2022-06-30 14:58:40 +08:00
liyawei c20a9314e5 认证-参数项-bug55113 2022-06-30 11:46:47 +08:00
zhn 4eeb6a55c3 项目库--删除验证 2022-06-30 10:00:31 +08:00