From be9b9b384649f6e19a77cecf6566e9e95a99e399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sat, 23 Mar 2024 00:26:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jh/project/mapper/SurProjectAttendanceDataMapper.java | 2 ++ .../service/impl/SurProjectAttendanceDataServiceImpl.java | 2 +- .../mapper/project/SurProjectAttendanceDataMapper.xml | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java index fd00ee93..3f605f9b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java @@ -90,4 +90,6 @@ public interface SurProjectAttendanceDataMapper public List> initOtherData(Map data); public List> initHuaZhuData(Map data); + + public String findHuaZhuCompanyType(String deptName); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index a5745617..bbe0dfd5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -219,7 +219,7 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc } private String getHuazhuCompanyTypeId(String groupName) { - return ""; + return surProjectAttendanceDataMapper.findHuaZhuCompanyType(groupName); } @Override diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index 2880f2be..4e89505e 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -349,4 +349,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY d.workerId + + \ No newline at end of file