From 4868cb2a2d794d8d1df9fdeb9f0ed56323d8893f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 27 Jan 2024 23:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=A2=AB=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/supervise/vo/IndicatorsVO.java | 2 ++ .../supervise/vo/api/BeIndicatorsVO.java | 24 +++++++++++++++++++ .../supervise/mapper/IndicatorsMapper.java | 8 +++++++ .../supervise/mapper/IndicatorsMapper.xml | 20 ++++------------ .../service/impl/ClassifyServiceImpl.java | 10 +++++++- 5 files changed, 48 insertions(+), 16 deletions(-) create mode 100644 blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java index c45889b22..b490767ad 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java @@ -18,7 +18,9 @@ public class IndicatorsVO extends IndicatorsEntity { private Long parentClassifyId; private Integer bonusPoin; + private Integer deductionPoints; + private String parentClassifyName; private List pictures = new ArrayList<>(); diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java new file mode 100644 index 000000000..c46512e13 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java @@ -0,0 +1,24 @@ +package com.logpm.supervise.vo.api; + +import com.logpm.supervise.entity.IndicatorsAnnexEntity; +import com.logpm.supervise.entity.IndicatorsEntity; +import com.logpm.supervise.vo.IndicatorsVO; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class BeIndicatorsVO { + private static final long serialVersionUID = 1L; + + + private Integer bonusPoin; + + private Integer deductionPoints; + + private List indicatorsVOS; + + +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java index ba373a07e..ef4ab210f 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.supervise.dto.IndicatorsDTO; import com.logpm.supervise.entity.IndicatorsEntity; import com.logpm.supervise.vo.IndicatorsVO; +import com.logpm.supervise.vo.api.BeIndicatorsVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -34,4 +35,11 @@ public interface IndicatorsMapper extends BaseMapper { * @return */ Page selectBeMyApiIndicators(IPage page,@Param("params") Map params); + + /** + * 查询我的分数 + * @param params + * @return + */ + BeIndicatorsVO selectMyPoints(Map params); } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml index 2e4d545e3..225942573 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml @@ -61,20 +61,7 @@ + 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 4dd0f68cb..b8b61287c 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 @@ -35,6 +35,7 @@ import com.logpm.supervise.service.IIndicatorsService; import com.logpm.supervise.service.IPointsService; import com.logpm.supervise.vo.ClassifyVO; import com.logpm.supervise.vo.IndicatorsVO; +import com.logpm.supervise.vo.api.BeIndicatorsVO; import com.logpm.supervise.vo.api.ClassifyApiVO; import com.logpm.supervise.wrapper.ClassifyWrapper; import com.logpm.supervise.wrapper.IndicatorsWrapper; @@ -309,16 +310,23 @@ public class ClassifyServiceImpl extends BaseServiceImpl params, IPage page) { BladeUser user = AuthUtil.getUser(); + BeIndicatorsVO beIndicatorsVO = null; if (Func.isNotEmpty(user)){ // params.put("userId",user.getUserId()); if (Func.isNotEmpty(user.getDeptId())){ params.put("deptId",user.getDeptId()); + beIndicatorsVO = indicatorsMapper.selectMyPoints(params); } } + //查询分数 + //查询我被考核的列表 Page indicatorsVOPage = indicatorsMapper.selectBeMyApiIndicators(page, params); + if (Func.isNotEmpty(indicatorsVOPage)){ + beIndicatorsVO.setIndicatorsVOS(indicatorsVOPage.getRecords()); + } - return R.data(indicatorsVOPage); + return R.data(beIndicatorsVO); } private List getClassifyList(Long pid) {