Commit e6aa3b6b authored by daijunxiong's avatar daijunxiong

定时任务考勤汇总新增关联

parent 3f78af01
...@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao; ...@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
import com.mortals.framework.dao.ICRUDDao; import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity;
import java.util.List;
/** /**
* 考勤打卡记录信息Dao * 考勤打卡记录信息Dao
* 考勤打卡记录信息 DAO接口 * 考勤打卡记录信息 DAO接口
...@@ -14,4 +13,9 @@ import java.util.List; ...@@ -14,4 +13,9 @@ import java.util.List;
public interface AttendanceRecordDao extends ICRUDDao<AttendanceRecordEntity,Long>{ public interface AttendanceRecordDao extends ICRUDDao<AttendanceRecordEntity,Long>{
/**
* 获取打卡记录id
* */
AttendanceRecordEntity getRecordId(Long id);
} }
...@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao; ...@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
import com.mortals.framework.dao.ICRUDDao; import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity;
import java.util.List;
/** /**
* 考勤打卡记录详细信息Dao * 考勤打卡记录详细信息Dao
* 考勤打卡记录详细信息 DAO接口 * 考勤打卡记录详细信息 DAO接口
...@@ -14,4 +13,11 @@ import java.util.List; ...@@ -14,4 +13,11 @@ import java.util.List;
public interface AttendanceRecordDetailDao extends ICRUDDao<AttendanceRecordDetailEntity,Long>{ public interface AttendanceRecordDetailDao extends ICRUDDao<AttendanceRecordDetailEntity,Long>{
/**
* 统计上班迟到
* */
int goWorkCount(Long id);
} }
...@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao; ...@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
import com.mortals.framework.dao.ICRUDDao; import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity;
import java.util.List;
/** /**
* 考勤打卡记录异常信息Dao * 考勤打卡记录异常信息Dao
* 考勤打卡记录异常信息 DAO接口 * 考勤打卡记录异常信息 DAO接口
...@@ -14,4 +13,10 @@ import java.util.List; ...@@ -14,4 +13,10 @@ import java.util.List;
public interface AttendanceRecordErrorDao extends ICRUDDao<AttendanceRecordErrorEntity,Long>{ public interface AttendanceRecordErrorDao extends ICRUDDao<AttendanceRecordErrorEntity,Long>{
/**
* 统计异常打卡
* */
int errorAttendance(Long id);
} }
package com.mortals.xhx.module.attendance.dao.ibatis; package com.mortals.xhx.module.attendance.dao.ibatis;
import org.springframework.stereotype.Repository; import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.attendance.dao.AttendanceRecordDao; import com.mortals.xhx.module.attendance.dao.AttendanceRecordDao;
import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordEntity;
import java.util.Date; import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/** /**
* 考勤打卡记录信息DaoImpl DAO接口 * 考勤打卡记录信息DaoImpl DAO接口
* *
...@@ -17,5 +15,8 @@ import java.util.List; ...@@ -17,5 +15,8 @@ import java.util.List;
public class AttendanceRecordDaoImpl extends BaseCRUDDaoMybatis<AttendanceRecordEntity,Long> implements AttendanceRecordDao { public class AttendanceRecordDaoImpl extends BaseCRUDDaoMybatis<AttendanceRecordEntity,Long> implements AttendanceRecordDao {
@Override
public AttendanceRecordEntity getRecordId(Long id) {
return getSqlSession().selectOne(getSqlId("getRecordId"),id);
}
} }
package com.mortals.xhx.module.attendance.dao.ibatis; package com.mortals.xhx.module.attendance.dao.ibatis;
import org.springframework.stereotype.Repository; import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.attendance.dao.AttendanceRecordDetailDao; import com.mortals.xhx.module.attendance.dao.AttendanceRecordDetailDao;
import com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity;
import java.util.Date; import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/** /**
* 考勤打卡记录详细信息DaoImpl DAO接口 * 考勤打卡记录详细信息DaoImpl DAO接口
* *
...@@ -17,5 +15,8 @@ import java.util.List; ...@@ -17,5 +15,8 @@ import java.util.List;
public class AttendanceRecordDetailDaoImpl extends BaseCRUDDaoMybatis<AttendanceRecordDetailEntity,Long> implements AttendanceRecordDetailDao { public class AttendanceRecordDetailDaoImpl extends BaseCRUDDaoMybatis<AttendanceRecordDetailEntity,Long> implements AttendanceRecordDetailDao {
@Override
public int goWorkCount(Long id) {
return getSqlSession().selectOne(getSqlId("goWorkCount"),id);
}
} }
package com.mortals.xhx.module.attendance.dao.ibatis; package com.mortals.xhx.module.attendance.dao.ibatis;
import org.springframework.stereotype.Repository; import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.attendance.dao.AttendanceRecordErrorDao; import com.mortals.xhx.module.attendance.dao.AttendanceRecordErrorDao;
import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity; import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity;
import java.util.Date; import org.springframework.stereotype.Repository;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/** /**
* 考勤打卡记录异常信息DaoImpl DAO接口 * 考勤打卡记录异常信息DaoImpl DAO接口
* *
...@@ -17,5 +15,8 @@ import java.util.List; ...@@ -17,5 +15,8 @@ import java.util.List;
public class AttendanceRecordErrorDaoImpl extends BaseCRUDDaoMybatis<AttendanceRecordErrorEntity,Long> implements AttendanceRecordErrorDao { public class AttendanceRecordErrorDaoImpl extends BaseCRUDDaoMybatis<AttendanceRecordErrorEntity,Long> implements AttendanceRecordErrorDao {
@Override
public int errorAttendance(Long id) {
return getSqlSession().selectOne(getSqlId("errorAttendance"),id);
}
} }
...@@ -822,4 +822,7 @@ ...@@ -822,4 +822,7 @@
</trim> </trim>
</if> </if>
</sql> </sql>
<select id="goWorkCount" resultType="integer">
select count(1) count from mortals_xhx_attendance_record_detail where staffid =# {id} and goWorkResult = 4
</select>
</mapper> </mapper>
...@@ -1278,4 +1278,7 @@ ...@@ -1278,4 +1278,7 @@
</trim> </trim>
</if> </if>
</sql> </sql>
<select id="errorAttendance" resultType="integer">
select count(1) count from mortals_xhx_attendance_record_error where staffId =#{id} group by errorStatus
</select>
</mapper> </mapper>
\ No newline at end of file
...@@ -1018,4 +1018,7 @@ ...@@ -1018,4 +1018,7 @@
</trim> </trim>
</if> </if>
</sql> </sql>
<select id="getRecordId" resultType="com.mortals.xhx.module.attendance.model.AttendanceRecordEntity">
select id from mortals_xhx_attendance_record where staffId =#{id}
</select>
</mapper> </mapper>
...@@ -283,6 +283,17 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRe ...@@ -283,6 +283,17 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRe
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '8', '例假', 1, 4, 0, 'leaveType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '8', '例假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '9', '哺乳假', 1, 4, 0, 'leaveType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '9', '哺乳假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '10', '丧假', 1, 4, 0, 'leaveType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '10', '丧假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '11', '回单位', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '12', '因公请假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '13', '外出勘验', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '14', '值班补班', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '15', '体检', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '16', '隔离', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '17', '因公外出', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '18', '公休', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '19', '育儿假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '20', '调回单位', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRecord', 'leaveType', '21', '探亲假', 1, 4, 0, 'leaveType', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 员工假期余额信息菜单 SQL -- 员工假期余额信息菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -558,4 +569,4 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio ...@@ -558,4 +569,4 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '20', '调回单位', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '20', '调回单位', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '21', '探亲假', 1, 4, 0, 'type', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacationRecord', 'type', '21', '探亲假', 1, 4, 0, 'type', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '1', '增加', 1, 4, 0, 'subAddType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '1', '增加', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '增减类型', 'AttendanceVacationRecord', 'subAddType', '2', '扣除', 1, 4, 0, 'subAddType', NULL, NULL, NULL);
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment