1
0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00

1. Optimized the problem of vertical display of data in the content button of the transaction management page and the approved transaction page. Now the transaction title and transaction content can be displayed normally

2. The approver drop-down box in the transaction add page can dynamically obtain the user id and username from the database and provide the username to the user for selection
3. The approver drop-down box has added a search function, a scroll bar, and a limit on the height of the drop-down box
4. You can obtain the id and username of the current user from the applicant input box, and display the username of the current user in the input box. The user has no grant to modify the contents of the input box
This commit is contained in:
assina045
2023-05-18 19:05:36 +08:00
parent 18469aca5f
commit 44499c154c
4 changed files with 89 additions and 19 deletions

View File

@@ -2,13 +2,18 @@ package com.cfive.pinnacle.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.Affair;
import com.cfive.pinnacle.entity.Attendance;
import com.cfive.pinnacle.entity.User;
import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.service.IAffairService;
import com.cfive.pinnacle.service.IUserService;
import com.cfive.pinnacle.utils.WebUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* <p>
* 事务 前端控制器
@@ -23,6 +28,10 @@ import org.springframework.web.bind.annotation.*;
public class AffairController {
@Autowired
IAffairService affairService;
// IUserService userService;
// 不用userService的方法了userController中已经写好了直接拿来用
@Autowired
UserController userController;
@PostMapping("/add")
@@ -30,6 +39,10 @@ public class AffairController {
return ResponseResult.build(ResponseCode.DATABASE_SAVE_OK, "success", affairService.save(affair));
}
@GetMapping("/NotApproved")
public ResponseResult select_NotApproved() {
LambdaQueryWrapper<Affair> wrapper = new LambdaQueryWrapper<>();