diff --git a/ruoyi-ui/src/views/project/attendance/index.vue b/ruoyi-ui/src/views/project/attendance/index.vue index b608e114..734ce248 100644 --- a/ruoyi-ui/src/views/project/attendance/index.vue +++ b/ruoyi-ui/src/views/project/attendance/index.vue @@ -58,7 +58,7 @@ - + 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 0bd2734a..6cf1bf0f 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 @@ -199,6 +199,7 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc sdata.setCompanyTypeId(group.getCompanyTypeId()); //查询华筑的分组信息 if("huazhu".equals(sdata.getVendorsCode())){ + sdata.setWorkerGender(sdata.getWorkerGender()==1?0l:1l); sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型 } //查询项目部门信息