121 Commits

Author SHA1 Message Date
xiangZr-hhh
6be3aa4e13 patch: 日报模块 添加日报模块
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 34s
添加日报时添加发送消息
再再次修正日报时差问题
2024-04-21 14:44:09 +08:00
d510831170 Merge branch 'develop' into feature-jie
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
2024-04-20 19:55:01 +08:00
xiangZr-hhh
ba4ed9fe5d patch: 修正日报模块判空
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 15s
增加昵称字段给前端
2024-04-20 19:02:36 +08:00
176yunxuan
dca7d3c277 fix:完善业务发送消息
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 21s
2024-04-20 16:07:20 +08:00
xiangZr-hhh
7f146cd2f5 patch:日报模块
查询接口添加负责人字段,优化获取用户名称
2024-04-20 15:19:17 +08:00
176yunxuan
9639d21c0e fix:项目,系统,模块更新
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 20s
2024-04-20 10:50:55 +08:00
176yunxuan
c229ed59b8 fix:项目,系统,模块更新
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 22s
2024-04-20 10:44:07 +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
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 18s
2024-04-18 22:31:33 +08:00
176yunxuan
5c33818e3d fix:新增子系统,子模块,消息总数记录
All checks were successful
代码检查 / 代码检查 (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
xiangZr-hhh
121b87c683 feat:新增日志模块日志添加接口 2024-04-18 15:01:05 +08:00
045147dc30
patch: 补丁
All checks were successful
代码检查 / 代码检查 (push) Successful in 16s
2024-04-17 01:13:57 +08:00
75d471b1b6
patch: 补丁
All checks were successful
代码检查 / 代码检查 (push) Successful in 19s
2024-04-17 01:09:42 +08:00
0a788005a6
patch: 补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 20s
2024-04-17 00:52:55 +08:00
a2cd19675e
refactor: 对权限组的重新配置 2024-04-16 23:56:20 +08:00
xiangZr-hhh
1a65d8ce8f #patch:补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
删除多余的log日志
2024-04-16 19:33:42 +08:00
xiangZr-hhh
f3840de509 Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx
# Conflicts:
#	src/main/java/com/jsl/oa/controllers/ReviewController.java
#	src/main/java/com/jsl/oa/dao/ProjectDAO.java
#	src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
#	src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
2024-04-16 19:30:09 +08:00
76a1cf758c
patch: 优化日志处理模式,删除多余的日志信息
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 23s
2024-04-16 17:29:21 +08:00
xiangZr-hhh
8ab59b5a1d patch:补丁
All checks were successful
代码检查 / 代码检查 (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: 部分内容进行补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 23s
- 拼写错误
- 未引入部分删除
2024-04-14 14:52:33 +08:00
176yunxuan
55cd033a7e fix:初步重构
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 30s
2024-04-13 20:42:42 +08:00
xiangZr-hhh
ec45c0b233 feat:增加新业务功能修改审核状态
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
2024-04-12 14:28:28 +08:00
xiangZr-hhh
ff34595002 feat:增加新业务功能新增审核
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 20s
2024-04-12 09:20:51 +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 补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
2024-04-11 19:31:16 +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
176yunxuan
5d046f4a04 分页查询和删除
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-21 21:58:57 +08:00
176yunxuan
e16dc1f745 分页查询和删除
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-21 20:56:07 +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
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
0de184db59 Merge branch 'feature'
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
# Conflicts:
#	src/main/java/com/jsl/oa/dao/ProjectDAO.java
2024-03-14 21:45:10 +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
xiangZr-hhh
ef85c9fb60 项目文件接口
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-14 17:35:19 +08:00
176yunxuan
e0df2dcc4e Merge branch 'feature'
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-14 11:42:52 +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
df52d05759 状态查询修改
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-13 13:48:41 +08:00
176yunxuan
820a46c9ef Merge branch 'feature'
# Conflicts:
#	src/main/java/com/jsl/oa/dao/ProjectDAO.java
2024-03-13 13:39:22 +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
01173e9cfc Merge branch 'feature'
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-12 21:05:39 +08:00
6813b5195d Tag信息获取
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-12 21:05:22 +08:00