From ba5631541dd8d29e5b82da02944b7ac67f7692e4 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 19 Feb 2024 17:20:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=B7=A5=E5=8D=95=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E8=B0=83=E6=95=B4=E3=80=81=E8=80=83=E6=A0=B8=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E9=A1=B9=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AftersalesWorkOrderServiceImpl.java | 7 ++++++- .../main/java/com/logpm/supervise/api/ClassifyApi.java | 4 ++-- .../java/com/logpm/supervise/mapper/ClassifyMapper.java | 2 +- .../java/com/logpm/supervise/mapper/ClassifyMapper.xml | 3 +++ .../com/logpm/supervise/service/IClassifyService.java | 2 +- .../logpm/supervise/service/impl/ClassifyServiceImpl.java | 8 ++++---- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index 4f1a30afe..e177dd349 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -1216,12 +1216,17 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl list4 = completionRecordService.list(Wrappers.query().lambda() .eq(AftersalesCompletionRecordEntity::getWorkOrderId, aftersalesWorkOrder.getId()) ); + if (Func.isNotEmpty(list4)){ + list4.forEach(i->{ + BigDecimal bigDecimal = i.getMoney().setScale(2, BigDecimal.ROUND_FLOOR); + i.setMoney(bigDecimal); + }); + } aftersalesWorkOrderVO.setCompletionRecordEntities(list4); List list5 = completionRecipientService.list(Wrappers.query().lambda() .eq(AftersalesCompletionRecipientEntity::getWorkOrderId, aftersalesWorkOrder.getId()) ); aftersalesWorkOrderVO.setCompletionRecipientEntityList(list5); - } return aftersalesWorkOrderVO; diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java index 5437e2e4b..041ab04fa 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java @@ -33,8 +33,8 @@ public class ClassifyApi { @GetMapping("/classifyList") @ApiOperationSupport(order = 1) @ApiOperation(value = "小程序指标项列表", notes = "传入classify") - public R> classifyList() { - List detail = classifyService.selectClassifyList(); + public R> classifyList(@RequestParam Long deptId) { + List detail = classifyService.selectClassifyList(deptId); return R.data(detail); } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java index fb9815c63..b54721351 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java @@ -26,5 +26,5 @@ public interface ClassifyMapper extends BaseMapper { * @param pid * @return */ - List selectAllClassifyList(Long pid); + List selectAllClassifyList(@Param("pid") Long pid,@Param("exAdminDeptId")Long exAdminDeptId); } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml index 09ba02a81..061171e2b 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml @@ -62,5 +62,8 @@ and p_id = #{pid} + + and examine_dept_id = #{exAdminDeptId} + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java index e4726b4dd..e4fab30d3 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java @@ -58,7 +58,7 @@ public interface IClassifyService extends BaseService { * 查询指标项列表 * @return */ - List selectClassifyList(); + List selectClassifyList(Long deptId); /** * API保存考核信息 diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index 210288cce..0ee33870f 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -223,9 +223,9 @@ public class ClassifyServiceImpl extends BaseServiceImpl selectClassifyList() { + public List selectClassifyList(Long deptId) { Long pid = 0L; - List classifyEntities = getClassifyList(pid); + List classifyEntities = getClassifyList(pid,deptId); for (ClassifyApiVO classifyEntity : classifyEntities) { if (classifyEntity.getPId().equals(0L)) { List classifyList = new ArrayList<>(); @@ -491,7 +491,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl getClassifyList(Long pid) { - return baseMapper.selectAllClassifyList(pid); + private List getClassifyList(Long pid,Long exAdminDeptId) { + return baseMapper.selectAllClassifyList(pid,exAdminDeptId); } }