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

update code

dev_xds
haha 2024-04-11 00:26:45 +08:00
parent 42d9d37e17
commit eecdfb9d2c
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-ui/src/views/project/attendanceWorker/index.vue
View File

@ -189,15 +189,14 @@ export default {
});
},
/** 查询考勤人员基本属性列表 */
getList() {
debugger
getList() {
this.loading = true;
let tmps = this.cfgList.filter(d => d.projectId == this.queryParams.projectId && d.subDeptId == this.queryParams.subDeptId);
let ajax = listAttendanceWorker(this.queryParams);
let ajax = listAttendanceWorker;
if (tmps.length > 0 && tmps[0].vendorsCode == 'jgw') {
ajax = listJgwAttendanceWorker(this.queryParams)
ajax = listJgwAttendanceWorker;
}
ajax.then(response => {
ajax(this.queryParams).then(response => {
this.attendanceWorkerList = (response.rows || []).map(it => {
it.enterDate = it.enterDate ? new Date(it.enterDate * 1) : null;
return it;

6
yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
View File

@ -147,12 +147,12 @@ public class AttendanceJgwTask {
System.out.println(token);
System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd"));
String subcontractorId=new AttendanceJgwTask().getSubcontractor(appid,token,phone);
String leaderTeamId="a643aaf5fdeb4c8fb0d8c7307881ce97";
String leaderTeamId="f4bc0ff9a0194177bf1dd9217cf1b10f";
System.out.println(subcontractorId);
//findWorkerByLeader(appid,token,leaderTeamId);
findWorkerByLeader(appid,token,leaderTeamId);
//findDirectlyUnderTeam(appid,token,prjId,subcontractorId,0);
//queryProject(appid,token,phone,0);;
findAddWorkerByProject(appid,token,prjId,0);
//findAddWorkerByProject(appid,token,prjId,0);
//findUpdateWorkerByProject(appid,token,prjId,0);
//findAttendanceByProject(appid,token,prjId);
//findTeamByProjectId(appid,token,prjId);

16
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
View File

@ -66,6 +66,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
c.project_id,c.sub_dept_id,u.companyName,u.workTypeName,g.teamname groupName,g.companyName remark
FROM sur_project_attendance_user u,sur_project_attendance_cfg c,sur_project_attendance_group g
WHERE u.cfgid=c.id AND g.companyid=u.companyid AND u.vendors_code='jgw'
<if test="companyTypeId!=null">
<if test="companyTypeId>100">
<if test="companyTypeId==101">
and g.companyTypeId in (1,6)
</if>
<if test="companyTypeId==102">
and g.companyTypeId =8
</if>
<if test="companyTypeId==103">
and g.companyTypeId in (0,2,3,4,5)
</if>
</if>
<if test="companyTypeId &lt;100">
and g.companyTypeId=#{companyTypeId}
</if>
</if>
<if test="cfgid != null "> and u.cfgid = #{cfgid}</if>
<if test="appId != null "> and u.app_id = #{appId}</if>
<if test="vendorsCode != null and vendorsCode != ''"> and u.vendors_code = #{vendorsCode}</if>