diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceDataMapper.xml index 20ddb9c1..4ab7ee6c 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceDataMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceDataMapper.xml @@ -61,9 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pma.latitude = #{latitude} and pma.att_date = #{attDate} and pma.att_img = #{attImg} - and pma.work_area_id = #{isDel} + and pma.is_del = #{isDel} and pma.state = #{state} - and pma.is_del = #{workAreaId} + and pma.work_area_id = #{workAreaId} and psu.user_name like concat('%', #{userName}, '%') and psu.user_phone like concat('%', #{userPhone}, '%') and date(pma.att_date) >= date(#{startDate}) @@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) psu ON pma.user_id = psu.user_id left join sys_dict_data dic1 on psu.`craft_type`=dic1.`dict_value` and dic1.`dict_type`='pro_craft_type' left join sys_dict_data dic2 on psu.`craft_post`=dic2.`dict_value` and dic2.`dict_type`='pro_craft_post' - WHERE pma.work_area_id = 0 AND pma.in_out = 'in' AND pma.is_del = #{workAreaId} and pma.project_id = #{projectId} + WHERE pma.is_del = 0 AND pma.in_out = 'in' AND pma.work_area_id = #{workAreaId} and pma.project_id = #{projectId} AND DATE(pma.att_date) = CURDATE() ) ranked_data WHERE rn = 1 @@ -130,8 +130,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{attDate}, #{attImg}, #{attDevice}, - #{isDel}, #{workAreaId}, + #{isDel}, #{remark}, #{state}, #{createBy},