update code
parent
b5110ca8e6
commit
4627b967c0
|
@ -122,7 +122,8 @@ public class ProjectAttendanceController extends BaseController {
|
||||||
where.setPrjIds(getProjectIds());
|
where.setPrjIds(getProjectIds());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
List<SurProjectAttendanceData> list=attendanceDataService.groupByComany(where);
|
where.setAttendanceTime(DateUtil.formatDate(DateTime.now()));
|
||||||
|
List<SurProjectAttendanceData> list=attendanceDataService.groupTodayCompanyTypeId(where);
|
||||||
return AjaxResult.success(list);
|
return AjaxResult.success(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -94,4 +94,6 @@ public interface SurProjectAttendanceDataMapper
|
||||||
public String findHuaZhuCompanyType(String deptName);
|
public String findHuaZhuCompanyType(String deptName);
|
||||||
|
|
||||||
public List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where);
|
public List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where);
|
||||||
|
|
||||||
|
public List<SurProjectAttendanceData> groupTodayCompanyTypeId(SurProjectAttendanceData where);
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,4 +95,6 @@ public interface ISurProjectAttendanceDataService
|
||||||
public List<Map<String,Object>> initHuaZhuData(Map<String,Object> data);
|
public List<Map<String,Object>> initHuaZhuData(Map<String,Object> data);
|
||||||
|
|
||||||
List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where);
|
List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where);
|
||||||
|
|
||||||
|
List<SurProjectAttendanceData> groupTodayCompanyTypeId(SurProjectAttendanceData where);
|
||||||
}
|
}
|
||||||
|
|
|
@ -292,4 +292,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
|
||||||
public List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where) {
|
public List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where) {
|
||||||
return surProjectAttendanceDataMapper.todayAttendance(where);
|
return surProjectAttendanceDataMapper.todayAttendance(where);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<SurProjectAttendanceData> groupTodayCompanyTypeId(SurProjectAttendanceData where) {
|
||||||
|
return surProjectAttendanceDataMapper.groupTodayCompanyTypeId(where);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -382,4 +382,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="groupTodayCompanyTypeId" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
|
||||||
|
select companyTypeId,count(1) id from sur_project_attendance_data_${year}
|
||||||
|
<where>
|
||||||
|
<if test="projectId!=null and projectId>0">
|
||||||
|
and projectId=#{projectId}
|
||||||
|
</if>
|
||||||
|
<if test="deptId!=null and deptId>0">
|
||||||
|
and deptid=#{deptId}
|
||||||
|
</if>
|
||||||
|
<if test="prjIds !=null and prjIds.size()>0">
|
||||||
|
and projectId in
|
||||||
|
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
|
||||||
|
#{item}
|
||||||
|
</foreach>
|
||||||
|
</if>
|
||||||
|
<if test="attendanceTime != null and attendanceTime != ''"> and date(attendance_time) =date(#{attendanceTime})</if>
|
||||||
|
</where>
|
||||||
|
group by companyTypeId
|
||||||
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
Loading…
Reference in New Issue