From 95d664dff9c0ec7d6a9be21bcc880dcb389e9b3d Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Wed, 30 Oct 2024 10:32:21 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=B0=E8=B4=A6=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/employController/CommonApiController.java | 16 ++-- .../jeecg/modules/apiService/CommonApiService.java | 8 +- .../apiService/impl/CommonApiServiceImpl.java | 98 +++++++++++++++------- 3 files changed, 78 insertions(+), 44 deletions(-) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java index e064e08..d6de216 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java @@ -62,28 +62,28 @@ public class CommonApiController { //个人记工-新建账本 @ApiOperation(value="记工记账-新建账本", notes="Type：0-个人 1-班组") @RequestMapping(value = "/addBill", method = {RequestMethod.POST}) - public Result addBill(EmployNotebook employNotebook){ - return commonApiService.addBill(employNotebook); + public Result addBill(@RequestHeader("X-Access-Token") String token, EmployNotebook employNotebook){ + return commonApiService.addBill(token, employNotebook); } //个人记工-全年收支 @ApiOperation(value="记工记账-全年收支", notes="记工记账-全年收支") @RequestMapping(value = "/queryBill", method = {RequestMethod.GET}) - public Result queryBill(PageBean pageBean){ - return commonApiService.queryBill(pageBean); + public Result queryBill(@RequestHeader("X-Access-Token") String token, String employNoteBookId, PageBean pageBean){ + return commonApiService.queryBill(token, employNoteBookId, pageBean); } //个人记工-技工问题 @ApiOperation(value="记工记账-技工问题", notes="记工记账-技工问题") @RequestMapping(value = "/addQuestion", method = {RequestMethod.POST}) - public Result addQuestion(EmployFeedback employFeedback){ - return commonApiService.addQuestion(employFeedback); + public Result addQuestion(@RequestHeader("X-Access-Token") String token, EmployFeedback employFeedback){ + return commonApiService.addQuestion(token, employFeedback); } @ApiOperation(value="记工记账-在建/结束项目", notes="Type：0-个人 1-班组， status: 0-在建项目 1-结束项目") @RequestMapping(value = "/queryNotebookList", method = {RequestMethod.GET}) - public Result queryNotebookList(String type, String status, PageBean pageBean){ - return commonApiService.queryNotebookList(type, status, pageBean); + public Result queryNotebookList(@RequestHeader("X-Access-Token") String token, String type, String status, PageBean pageBean){ + return commonApiService.queryNotebookList(token, type, status, pageBean); } // //个人记工-在建项目 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java index ea5e2f3..2d3993c 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java @@ -25,16 +25,16 @@ public interface CommonApiService { /***************记工记账***************/ //个人记工-新建账本 - public Result addBill(EmployNotebook employNotebook); + public Result addBill(String token, EmployNotebook employNotebook); //个人记工-全年收支 - public Result queryBill(PageBean pageBean); + public Result queryBill(String token, String employNoteBookId, PageBean pageBean); //个人记工-技工问题 - public Result addQuestion(EmployFeedback employFeedback); + public Result addQuestion(String toke, EmployFeedback employFeedback); //个人记工-在建项目 - public Result queryNotebookList(String type, String status, PageBean pageBean); + public Result queryNotebookList(String token, String type, String status, PageBean pageBean); // //个人记工-在建项目 // public Result queryStrartJobList(PageBean pageBean); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java index a8ee42c..4dfc27a 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java @@ -25,7 +25,6 @@ import org.jeecg.modules.employNature.entity.EmployNature; import org.jeecg.modules.employNature.service.IEmployNatureService; import org.jeecg.modules.employNotebook.entity.EmployNotebook; import org.jeecg.modules.employNotebook.service.IEmployNotebookService; -import org.jeecg.modules.employResume.entity.EmployResume; import org.jeecg.modules.employResume.service.IEmployResumeService; import org.jeecg.modules.employScore.entity.EmployScore; import org.jeecg.modules.employScore.service.IEmployScoreService; @@ -40,7 +39,6 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; @Service @@ -166,13 +164,13 @@ public class CommonApiServiceImpl implements CommonApiService { /***************记工记账***************/ //记工记账-新建账本 @Override - public Result addBill(EmployNotebook employNotebook) { + public Result addBill(String token, EmployNotebook employNotebook) { String message = ""; //权限验证 - //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); employNotebook.setStatus("0"); - //employNotebook.setUserId(hanHaiMember.getId()); + employNotebook.setUserId(hanHaiMember.getId()); boolean result = employNotebookService.save(employNotebook); if(result){ @@ -186,24 +184,64 @@ public class CommonApiServiceImpl implements CommonApiService { //记工记账-全年收支 @Override - public Result queryBill(PageBean pageBean) { + public Result queryBill(String token, String employNoteBookId, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取账本id列表 + Object[] notebooIds = null; + if(null == employNoteBookId){ + //根据用户id查询用户账本列表 + List notebookList = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getUserId, hanHaiMember.getId()) + .list(); + + //获取账本id列表 + int size = (int)notebookList.size(); + notebooIds = new Object[size]; + int index = 0; + for (EmployNotebook employNotebook : notebookList) { + notebooIds[index] = employNotebook.getId(); + index++; + } + + if(size == 0){ + return Result.OK("没有收支记录", notebookList); + } + + }else { + notebooIds = new Object[]{employNoteBookId}; + //判断用户输入账本id是否为自己所有 + EmployNotebook employNotebook = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getUserId, hanHaiMember.getId()) + .eq(EmployNotebook::getId, employNoteBookId) + .one(); + if(null == employNotebook){ + return Result.OK("该用户没有此账本的收支记录，请检查账本id输入是否错误", employNotebook); + } + } + + //根据账本id列表查询收支记录 Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = employBillInfoService .lambdaQuery() + .in(EmployBillInfo::getNotebookId, notebooIds) .page(page); - return Result.OK("记账列表", pageList); + return Result.OK("收支记录", pageList); } //记工记账-技工问题 @Override - public Result addQuestion(EmployFeedback employFeedback) { + public Result addQuestion(String token, EmployFeedback employFeedback) { String message = ""; //权限验证 - //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //employFeedback.setUserId(hanHaiMember.getId()); + employFeedback.setUserId(hanHaiMember.getId()); boolean result = employFeedbackService.save(employFeedback); if(result){ @@ -217,31 +255,27 @@ public class CommonApiServiceImpl implements CommonApiService { //记工记账-在建结束项目 @Override - public Result queryNotebookList(String type, String status, PageBean pageBean) { + public Result queryNotebookList(String token, String type, String status, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //分页 Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = null; - if(null != type && null != status){ - pageList = employNotebookService - .lambdaQuery() - .eq(EmployNotebook::getType, type) - .eq(EmployNotebook::getStatus, status) - .page(page); - }else if(null != type){ - pageList = employNotebookService - .lambdaQuery() - .eq(EmployNotebook::getType, type) - .page(page); - }else if(null != status){ - pageList = employNotebookService - .lambdaQuery() - .eq(EmployNotebook::getStatus, status) - .page(page); - }else { - pageList = employNotebookService - .lambdaQuery() - .page(page); + LambdaQueryChainWrapper query = employNotebookService + .lambdaQuery(); + + //组装查询条件 + query.eq(EmployNotebook::getUserId, hanHaiMember.getId()); + if(null != type){ + query.eq(EmployNotebook::getType, type); + } + if(null != status){ + query.eq(EmployNotebook::getStatus, status); } + //获取账本信息 + Page pageList = query.page(page); + return Result.OK("在建/结束项目", pageList); }