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