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

workVue update2

Browse Source
This commit is contained in:
GGB
2023-05-06 00:27:55 +08:00
parent bc12df2ea1
commit 621d67c52c
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java
View File

@@ -12,6 +12,7 @@ import com.cfive.pinnacle.service.IUserWorkService;
import com.cfive.pinnacle.service.IWorkService;
import com.cfive.pinnacle.service.impl.UserWorkServiceImpl;
import com.cfive.pinnacle.service.impl.WorkServiceImpl;
import com.cfive.pinnacle.utils.WebUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,21 +34,21 @@ import java.util.List;
public class WorkController {
@Autowired
private IWorkService workService;
@Autowired
private IUserWorkService userWorkService;
@GetMapping
public ResponseResult getAll() {
return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", workService.getAll());
}
@GetMapping("/todo/{userId}")
public ResponseResult getTodo(@PathVariable Long userId) {
@GetMapping("/todo")
public ResponseResult getTodo() {
Long userId = WebUtil.getLoginUser().getUser().getId();
System.out.println(userId);
return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", workService.getTodo(userId));
}
@GetMapping("/complete/{userId}")
public ResponseResult getComplete(@PathVariable Long userId) {
@GetMapping("/complete")
public ResponseResult getComplete() {
Long userId = WebUtil.getLoginUser().getUser().getId();
return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", workService.getComplete(userId));
}
@@ -58,6 +59,7 @@ public class WorkController {
@PostMapping
public ResponseResult addWork(@RequestBody Work work) {
work.setPublisherId(WebUtil.getLoginUser().getUser().getId());
return ResponseResult.build(ResponseCode.DATABASE_SAVE_OK, "success", workService.addWork(work));
}
@@ -70,11 +72,13 @@ public class WorkController {
@PutMapping("/setStatus")
public ResponseResult updateStatus(@RequestBody UserWork userWork) {
System.out.println(userWork);
userWork.setUserId(WebUtil.getLoginUser().getUser().getId());
return ResponseResult.build(ResponseCode.DATABASE_UPDATE_OK, "success", workService.updateStatus(userWork));
}
@PutMapping
public ResponseResult updateWork(@RequestBody Work work) {
work.setPublisherId(WebUtil.getLoginUser().getUser().getId());
return ResponseResult.build(ResponseCode.DATABASE_UPDATE_OK, "success", workService.updateWork(work));
}
}

2
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java
View File

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
import java.util.List;
/**
@@ -76,6 +77,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
double completeNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id",workId).eq("status",1));
double progress = 0;
progress = (completeNum / workNum) * 100;
progress = (double) Math.round(progress * 100) / 100;
return progress;
}