From e94f43df2567b0ca74fe5b6c77781d64bc69b6c5 Mon Sep 17 00:00:00 2001 From: liangcheng <1546584672@qq.com> Date: Wed, 16 Jul 2025 18:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9xml=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E5=8C=B9=E9=85=8D=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8F=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performance/entity/bo/EbTableMonitorBO.java | 3 +-- .../performance/entity/po/EbTableMonitorPO.java | 1 + .../entity/po/EbTableScoreCoefficientPO.java | 13 ++++++++++++- .../xianghui/performance/entity/po/HrKpiFlowPO.java | 6 ++++++ .../mapper/EbTableScoreCoefficientMapper.java | 4 +++- .../service/impl/EbTableMonitorServiceImpl.java | 9 +++++++-- .../main/resources/mapper/EbTableMonitorMapper.xml | 3 +++ .../mapper/EbTableScoreCoefficientMapper.xml | 10 +++++++--- .../src/main/resources/mapper/HrKpiFlowMapper.xml | 2 ++ 9 files changed, 42 insertions(+), 9 deletions(-) diff --git a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/bo/EbTableMonitorBO.java b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/bo/EbTableMonitorBO.java index a55dc42..a08c497 100644 --- a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/bo/EbTableMonitorBO.java +++ b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/bo/EbTableMonitorBO.java @@ -1,7 +1,5 @@ package com.weaver.seconddev.xianghui.performance.entity.bo; -import com.weaver.common.distribution.genid.IdGenerator; -import com.weaver.common.hrm.cache.HrmDepartmentComInfo; import com.weaver.common.hrm.util.StringUtils; import com.weaver.common.hrm.util.Util; import com.weaver.common.i18n.tool.util.I18nContextUtil; @@ -84,6 +82,7 @@ public class EbTableMonitorBO { .dclr(getPengdingPerson(hrKpiFlow,employeePO.getTenantKey())) .fbsj(hrKpiFlow.getCreateTime()) .bm(hrKpiFlow.getDepartmentId()) + .gh(hrKpiFlow.getJobNum()) .qljbm(deptPath) .zq(formattedDate) .df(hrKpiFlow.getScore()) diff --git a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/EbTableMonitorPO.java b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/EbTableMonitorPO.java index a0ebcbd..b4a100e 100644 --- a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/EbTableMonitorPO.java +++ b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/EbTableMonitorPO.java @@ -48,6 +48,7 @@ public class EbTableMonitorPO { private Date pfzq; private Long khdx; private Long bm; + private String gh; private String dqjd; private String dclr; private Date fbsj; diff --git a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/EbTableScoreCoefficientPO.java b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/EbTableScoreCoefficientPO.java index deed228..d12ab10 100644 --- a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/EbTableScoreCoefficientPO.java +++ b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/EbTableScoreCoefficientPO.java @@ -42,9 +42,20 @@ public class EbTableScoreCoefficientPO { * 自定义字段 */ private Long bm; - private Date nf; + private String nf; private BigDecimal zxfs; private BigDecimal zdfs; private String pfxs; + @Override + public String toString() { + return "EbTableScoreCoefficientPO{" + + "id=" + id + + "bm=" + bm + + ", nf=" + nf + + ", zxfs=" + zxfs + + ", zdfs=" + zdfs + + ", pfxs='" + pfxs + '\'' + + '}'; + } } diff --git a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/HrKpiFlowPO.java b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/HrKpiFlowPO.java index d1d1497..b4e6ec4 100644 --- a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/HrKpiFlowPO.java +++ b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/entity/po/HrKpiFlowPO.java @@ -81,5 +81,11 @@ public class HrKpiFlowPO { */ private BigDecimal score; + /** + * 工号 + */ + private String jobNum; + + } diff --git a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/mapper/EbTableScoreCoefficientMapper.java b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/mapper/EbTableScoreCoefficientMapper.java index 3668162..4dcee1e 100644 --- a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/mapper/EbTableScoreCoefficientMapper.java +++ b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/mapper/EbTableScoreCoefficientMapper.java @@ -6,11 +6,13 @@ import com.weaver.seconddev.xianghui.performance.entity.po.HrKpiFlowPO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; @Mapper public interface EbTableScoreCoefficientMapper extends BaseMapper { - List selectScoreCoefficient(@Param("hrKpiFlowPO") HrKpiFlowPO hrKpiFlowPO,@Param("year") String year,@Param("tenantKey") String tenantKey); + List selectScoreCoefficient(@Param("departmentId") String departmentId,@Param("year") String year, + @Param("tenantKey") String tenantKey,@Param("score") BigDecimal score); } diff --git a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/service/impl/EbTableMonitorServiceImpl.java b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/service/impl/EbTableMonitorServiceImpl.java index 72e39b4..ee4a9f7 100644 --- a/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/service/impl/EbTableMonitorServiceImpl.java +++ b/secondev-xianghui-performance/src/main/java/com/weaver/seconddev/xianghui/performance/service/impl/EbTableMonitorServiceImpl.java @@ -83,7 +83,12 @@ public class EbTableMonitorServiceImpl implements EbTableMonitorService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); year = sdf.format(hrKpiFlowPO.getRealPeriod()); } - List coefficientPOList = ebTableScoreCoefficientMapper.selectScoreCoefficient(hrKpiFlowPO, year, tenantKey); + String departmentId = Optional.ofNullable(hrKpiFlowPO.getDepartmentId()) + .map(Object::toString) + .orElse(""); + List coefficientPOList = ebTableScoreCoefficientMapper.selectScoreCoefficient(departmentId, year, tenantKey,hrKpiFlowPO.getScore()); + + EbTableScoreCoefficientPO coefficientPO = coefficientPOList.stream() .max(Comparator.comparingLong(EbTableScoreCoefficientPO::getId)) .orElse(null); @@ -103,7 +108,7 @@ public class EbTableMonitorServiceImpl implements EbTableMonitorService { try { return new BigDecimal(pfxs); } catch (NumberFormatException e) { - log.error("无效的pfxs数值格式: {}", pfxs+"--->"+hrKpiFlowPO.getScore()); + log.error("无效的pfxs数值格式: {} -> {}", pfxs,hrKpiFlowPO.getScore()); return null; } } diff --git a/secondev-xianghui-performance/src/main/resources/mapper/EbTableMonitorMapper.xml b/secondev-xianghui-performance/src/main/resources/mapper/EbTableMonitorMapper.xml index 397d5f7..b95b596 100644 --- a/secondev-xianghui-performance/src/main/resources/mapper/EbTableMonitorMapper.xml +++ b/secondev-xianghui-performance/src/main/resources/mapper/EbTableMonitorMapper.xml @@ -23,6 +23,7 @@ pfzq = #{record.pfzq}, khdx = #{record.khdx}, bm = #{record.bm}, + gh = #{record.gh}, dqjd = #{record.dqjd}, dclr = #{record.dclr}, fbsj = #{record.fbsj}, @@ -59,6 +60,7 @@ pfzq, khdx, bm, + gh, dqjd, dclr, fbsj, @@ -86,6 +88,7 @@ #{record.pfzq}, #{record.khdx}, #{record.bm}, + #{record.gh}, #{record.dqjd}, #{record.dclr}, #{record.fbsj}, diff --git a/secondev-xianghui-performance/src/main/resources/mapper/EbTableScoreCoefficientMapper.xml b/secondev-xianghui-performance/src/main/resources/mapper/EbTableScoreCoefficientMapper.xml index 9a6b989..8bd70d0 100644 --- a/secondev-xianghui-performance/src/main/resources/mapper/EbTableScoreCoefficientMapper.xml +++ b/secondev-xianghui-performance/src/main/resources/mapper/EbTableScoreCoefficientMapper.xml @@ -4,6 +4,8 @@ + + @@ -12,6 +14,8 @@ diff --git a/secondev-xianghui-performance/src/main/resources/mapper/HrKpiFlowMapper.xml b/secondev-xianghui-performance/src/main/resources/mapper/HrKpiFlowMapper.xml index 5cb795f..aa58911 100644 --- a/secondev-xianghui-performance/src/main/resources/mapper/HrKpiFlowMapper.xml +++ b/secondev-xianghui-performance/src/main/resources/mapper/HrKpiFlowMapper.xml @@ -13,6 +13,7 @@ + @@ -24,6 +25,7 @@ hkf.kpi_current_step, hkf.DATE_TYPE, hkf.score, + e.job_num, CASE WHEN hkf.flow_status IN ('noScore', 'noApprove') THEN 'scoreOverTime'