diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java index aa11ea1..3149505 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java @@ -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)); } } diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java index 23b983b..5031e34 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java @@ -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 implements IW double completeNum = userWorkMapper.selectCount(new QueryWrapper().eq("work_id",workId).eq("status",1)); double progress = 0; progress = (completeNum / workNum) * 100; + progress = (double) Math.round(progress * 100) / 100; return progress; } diff --git a/ui/src/pages/work/Complete.vue b/ui/src/pages/work/Complete.vue index 94bb6c9..8b57d4e 100644 --- a/ui/src/pages/work/Complete.vue +++ b/ui/src/pages/work/Complete.vue @@ -64,7 +64,6 @@ export default { todoConfirmEvent(row) { const userWork = { workId: '', - userId: '1652714496280469506', status: 1 } userWork.workId = row.id @@ -76,7 +75,7 @@ export default { }, getTableData() { request - .get('/work/complete/1652714496280469506') + .get('/work/complete') .then((response) => { this.tableData = response.data.data if (this.tableData) { diff --git a/ui/src/pages/work/Todo.vue b/ui/src/pages/work/Todo.vue index 5a9eb6e..c269c44 100644 --- a/ui/src/pages/work/Todo.vue +++ b/ui/src/pages/work/Todo.vue @@ -62,7 +62,6 @@ export default { completeConfirmEvent(row) { const userWork = { workId: '', - userId: '1652714496280469506', status: 0 } userWork.workId = row.id @@ -75,7 +74,7 @@ export default { }, getTableData() { request - .get('/work/todo/1652714496280469506') + .get('/work/todo') .then((response) => { this.tableData = response.data.data if (this.taskData) {