176yunxuan
|
c229ed59b8
|
fix:项目，系统，模块更新
代码检查 / 代码检查 (pull_request) Failing after 22s
|
2024-04-20 10:44:07 +08:00 |
|
xiangZr-hhh
|
ec2a30075d
|
feat: 新增接口
根据项目id查询名下所有子系统
根据子系统id查询名下所有子模块
|
2024-04-20 02:16:43 +08:00 |
|
xiangZr-hhh
|
07601350bf
|
fix: 审核模块
|
2024-04-20 01:46:52 +08:00 |
|
xiangZr-hhh
|
27268b5f3a
|
Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx
|
2024-04-19 19:38:21 +08:00 |
|
176yunxuan
|
50050f820f
|
bug:子模块子系统查询和添加bug修复
代码检查 / 代码检查 (pull_request) Successful in 3m47s
|
2024-04-19 18:41:36 +08:00 |
|
xiangZr-hhh
|
3f715f50a3
|
feat：日报模块 修改日报接口
|
2024-04-19 17:56:38 +08:00 |
|
xiangZr-hhh
|
cf4921397c
|
feat:日报模块 日报删除接口
|
2024-04-19 16:36:18 +08:00 |
|
xiangZr-hhh
|
04f1798811
|
feat:日报模块 日报搜索接口
添加日报搜索接口
|
2024-04-19 15:07:08 +08:00 |
|
xiangZr-hhh
|
037b36bf3f
|
patch:审核模块
审核模块代码部分解耦，增加可读性
|
2024-04-19 14:21:48 +08:00 |
|
|
|
04a5eae117
|
Merge branch 'develop' into feature-jie
代码检查 / 代码检查 (pull_request) Successful in 18s
|
2024-04-18 22:31:33 +08:00 |
|
|
|
e61b478225
|
Merge branch 'develop' into feature-zrx
代码检查 / 代码检查 (pull_request) Successful in 15s
|
2024-04-18 22:30:11 +08:00 |
|
176yunxuan
|
7d958bfa69
|
fix:申请模块根据名字查询项目，系统，模块
代码检查 / 代码检查 (pull_request) Successful in 16s
|
2024-04-18 22:25:07 +08:00 |
|
176yunxuan
|
5c33818e3d
|
fix:新增子系统，子模块，消息总数记录
代码检查 / 代码检查 (pull_request) Successful in 17s
|
2024-04-18 19:55:59 +08:00 |
|
xiangZr-hhh
|
0d05ea08fb
|
fix:审核查询接口修正
增加部分权限判断
|
2024-04-18 16:53:11 +08:00 |
|
xiangZr-hhh
|
9c4cb174eb
|
feat:新增日报模块查询我的日报接口
|
2024-04-18 16:08:40 +08:00 |
|
176yunxuan
|
e0d4d0e9c7
|
fix:添加项目权限，名字模糊查询项目
代码检查 / 代码检查 (pull_request) Successful in 19s
|
2024-04-18 15:17:08 +08:00 |
|
xiangZr-hhh
|
121b87c683
|
feat:新增日志模块日志添加接口
|
2024-04-18 15:01:05 +08:00 |
|
176yunxuan
|
3df0c754d3
|
fix:查询项目重构
|
2024-04-18 09:34:23 +08:00 |
|
176yunxuan
|
d2dc0527ab
|
fix:查询子模块，删除子模块子系统
代码检查 / 代码检查 (pull_request) Successful in 18s
|
2024-04-17 20:30:31 +08:00 |
|
176yunxuan
|
84d3ccc5af
|
fix:我负责我管理我参与的项目查询重构以及项目增加,系统模块数据表增加截止时间和状态字段
|
2024-04-17 17:03:35 +08:00 |
|
|
|
a2cd19675e
|
refactor: 对权限组的重新配置
|
2024-04-16 23:56:20 +08:00 |
|
|
|
49bcadd483
|
Merge branch 'develop' into feature-jie
代码检查 / 代码检查 (pull_request) Successful in 20s
|
2024-04-16 21:39:54 +08:00 |
|
176yunxuan
|
7db82c57e2
|
bug:消息修改
代码检查 / 代码检查 (pull_request) Successful in 18s
|
2024-04-16 19:40:05 +08:00 |
|
xiangZr-hhh
|
8ab59b5a1d
|
patch:补丁
代码检查 / 代码检查 (pull_request) Successful in 23s
修正部分数据表字段，修正对应接口
|
2024-04-16 16:07:06 +08:00 |
|
xiangZr-hhh
|
bc545bbd76
|
Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx
# Conflicts:
# src/main/java/com/jsl/oa/mapper/ProjectMapper.java
# src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
|
2024-04-16 14:31:33 +08:00 |
|
|
|
05ccc3fdd8
|
patch: 部分内容进行补丁
代码检查 / 代码检查 (pull_request) Successful in 23s
- 拼写错误
- 未引入部分删除
|
2024-04-14 14:52:33 +08:00 |
|
176yunxuan
|
55cd033a7e
|
fix:初步重构
代码检查 / 代码检查 (pull_request) Successful in 30s
|
2024-04-13 20:42:42 +08:00 |
|
xiangZr-hhh
|
36964d4447
|
fix:修改添加审核信息、查询审核信息接口
代码检查 / 代码检查 (pull_request) Successful in 18s
添加审核信息接口：增加判断审核名称是否重复
获取审核信息接口：在子模块名称为空时，返回无，而不是返回null
|
2024-04-12 19:07:27 +08:00 |
|
xiangZr-hhh
|
49247fd88f
|
fix:修改审核信息接口
代码检查 / 代码检查 (pull_request) Successful in 17s
修正xml文件的部分bug
|
2024-04-12 18:42:06 +08:00 |
|
xiangZr-hhh
|
ec45c0b233
|
feat：增加新业务功能修改审核状态
代码检查 / 代码检查 (pull_request) Successful in 19s
|
2024-04-12 14:28:28 +08:00 |
|
xiangZr-hhh
|
ff34595002
|
feat：增加新业务功能新增审核
代码检查 / 代码检查 (pull_request) Successful in 20s
|
2024-04-12 09:20:51 +08:00 |
|
xiangZr-hhh
|
3b9a7cfe5e
|
feat：增加新业务功能获取我的审核
代码检查 / 代码检查 (pull_request) Successful in 22s
|
2024-04-12 08:20:28 +08:00 |
|
|
|
381de9d54b
|
patch: 漏洞修补，规范化
代码检查 / 代码检查 (pull_request) Successful in 20s
|
2024-04-11 20:22:42 +08:00 |
|
|
|
061d469c17
|
Merge branch 'refs/heads/develop' into feature-zrx
# Conflicts:
# src/main/java/com/jsl/oa/aspect/AnnotationsAspect.java
# src/main/java/com/jsl/oa/common/constant/SafeConstants.java
# src/main/java/com/jsl/oa/controllers/PermissionController.java
# src/main/java/com/jsl/oa/controllers/ProjectController.java
# src/main/java/com/jsl/oa/controllers/RoleController.java
# src/main/java/com/jsl/oa/controllers/UserController.java
# src/main/java/com/jsl/oa/dao/ProjectDAO.java
# src/main/java/com/jsl/oa/dao/RoleDAO.java
# src/main/java/com/jsl/oa/dao/UserDAO.java
# src/main/java/com/jsl/oa/mapper/ProjectMapper.java
# src/main/java/com/jsl/oa/mapper/RoleMapper.java
# src/main/java/com/jsl/oa/mapper/UserMapper.java
# src/main/java/com/jsl/oa/services/ProjectService.java
# src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java
# src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
# src/main/java/com/jsl/oa/utils/Processing.java
|
2024-04-11 20:17:32 +08:00 |
|
|
|
5f0e58ab06
|
feat: 代码规约修改，BUG 补丁
代码检查 / 代码检查 (pull_request) Successful in 19s
|
2024-04-11 19:31:16 +08:00 |
|
176yunxuan
|
b994aeefd8
|
feat:定时查找快到期项目提醒
代码检查 / 代码检查 (pull_request) Failing after 21s
|
2024-04-11 19:10:07 +08:00 |
|
xiangZr-hhh
|
365f2dfa67
|
feat：增加新业务功能获取审核列表
代码检查 / 代码检查 (pull_request) Failing after 21s
|
2024-04-11 17:27:34 +08:00 |
|
176yunxuan
|
3ca0bed1e1
|
feat:消息模块
代码检查 / 代码检查 (pull_request) Failing after 19s
|
2024-04-10 20:51:48 +08:00 |
|
|
|
fb5a8c06f6
|
feat: 代码风格规约调整
代码检查 / 代码检查 (pull_request) Failing after 27s
|
2024-04-10 10:34:55 +08:00 |
|
|
|
c273913442
|
feat: 代码风格调整
代码检查 / 代码检查 (pull_request) Failing after 19s
|
2024-04-10 09:37:39 +08:00 |
|
|
|
fe4dfb77e6
|
patch: 符合开发规约
代码检查 / 代码检查 (pull_request) Failing after 54s
代码检查 / 代码检查 (push) Failing after 1m11s
|
2024-04-10 01:22:55 +08:00 |
|
|
|
06bb45ba5d
|
patch: 符合开发规约
|
2024-04-10 01:22:31 +08:00 |
|
xiangZr-hhh
|
da70993593
|
/project/getwork/id接口增加负责人id返回信息；/module/get/min新增负责人名称与子系统名称返回信息
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-17 17:11:45 +08:00 |
|
176yunxuan
|
479d3bb421
|
查询bug
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
|
2024-03-17 09:46:18 +08:00 |
|
176yunxuan
|
5e1da6b079
|
查询bug
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
|
2024-03-17 08:35:33 +08:00 |
|
176yunxuan
|
14c726cb9a
|
返回信息调整
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-16 18:26:37 +08:00 |
|
176yunxuan
|
2c90fcd053
|
返回信息调整
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-16 16:42:34 +08:00 |
|
176yunxuan
|
11c0349282
|
返回信息调整
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-16 10:24:14 +08:00 |
|
176yunxuan
|
61a4e2e592
|
返回信息调整
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-16 10:19:56 +08:00 |
|
176yunxuan
|
ea457a6604
|
增加标签字段
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
|
2024-03-15 21:19:23 +08:00 |
|
