From e19a3c5443333c16324d89722caacde6b0bcfa0b Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Mon, 23 Dec 2024 15:45:20 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=B0=E5=B7=A5=E8=AE=B0=E8=B4=A6?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller2/CollectionController.java | 4 +-- .../api/controller2/NotebookController.java | 4 +-- .../modules/api/controller2/ShareController.java | 3 +- .../modules/apiService/impl/JobServiceImpl.java | 4 +-- .../apiService/impl/NotebookServiceImpl.java | 33 +++++++++++++++++++++- .../modules/apiService/impl/ShareServiceImpl.java | 5 ++-- 6 files changed, 42 insertions(+), 11 deletions(-) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CollectionController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CollectionController.java index 71b8a92..533529e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CollectionController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CollectionController.java @@ -33,7 +33,7 @@ public class CollectionController { } @ApiOperation(value="我的收藏-添加工作收藏", notes="我的收藏-添加工作收藏") - @RequestMapping(value = "/addJobCollection", method = {RequestMethod.GET}) + @RequestMapping(value = "/addJobCollection", method = {RequestMethod.POST}) public Result addJobCollection(@RequestHeader("X-Access-Token") String token, String jobId){ return collectionService.addJobCollection(token, jobId); } @@ -47,7 +47,7 @@ public class CollectionController { //会员中心-我的收藏 @ApiOperation(value="我的收藏-添加简历收藏", notes="我的收藏-添加简历收藏") - @RequestMapping(value = "/addResumeCollection", method = {RequestMethod.GET}) + @RequestMapping(value = "/addResumeCollection", method = {RequestMethod.POST}) public Result addResumeCollection(@RequestHeader("X-Access-Token") String token, String resumeId){ return collectionService.addResumeCollection(token, resumeId); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java index 16d9388..c25967f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java @@ -73,6 +73,8 @@ public class NotebookController { }else if(null == employBillInfo.getAmount()){ message = "记账金额为空，请输入金额"; }else if(null == employBillInfo.getBillDate()){ + + message = "记账日期为空，请输入记账日期"; }else if(null == employBillInfo.getType()){ message = "记账类型为空，请输入记账类型"; @@ -93,8 +95,6 @@ public class NotebookController { //参数校验 if(null == employWorkInfo.getNotebookId()){ message = "账本id为空，请输入正确的账本id"; - }else if(null == employWorkInfo.getType()){ - message = "工作类型为空，请输入工作类型"; }else if(null == employWorkInfo.getOvertime()){ message = "加班时长为空，请输入加班时长"; }else if(null == employWorkInfo.getWorkDate()){ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ShareController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ShareController.java index e436e16..82e4157 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ShareController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ShareController.java @@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiService.ScoreService; import org.jeecg.modules.apiService.ShareService; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -27,7 +28,7 @@ public class ShareController { //我的服务-面对面分享 @ApiOperation(value="我的服务-面对面分享", notes="我的服务-面对面分享") @RequestMapping(value = "/getInviteCode", method = {RequestMethod.POST}) - public Result getInviteCode(String token){ + public Result getInviteCode(@RequestHeader("X-Access-Token") String token){ return shareService.getInviteCode(token); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java index 93527c8..60e1a84 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java @@ -162,9 +162,9 @@ public class JobServiceImpl implements JobService { .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) .one(); if(null != collection){ - map.put("CollectionFlage", true); + map.put("collectionFlag", true); }else { - map.put("CollectionFlage", false); + map.put("collectionFlag", false); } //6、添加工作被查看记录 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java index 4abb38b..32d7b77 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java @@ -18,7 +18,10 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class NotebookServiceImpl implements NotebookService { @@ -53,6 +56,17 @@ public class NotebookServiceImpl implements NotebookService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //判断是否为修改 + if(null != employNotebook.getId()){ + boolean result = employNotebookService.updateById(employNotebook); + if(result){ + message = "修改账本成功！"; + }else { + message = "修改账本失败！"; + } + } + + //新增账本信息 employNotebook.setUserId(hanHaiMember.getId()); boolean result = employNotebookService.save(employNotebook); @@ -95,6 +109,9 @@ public class NotebookServiceImpl implements NotebookService { //记工记账-全年收支 @Override public Result queryBill(String token, String employNoteBookId, PageBean pageBean) { + //返回信息 + Map map = new HashMap<>(); + try{ //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); @@ -141,8 +158,22 @@ public class NotebookServiceImpl implements NotebookService { .lambdaQuery() .in(EmployBillInfo::getNotebookId, notebooIds) .page(page); + map.put("BillInfo", pageList); + + BigDecimal incomeCount = BigDecimal.valueOf(0);//总收入 + BigDecimal expenditureCount = BigDecimal.valueOf(0);//总支出 + for (EmployBillInfo record : pageList.getRecords()) { + if(0 == record.getType()){ + incomeCount = incomeCount.add(record.getAmount()); + }else if(1 == record.getType()){ + expenditureCount = expenditureCount.add(record.getAmount()); + } + + } + map.put("incomeCount", incomeCount); + map.put("expenditureCount", expenditureCount); - return Result.OK("收支记录", pageList); + return Result.OK("收支记录", map); }catch (Exception e){ e.printStackTrace(); return Result.error("收支记录获取失败"); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java index bb9d9c3..8aeac34 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java @@ -90,8 +90,7 @@ public class ShareServiceImpl implements ShareService { String codeImg = oneImage.getParamValue(); try{ String url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + accessToken; - //param.put("scene", hanHaiMember.getId()); - param.put("scene", "1830614749375053826"); + param.put("scene", hanHaiMember.getId()); param.put("width", 150); param.put("auto_color", false); param.put("env_version", trial); @@ -191,7 +190,7 @@ public class ShareServiceImpl implements ShareService { * @return */ private String uploadAliYunOss(MultipartFile mf) throws Exception { - String uploadFile = "WxCodeFile"; + String uploadFile = "employ"; String fileName = new StringBuffer(mf.getOriginalFilename()).append(".jpg").toString();// 获取文件名 String dbpath = uploadFile + File.separator + fileName; if (dbpath.contains("\\")) {