sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2024-03-23 01:33:04 +08:00
parent ce59957910
commit 9bade2237e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/project/attendance/index.vue
View File

@ -58,7 +58,7 @@
<el-table-column label="姓名" align="center" prop="workerName" /> <el-table-column label="姓名" align="center" prop="workerName" />
<el-table-column label="籍贯" align="center" prop="nativePlace" /> <el-table-column label="籍贯" align="center" prop="nativePlace" />
<el-table-column label="性别" align="center" prop="attendanceType" > <el-table-column label="性别" align="center" prop="attendanceType" >
<template slot-scope="{row}">{{ row.workerGender!=1?'女':'男' }}</template> <template slot-scope="{row}">{{ row.workerGender==1?'女':'男' }}</template>
</el-table-column> </el-table-column>
<el-table-column label="进场时间" align="center" prop="inTime"> <el-table-column label="进场时间" align="center" prop="inTime">
<template slot-scope="{row}">{{ row.attendanceTime|formatTime }}</template> <template slot-scope="{row}">{{ row.attendanceTime|formatTime }}</template>

1
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
View File

@ -199,6 +199,7 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
sdata.setCompanyTypeId(group.getCompanyTypeId()); sdata.setCompanyTypeId(group.getCompanyTypeId());
//查询华筑的分组信息 //查询华筑的分组信息
if("huazhu".equals(sdata.getVendorsCode())){ if("huazhu".equals(sdata.getVendorsCode())){
sdata.setWorkerGender(sdata.getWorkerGender()==1?0l:1l);
sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型 sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型
} }
//查询项目部门信息 //查询项目部门信息