63 Commits

Author SHA1 Message Date
xiangZr-hhh
f9f35dd4a0 fix:审核添加接口
禁止向已被删除的项目添加
2024-04-22 22:06:48 +08:00
176yunxuan
c229ed59b8 fix:项目,系统,模块更新
Some checks failed
代码检查 / 代码检查 (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修复
All checks were successful
代码检查 / 代码检查 (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
176yunxuan
7d958bfa69 fix:申请模块根据名字查询项目,系统,模块
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
2024-04-18 22:25:07 +08:00
176yunxuan
5c33818e3d fix:新增子系统,子模块,消息总数记录
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 17s
2024-04-18 19:55:59 +08:00
176yunxuan
e0d4d0e9c7 fix:添加项目权限,名字模糊查询项目
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
2024-04-18 15:17:08 +08:00
176yunxuan
3df0c754d3 fix:查询项目重构 2024-04-18 09:34:23 +08:00
176yunxuan
d2dc0527ab fix:查询子模块,删除子模块子系统
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 18s
2024-04-17 20:30:31 +08:00
176yunxuan
84d3ccc5af fix:我负责我管理我参与的项目查询重构以及项目增加,系统模块数据表增加截止时间和状态字段 2024-04-17 17:03:35 +08:00
49bcadd483 Merge branch 'develop' into feature-jie
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 20s
2024-04-16 21:39:54 +08:00
176yunxuan
7db82c57e2 bug:消息修改
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 18s
2024-04-16 19:40:05 +08:00
xiangZr-hhh
8ab59b5a1d patch:补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 23s
修正部分数据表字段,修正对应接口
2024-04-16 16:07:06 +08:00
176yunxuan
55cd033a7e fix:初步重构
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 30s
2024-04-13 20:42:42 +08:00
381de9d54b
patch: 漏洞修补,规范化
All checks were successful
代码检查 / 代码检查 (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
176yunxuan
b994aeefd8 feat:定时查找快到期项目提醒
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 21s
2024-04-11 19:10:07 +08:00
xiangZr-hhh
365f2dfa67 feat:增加新业务功能获取审核列表
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 21s
2024-04-11 17:27:34 +08:00
176yunxuan
3ca0bed1e1 feat:消息模块
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 19s
2024-04-10 20:51:48 +08:00
fb5a8c06f6
feat: 代码风格规约调整
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 27s
2024-04-10 10:34:55 +08:00
c273913442
feat: 代码风格调整
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 19s
2024-04-10 09:37:39 +08:00
fe4dfb77e6
patch: 符合开发规约
Some checks failed
代码检查 / 代码检查 (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新增负责人名称与子系统名称返回信息
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-17 17:11:45 +08:00
176yunxuan
479d3bb421 查询bug
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-17 09:46:18 +08:00
176yunxuan
2c90fcd053 返回信息调整
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-16 16:42:34 +08:00
176yunxuan
11c0349282 返回信息调整
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-16 10:24:14 +08:00
176yunxuan
61a4e2e592 返回信息调整
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-16 10:19:56 +08:00
176yunxuan
ea457a6604 增加标签字段
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-15 21:19:23 +08:00
176yunxuan
25e16c4264 id查询项目/系统
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-15 20:39:39 +08:00
176yunxuan
5075426bcf 查询逻辑更改
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-15 17:07:30 +08:00
176yunxuan
06c3be33e2 子系统子模块
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-14 21:43:27 +08:00
176yunxuan
fb8336d44b 子系统子模块
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-14 11:42:26 +08:00
176yunxuan
9826a86b20 状态查询修改
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-13 13:03:32 +08:00
176yunxuan
d346711f1b 状态查询修改
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-13 12:54:11 +08:00
xiangZr-hhh
1864f90fe0 用户信息接口修正
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-12 14:19:26 +08:00
176yunxuan
dd16df0b88 Merge remote-tracking branch 'origin/feature' into feature
# Conflicts:
#	src/main/java/com/jsl/oa/dao/ProjectDAO.java
2024-03-12 12:44:11 +08:00
176yunxuan
e19630f9cc 游客查询标签状态 2024-03-12 12:43:05 +08:00
xiangZr-hhh
ee9e361130 项目删除接口优化
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-12 11:29:52 +08:00
xiangZr-hhh
935003c126 用户信息获取接口添加角色控制
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
项目编辑、删除
2024-03-12 11:24:25 +08:00
176yunxuan
6e4f22170d 游客查询
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-11 22:08:10 +08:00
176yunxuan
ce123e1858 项目查询取消token验证
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-11 21:01:59 +08:00
176yunxuan
789eea8d49 子模块/子系统的查询和增加
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-11 19:04:59 +08:00
176yunxuan
fbddeff093 优化项目标签和状态查询 2024-03-11 16:33:39 +08:00
176yunxuan
bf8ef7c748 优化项目标签和状态查询
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-11 16:13:17 +08:00
176yunxuan
c0e2df344e 项目查询优化标签查询
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-11 13:11:01 +08:00
176yunxuan
0062854702 项目查询优化标签查询
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-11 09:26:50 +08:00