244 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiangZr-hhh	36bbaf0995	fix:修正查询接口 ... 修正分页与查询接口	2024-04-16 18:09:16 +08:00
xiangZr-hhh	8ab59b5a1d	patch:补丁 ... 修正部分数据表字段，修正对应接口	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
筱锋xiao_lfeng	3d7f457ef3	Merge: 初步合并，后续还需要继续进行修改内容 ... Reviewed-on: #14 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-14 14:55:42 +08:00
XiaoLFeng	aa9efbcc8b	patch: 补丁	2024-04-14 14:54:46 +08:00
XiaoLFeng	05ccc3fdd8	patch: 部分内容进行补丁 ... - 拼写错误 - 未引入部分删除	2024-04-14 14:52:33 +08:00
176yunxuan	55cd033a7e	fix:初步重构	2024-04-13 20:42:42 +08:00
xiangZr-hhh	cd51b261e1	fix:修改申请查询接口 ... 修正部分查询逻辑	2024-04-12 19:24:24 +08:00
xiangZr-hhh	36964d4447	fix:修改添加审核信息、查询审核信息接口 ... 添加审核信息接口：增加判断审核名称是否重复 获取审核信息接口：在子模块名称为空时，返回无，而不是返回null	2024-04-12 19:07:27 +08:00
xiangZr-hhh	49247fd88f	fix:修改审核信息接口 ... 修正xml文件的部分bug	2024-04-12 18:42:06 +08:00
xiangZr-hhh	ec45c0b233	feat：增加新业务功能修改审核状态	2024-04-12 14:28:28 +08:00
xiangZr-hhh	ff34595002	feat：增加新业务功能新增审核	2024-04-12 09:20:51 +08:00
xiangZr-hhh	3b9a7cfe5e	feat：增加新业务功能获取我的审核	2024-04-12 08:20:28 +08:00
XiaoLFeng	5a57ea4b1c	patch: 数据表上传	2024-04-11 23:53:16 +08:00
筱锋xiao_lfeng	383de6766f	Merge pull request 'feat：增加新业务功能获取审核列表' (#10) from feature-zrx into develop ... Reviewed-on: #10 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-11 20:46:33 +08:00
XiaoLFeng	381de9d54b	patch: 漏洞修补，规范化	2024-04-11 20:22:42 +08:00
XiaoLFeng	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
筱锋xiao_lfeng	a375bdee78	Merge: 代码规约，Message 部分（消息部分） ... Reviewed-on: #11 Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-11 20:04:11 +08:00
XiaoLFeng	5f0e58ab06	feat: 代码规约修改，BUG 补丁	2024-04-11 19:31:16 +08:00
176yunxuan	b994aeefd8	feat:定时查找快到期项目提醒	2024-04-11 19:10:07 +08:00
xiangZr-hhh	365f2dfa67	feat：增加新业务功能获取审核列表	2024-04-11 17:27:34 +08:00
176yunxuan	3e0652034e	feat:消息模块	2024-04-10 21:10:39 +08:00
176yunxuan	3ca0bed1e1	feat:消息模块	2024-04-10 20:51:48 +08:00
XiaoLFeng	fb5a8c06f6	feat: 代码风格规约调整	2024-04-10 10:34:55 +08:00
筱锋xiao_lfeng	f49b9db4d7	Merge pull request 'feat: 代码风格调整' (#7) from feature-xiaolfeng into master ... Reviewed-on: #7	2024-04-10 09:53:00 +08:00
XiaoLFeng	c273913442	feat: 代码风格调整	2024-04-10 09:37:39 +08:00
XiaoLFeng	13270ed1b6	feat: 修改为错误	2024-04-10 09:19:29 +08:00
XiaoLFeng	6574d8a12e	feat: 重新处理 codecheck	2024-04-10 09:09:15 +08:00
XiaoLFeng	ccac929478	feat: 重新处理 codecheck	2024-04-10 09:05:57 +08:00
XiaoLFeng	767d9f75e1	feat: 重新处理 codecheck	2024-04-10 09:04:58 +08:00
XiaoLFeng	fe4dfb77e6	patch: 符合开发规约	2024-04-10 01:22:55 +08:00
XiaoLFeng	06bb45ba5d	patch: 符合开发规约	2024-04-10 01:22:31 +08:00
XiaoLFeng	78da5c90c4	patch: 注释内容修改,代码规范化	2024-04-10 00:36:57 +08:00
XiaoLFeng	34c6ea1a8b	debug: 去除 qodana,添加 检查	2024-04-09 23:56:39 +08:00
XiaoLFeng	7d680aeb87	Merge branch 'refs/heads/master' into feature-xiaolfeng	2024-04-09 23:56:30 +08:00
筱锋xiao_lfeng	d2d761deb5	更新 .github/workflows/code-check.yaml	2024-04-09 23:02:58 +08:00
筱锋xiao_lfeng	f4ef0ce63b	测试 ... Signed-off-by: 筱锋xiao_lfeng <gm@x-lf.cn>	2024-04-09 20:56:36 +08:00
XiaoLFeng	c324ce2bca	debug: 去除 Jenkinsfile	2024-04-09 20:50:55 +08:00
XiaoLFeng	b48d89f22e	debug: 内容 Debug 测试提交	2024-04-09 20:46:54 +08:00
XiaoLFeng	c700ab5a5c	上传测试	2024-04-09 20:45:02 +08:00
XiaoLFeng	1993eba4e2	上传测试	2024-04-09 20:41:12 +08:00
XiaoLFeng	a8ccce2eed	Upload	2024-04-09 20:39:24 +08:00
176yunxuan	5d046f4a04	分页查询和删除	2024-03-21 21:58:57 +08:00
176yunxuan	e16dc1f745	分页查询和删除	2024-03-21 20:56:07 +08:00
xiangZr-hhh	da70993593	/project/getwork/id接口增加负责人id返回信息；/module/get/min新增负责人名称与子系统名称返回信息	2024-03-17 17:11:45 +08:00
xiangZr-hhh	6c9a81ebf7	模块/系统详细信息接口，返回信息调整，增加projectId	2024-03-17 15:39:05 +08:00
XiaoLFeng	86fe04a895	Upload	2024-03-17 12:45:19 +08:00
176yunxuan	21eed05bcc	查询bug	2024-03-17 09:56:40 +08:00
176yunxuan	479d3bb421	查询bug	2024-03-17 09:46:18 +08:00
176yunxuan	5e1da6b079	查询bug	2024-03-17 08:35:33 +08:00