feat：增加新业务功能获取我的审核 #13

Merged

XiaoLFeng merged 13 commits from feature-zrx into develop 2024-04-16 21:39:25 +08:00

Conversation 0 Commits 13 Files Changed 17 +831 -64

xiangZr-hhh commented 2024-04-12 08:21:59 +08:00

Owner

Copy Link

No description provided.

xiangZr-hhh added 1 commit 2024-04-12 08:22:00 +08:00

feat：增加新业务功能获取我的审核 3b9a7cfe5e

xiangZr-hhh added 1 commit 2024-04-12 09:20:55 +08:00

feat：增加新业务功能新增审核 ff34595002

xiangZr-hhh added 1 commit 2024-04-12 14:28:46 +08:00

feat：增加新业务功能修改审核状态 ec45c0b233

xiangZr-hhh added 1 commit 2024-04-12 18:42:17 +08:00

fix:修改审核信息接口 ... 49247fd88f

修正xml文件的部分bug

xiangZr-hhh added 1 commit 2024-04-12 19:07:42 +08:00

fix:修改添加审核信息、查询审核信息接口 ... 36964d4447

添加审核信息接口：增加判断审核名称是否重复
获取审核信息接口：在子模块名称为空时，返回无，而不是返回null

xiangZr-hhh added 1 commit 2024-04-12 19:24:32 +08:00

fix:修改申请查询接口 ... cd51b261e1

修正部分查询逻辑

xiangZr-hhh added 2 commits 2024-04-16 16:07:15 +08:00

Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx ... bc545bbd76

# Conflicts:
#	src/main/java/com/jsl/oa/mapper/ProjectMapper.java
#	src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java

patch:补丁 ... 8ab59b5a1d

修正部分数据表字段，修正对应接口

xiangZr-hhh added 1 commit 2024-04-16 18:09:23 +08:00

fix:修正查询接口 ... 36bbaf0995

修正分页与查询接口

xiangZr-hhh added 1 commit 2024-04-16 18:20:13 +08:00

fix:修正查询接口 ... cb1d61da88

分页修正

xiangZr-hhh added 1 commit 2024-04-16 19:00:39 +08:00

fix:调整查询接口 ... cd65a5c6f8

调整所有审核查询接口的部分字段名称

xiangZr-hhh added 2 commits 2024-04-16 19:33:56 +08:00

Merge branch 'develop' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA into feature-zrx ... f3840de509

# 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

#patch:补丁 ... 1a65d8ce8f

删除多余的log日志

XiaoLFeng approved these changes 2024-04-16 21:39:21 +08:00

XiaoLFeng merged commit 1d914a5217 into develop 2024-04-16 21:39:25 +08:00

XiaoLFeng referenced this issue from a commit 2024-04-16 21:39:26 +08:00

Merge pull request 'feat：增加新业务功能获取我的审核' (#13) from feature-zrx into develop

Sign in to join this conversation.

Reviewers

No reviewers

XiaoLFeng

Labels

Clear labels   

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No Label

bug

duplicate

enhancement

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: WxxyDeveloper/JSL_OrganizeInternalOA#13

No description provided.