From aaeeeef0af8af67335476537907b9df8a347c1ce Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 4 Apr 2023 09:40:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8B=9C=E8=AE=BF=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=81=E6=94=BF=E7=AD=96=E5=BC=82=E5=B8=B8=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/controller/BizCusVisitController.java | 1 + .../biz/controller/api/BizCusVisitApi.java | 6 ++++- .../biz/controller/api/BizVisitApi.java | 22 +++++++++++++++++++ .../bms/controller/BmsSubjectController.java | 2 +- .../bms/controller/BmsSupplierController.java | 10 +++++++++ .../BmsSupplierVisitAddressController.java | 2 +- .../controller/GoodsCategoryController.java | 6 +++-- .../tzc/controller/TzcPolicyController.java | 7 +++++- .../tzc/entity/bo/TzcPolicyItemBo.java | 6 +++++ .../impl/TzcPolicyApplicationServiceImpl.java | 10 ++++++++- 10 files changed, 65 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java b/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java index e8690c7a..83cf54c4 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java @@ -56,6 +56,7 @@ public class BizCusVisitController { @PreAuthorize("hasRole('biz:cusVisit:query')") public R> getPage(BizCusVisit param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + lqw.orderByDesc(BizCusVisit::getId); PageUtil.startPage(); List list = bizCusVisitService.list(lqw); return R.byPageHelperList(list); diff --git a/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java b/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java index 9be92cdb..740e5372 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java @@ -27,7 +27,7 @@ import java.time.LocalDateTime; import java.util.List; /** - * API业务 拜访日志2 + * API业务 客户拜访日志 * @author YenHex * @since 2022-10-26 */ @@ -76,6 +76,9 @@ public class BizCusVisitApi { @GetMapping("/page4Under") public R> page4Under(BizCusVisit param){ List userIds = sysUserSalesService.listByChildIds(AuthContextUtils.getSysUserId()); + if(userIds.size()<1){ + return R.byEmptyList(); + } PageUtil.startPage(); LambdaQueryWrapper visitWrapper = new LambdaQueryWrapper<>(param); visitWrapper.in(BizCusVisit::getVisitorId,userIds); @@ -157,6 +160,7 @@ public class BizCusVisitApi { cusVisit.setSignTypeForm(visitForm.getFormContext()); } cusVisit.setSignTypeFormValue(param.getFormJson()); + cusVisit.setStatus(1); bizVisitService.updateById(cusVisit); return; } diff --git a/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java b/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java index c1f946de..d9392c61 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java @@ -6,10 +6,13 @@ import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.PageUtil; +import com.qs.serve.modules.biz.entity.BizCusVisit; import com.qs.serve.modules.biz.entity.BizVisit; import com.qs.serve.modules.biz.service.BizVisitService; import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysUserSalesService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.wx.entity.WxUser; import com.qs.serve.modules.wx.service.WxUserService; @@ -35,6 +38,7 @@ public class BizVisitApi { private BizVisitService bizVisitService; private WxUserService wxUserService; private SysUserService sysUserService; + private SysUserSalesService sysUserSalesService; /** * 翻页 @@ -55,6 +59,24 @@ public class BizVisitApi { return R.byPageHelperList(list); } + /** + * 翻页（我的下属拜访记录） + * @param param + * @return + */ + @GetMapping("/page4Under") + public R> page4Under(BizVisit param){ + List userIds = sysUserSalesService.listByChildIds(AuthContextUtils.getSysUserId()); + if(userIds.size()<1){ + return R.byEmptyList(); + } + PageUtil.startPage(); + LambdaQueryWrapper visitWrapper = new LambdaQueryWrapper<>(param); + visitWrapper.in(BizVisit::getVisitorId,userIds); + List list = bizVisitService.list(visitWrapper); + return R.byPageHelperList(list); + } + /** * ID查询 * @param id diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java index fb8815d6..9aa6dd08 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java @@ -55,7 +55,7 @@ public class BmsSubjectController { @GetMapping("/tree") @PreAuthorize("hasRole('bms:subject:query')") public R> getPage(String supplierId){ - List subjectList = bmsSubjectService.list(new LambdaQueryWrapper().orderByDesc(BmsSubject::getId)); + List subjectList = bmsSubjectService.list(new LambdaQueryWrapper().orderByAsc(BmsSubject::getSubjectCode)); List treeVoList = subjectList.stream().map(subject->{ BmsSubjectTreeVo treeNode = CopierUtil.copy(subject,new BmsSubjectTreeVo()); treeNode.setId(subject.getId().toString()); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 57137df0..ba063e5d 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -24,6 +24,7 @@ import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam2; import com.qs.serve.modules.sys.entity.dto.SysUserSimpleVo; import com.qs.serve.modules.sys.service.SysUserService; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -113,8 +114,11 @@ public class BmsSupplierController { @GetMapping("/tree") @PreAuthorize("hasRole('bms:supplier:query')") public R> getTree(BmsSupplier param){ + Date d = new Date(); List list = bmsSupplierService.selectSupplierList(param); + Date d2 = new Date(); initSupplierList(list); + Date d3 = new Date(); List list2 = list.stream().map(supplier->{ BmsSupplierTreeVo treeNode = CopierUtil.copy(supplier,new BmsSupplierTreeVo()); treeNode.setId(supplier.getId()); @@ -122,7 +126,13 @@ public class BmsSupplierController { treeNode.setSort(0); return treeNode; }).collect(Collectors.toList()); + Date d4 = new Date(); list2 = TreeUtil.buildByRecursive(list2,TreeUtil.DEFAULT_PID_STRING); + Date d5 = new Date(); + System.out.println("d2-d"+(d2.getTime()-d.getTime())); + System.out.println("d3-d2"+(d3.getTime()-d2.getTime())); + System.out.println("d4-d3"+(d4.getTime()-d3.getTime())); + System.out.println("d5-d4"+(d5.getTime()-d4.getTime())); return R.ok(list2); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java index 348edbb2..ca32e077 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java @@ -92,7 +92,7 @@ public class BmsSupplierVisitAddressController { addressVo.setSupplierCode(supplier.getCode()); addressVo.setSupplierName(supplier.getName()); BmsSupplierVisitAddress visitAddress = bmsSupplierVisitAddressService.getById(addressVo.getAddressId()); - BmsSupplierVisit visitInfo = bmsSupplierVisitService.getById(supplier.getId()); + BmsSupplierVisit visitInfo = bmsSupplierVisitService.getOne(new LambdaQueryWrapper().eq(BmsSupplierVisit::getSupplierId,supplier.getId()),false); addressVo.setAddressInfo(visitAddress); addressVo.setVisitInfo(visitInfo); break; diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java index 7d3bcd2e..fbae5f4c 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java @@ -85,8 +85,10 @@ public class GoodsCategoryController { * @return */ @GetMapping("/enableTree") - public R> getPage(GoodsCategory param){ - param.setEnable(1); + public R> getPage(GoodsCategory param,Integer loadAll){ + if(loadAll==null||!loadAll.equals(1)){ + param.setEnable(1); + } return this.getTree(param); } diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java index 07820779..54cda023 100644 --- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java +++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java @@ -111,6 +111,7 @@ public class TzcPolicyController { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); param.setUserId(userId); PageUtil.startPage(); + lqw.orderByDesc(TzcPolicy::getCreateTime); List list = tzcPolicyService.list(lqw); return R.byPageHelperList(list); } @@ -125,6 +126,7 @@ public class TzcPolicyController { public R> getPage(TzcPolicy param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); PageUtil.startPage(); + lqw.orderByDesc(TzcPolicy::getCreateTime); List list = tzcPolicyService.list(lqw); return R.byPageHelperList(list); } @@ -188,7 +190,10 @@ public class TzcPolicyController { lqw.in(TzcPolicy::getId,idsLong); lqw.eq(TzcPolicy::getPolicyStatus, TzcPolicyStatus.Status_0_UnCommit); boolean result = tzcPolicyService.remove(lqw); - return R.isTrue(result); + if(result){ + return R.ok(); + } + return R.error("当前状态不支持删除"); } diff --git a/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java b/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java index c229c9d1..07934103 100644 --- a/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java +++ b/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java @@ -12,6 +12,8 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; import java.util.List; @@ -58,13 +60,17 @@ public class TzcPolicyItemBo implements Serializable { /** 满减金额 */ @NotNull(message = "满减金额不能为空") + @DecimalMin(value = "1",message = "返点百分比参数错误") private BigDecimal discountAmount; /** 优惠上限 */ + @DecimalMin(value = "1",message = "返点百分比参数错误") private BigDecimal discountMax; /** 返点百分比 */ @NotNull(message = "返点百分比不能为空") + @DecimalMax(value = "100",message = "返点百分比参数错误") + @DecimalMin(value = "0.01",message = "返点百分比参数错误") private BigDecimal discountRate; diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index 14926606..c4a59c33 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -166,7 +166,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ createProcess.setDataJson(JsonUtil.objectToJson(data)); R flowIdResult = seeYonService.baseCreateProcess(createProcess); if(flowIdResult.getStatus()!=200){ - Assert.throwEx("远程服务调用失败"); + Assert.throwEx(flowIdResult.getMsg()); } String flowId = flowIdResult.getData(); String formId = null; @@ -324,6 +324,9 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ Boolean buildTableFlag){ Boolean overspend = false; List policyItemList = tzcPolicyItemService.listByPolicyId(policyId); + if(policyItemList.size()<1){ + Assert.throwEx("请政策项添加后再提交"); + } return this.buildBudgetCostResult(policyId,policyItemList,overspend,throwEx,buildTableFlag); } @@ -387,6 +390,11 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ BigDecimal budgetItemAmount = tbsScheduleItemBudgetMapper.totalCostAmountByPolicyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),policyId); //因为结果为负数，需去相反数 budgetItemAmount = budgetItemAmount==null?BigDecimal.ZERO:budgetItemAmount.negate(); + //添加费用占用情况 + BigDecimal budgetItemCostAmount = tbsScheduleItemBudgetMapper.totalCostAmountByApplyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),0L); + if(budgetItemCostAmount!=null){ + budgetItemAmount = budgetItemAmount.add(budgetItemCostAmount.negate()); + } budgetItemAmountMap.put(itemBudget.getId(),budgetItemAmount); } //统计当前活动前置项占用预算