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

update code

dev_xds
haha 2024-03-23 02:17:39 +08:00
parent 9bade2237e
commit b5110ca8e6
7 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java
View File

@ -1,5 +1,7 @@
package com.yanzhu.jh.bigscreen.web.controller;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
@ -140,18 +142,16 @@ public class ProjectAttendanceController extends BaseController {
* 今日出勤详情
*/
@PostMapping("/todayAttendance")
public TableDataInfo todayAttendance(@RequestBody SurProjectAttendanceUser where){
public TableDataInfo todayAttendance(@RequestBody SurProjectAttendanceData where){
if(where.getDeptId()==null || where.getDeptId()<=0) {
if (SecurityUtils.isUserB()) {
where.setPrjIds(getProjectIds());
}
}
long cnt=attendanceUserService.countTodayAttendance(where);
List<SurProjectAttendanceUser> list=attendanceUserService.todayAttendance(where);
TableDataInfo dataInfo=new TableDataInfo();
dataInfo.setTotal(cnt);
dataInfo.setRows(list);
return dataInfo;
startPage();
where.setAttendanceTime(DateUtil.formatDate(DateTime.now()));
List<SurProjectAttendanceData> list=attendanceDataService.todayAttendance(where);
return getDataTable(list);
}
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java
View File

@ -92,4 +92,6 @@ public interface SurProjectAttendanceDataMapper
public List<Map<String,Object>> initHuaZhuData(Map<String,Object> data);
public String findHuaZhuCompanyType(String deptName);
public List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where);
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java
View File

@ -93,4 +93,6 @@ public interface ISurProjectAttendanceDataService
public List<Map<String,Object>> initOtherData(Map<String,Object> data);
public List<Map<String,Object>> initHuaZhuData(Map<String,Object> data);
List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where);
}

3
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectWorkAttendanceService.java
View File

@ -1,6 +1,8 @@
package com.yanzhu.jh.project.service;
import java.util.List;
import com.yanzhu.jh.project.domain.SurProjectAttendanceData;
import com.yanzhu.jh.project.domain.SurProjectWorkAttendance;
/**
@ -68,4 +70,5 @@ public interface ISurProjectWorkAttendanceService
public int deleteSurProjectWorkAttendanceById(Long id);
public List<SurProjectWorkAttendance> selectByDate(SurProjectWorkAttendance surProjectWorkAttendance);
}

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

@ -214,6 +214,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
sdata.setDeptId(cfg.getSubDeptId());
sdata.setProjectName(cfg.getProjectName());
sdata.setDeptName(cfg.getDeptName());
if(sdata.getCompanyTypeId()==null){
sdata.setCompanyTypeId("0");
}
insertSurProjectAttendanceData(sdata);
}else{
sdata.setId(list.get(0).getId());
@ -284,4 +287,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
}
return list;
}
@Override
public List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where) {
return surProjectAttendanceDataMapper.todayAttendance(where);
}
}

3
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectWorkAttendanceServiceImpl.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.PublicStateEnum;
import com.ruoyi.common.utils.DateUtils;
import com.yanzhu.jh.project.domain.SurProjectAttendanceData;
import com.yanzhu.jh.project.domain.SurProjectDeptWroks;
import com.yanzhu.jh.project.mapper.SurProjectDeptWroksMapper;
import org.springframework.beans.factory.annotation.Autowired;
@ -148,4 +149,6 @@ public class SurProjectWorkAttendanceServiceImpl implements ISurProjectWorkAtten
public List<SurProjectWorkAttendance> selectByDate(SurProjectWorkAttendance surProjectWorkAttendance) {
return surProjectWorkAttendanceMapper.selectByDate(surProjectWorkAttendance);
}
}

28
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
View File

@ -354,4 +354,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where sd.dept_name = #{deptName}
</select>
<select id="todayAttendance" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
select * from sur_project_attendance_data_${year}
<where>
<if test="id==1">
and companyTypeId in (1,6)
</if>
<if test="id==2">
and companyTypeId in (0,2,3,4,5)
</if>
<if test="id==8">
and companyTypeId =8
</if>
<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>
</select>
</mapper>