admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

是否忽略员工打卡时的“进/出”方向标识和bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-11-10 18:24:39 +08:00
parent 5bcc2e8517
commit 018afbc1e7
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
View File

@ -30,7 +30,7 @@
group by a.id
</select>
<select id="selectOneWorkerAttendance" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT pass_type, create_time
SELECT pass_type, create_time, project_sn
FROM worker_attendance
WHERE person_sn = #{personSn}
AND is_statistics = 0

5
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerMonthAttendanceStatisticsMapper.xml
View File

@ -11,7 +11,12 @@
IF(29>DAY(last_day(str_to_date(CONCAT(#{param.monthTime},'-01'),'%Y-%m-%d'))),NULL,day29) day29,
IF(30>DAY(last_day(str_to_date(CONCAT(#{param.monthTime},'-01'),'%Y-%m-%d'))),NULL,day30) day30,
IF(31>DAY(last_day(str_to_date(CONCAT(#{param.monthTime},'-01'),'%Y-%m-%d'))),NULL,day31) day31
,a.enterprise_id enterprise_id
,if(a.person_type=1,b.id,c1.id) dept_id
,a.id worker_id
from worker_info a
LEFT JOIN team_info b ON a.team_id = b.id and a.person_type=1
LEFT JOIN department_info c1 ON a.department_id = c1.id and a.person_type=2
LEFT JOIN worker_month_attendance_statistics c ON a.person_sn=c.person_sn AND c.query_time=#{param.monthTime}
where a.project_sn=#{param.projectSn} and a.inService_type=#{param.inserviceType}
<if test="param.personType!=null and param.personType!=''">

9
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerMonthAttendanceStatisticsServiceImpl.java
View File

@ -69,7 +69,9 @@ public class WorkerMonthAttendanceStatisticsServiceImpl extends ServiceImpl<Work
private GovtOpenApiService govtOpenApiService;
@Autowired
private EnvironmentUtil environmentUtil;
@Lazy
@Autowired
private IProjectConfigService projectConfigService;
@Override
public IPage<EntityMap> selectMonthAttendanceByPage(Map<String, Object> map) {
@ -141,7 +143,6 @@ public class WorkerMonthAttendanceStatisticsServiceImpl extends ServiceImpl<Work
return workerMonthAttendanceStatisticsMapper.getListByProjectSn(projectSn);
}
@Override
public void getMonthAttendanceStatistics(String inputTime) {
try {
@ -531,10 +532,6 @@ public class WorkerMonthAttendanceStatisticsServiceImpl extends ServiceImpl<Work
}
}
@Lazy
@Autowired
private IProjectConfigService projectConfigService;
//判断考勤情况
public Map<String, Integer> getWorkerAttendanceType(String personSn, Long workerAttendanceRuleId, String passTime) {
int attendanceType = 0;

4
src/main/java/com/zhgd/xmgl/task/VideoTask.java
View File

@ -17,8 +17,8 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
@ -29,7 +29,7 @@ import java.util.*;
* @create: 2021-11-11 18:48
**/
@Slf4j
@Controller
@RestController
@RequestMapping("/xmgl/task/")
public class VideoTask {
@Autowired