90 Commits

Author SHA1 Message Date
xiangZr-hhh
f9f35dd4a0 fix:审核添加接口
禁止向已被删除的项目添加
2024-04-22 22:06:48 +08:00
xiangZr-hhh
47e3e6820d fix:项目删除
项目删除时同时删除对应日报信息
2024-04-22 21:41:40 +08:00
xiangZr-hhh
e32bc023df Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx 2024-04-22 20:29:46 +08:00
xiangZr-hhh
5b7daf5824 fix:审核模块删除审核sql
修正为假删除
2024-04-22 20:29:33 +08:00
xiangZr-hhh
4363831d80 patch:删除项目/子系统/模块
同时删除对应审核信息
2024-04-22 20:15:54 +08:00
176yunxuan
22e79558da bug:指定负责人判空
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
2024-04-22 19:29:18 +08:00
176yunxuan
c229ed59b8 fix:项目,系统,模块更新
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 22s
2024-04-20 10:44:07 +08:00
xiangZr-hhh
07601350bf fix: 审核模块 2024-04-20 01:46:52 +08:00
xiangZr-hhh
1197f77131 fix: 日报模块 添加接口 2024-04-19 23:28:00 +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
xiangZr-hhh
1b6ea7b140 fix:日报模块 查询接口修正
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 21s
xml文件修改
2024-04-19 19:10:47 +08:00
176yunxuan
a4aa3bd939 bug:子模块子系统查询和添加bug修复
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 19s
2024-04-19 19:10:01 +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
xiangZr-hhh
b8b1ebd3cf Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx
# Conflicts:
#	src/main/java/com/jsl/oa/config/startup/PermissionList.java
2024-04-19 17:13:01 +08:00
xiangZr-hhh
cf4921397c feat:日报模块 日报删除接口 2024-04-19 16:36:18 +08:00
22777ab159
fix(业务): 权限修改
对权限输入错误的内容进行修改,权限规范化修改
2024-04-19 15:50:36 +08:00
xiangZr-hhh
04f1798811 feat:日报模块 日报搜索接口
添加日报搜索接口
2024-04-19 15:07:08 +08:00
xiangZr-hhh
2f706d5997 Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx 2024-04-18 23:11:30 +08:00
xiangZr-hhh
507d7e7d00 fix:日报模块查询我的日报接口
分页查询修正
2024-04-18 22:39:34 +08:00
b9aa1b25cc
fix(业务): 业务补丁
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 16s
数据库建表内容修改
2024-04-18 22:34:03 +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
xiangZr-hhh
71bd92d18e patch:修正review数据库表
删除部分错误外键
2024-04-18 10:18:35 +08:00
176yunxuan
2bd1d796ed fix:我管理的状态查询
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 17s
2024-04-17 20:43:27 +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
a2cd19675e
refactor: 对权限组的重新配置 2024-04-16 23:56:20 +08:00
f0f6e53ba2
feat: 添加了15个数据表结构定义,调整了部分数据表的创建语句,更新了数据准备脚本。 2024-04-16 22:31:30 +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
176yunxuan
55cd033a7e fix:初步重构
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 30s
2024-04-13 20:42:42 +08:00
xiangZr-hhh
49247fd88f fix:修改审核信息接口
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 17s
修正xml文件的部分bug
2024-04-12 18:42:06 +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
xiangZr-hhh
365f2dfa67 feat:增加新业务功能获取审核列表
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 21s
2024-04-11 17:27:34 +08:00
c273913442
feat: 代码风格调整
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 19s
2024-04-10 09:37:39 +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
176yunxuan
21eed05bcc 查询bug
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-17 09:56:40 +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
5e1da6b079 查询bug
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-17 08:35:33 +08:00
176yunxuan
746ddee34a 查询逻辑更改
All checks were successful
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head This commit looks good
2024-03-15 18:47:52 +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
3101ed371b 子系统子模块
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit
2024-03-14 20:54:04 +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
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