智慧保安后台管理-外网项目备份
钟日健
2022-03-17 55164d29584c2080e4b5846fb7c59ff9ede3bbf3
定时任务查询接口修改
2 files modified
61 ■■■■■ changed files
deploy/deploy.yml 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/quartz/mapper/ScheduledJobMapper.xml 59 ●●●●● patch | view | raw | blame | history
deploy/deploy.yml
@@ -25,7 +25,7 @@
      imagePullSecrets:
        - name: aliyun  #提前在项目下配置访问阿里云的账号密码
      containers:
        - image: registry.cn-hangzhou.aliyuncs.com/arsn/zhbaw:SNAPSHOT-5
        - image: registry.cn-hangzhou.aliyuncs.com/arsn/zhbaw:SNAPSHOT-6
#        - image: $REGISTRY/$DOCKERHUB_NAMESPACE/zhba:SNAPSHOT-$BUILD_NUMBER
          imagePullPolicy: Always
          name: zhbaw
src/main/java/org/springblade/modules/quartz/mapper/ScheduledJobMapper.xml
@@ -27,63 +27,4 @@
        order by id desc
    </select>
    <select id="exportAttendane" resultType="org.springblade.modules.scheduledJob.excel.AttendanceExcel">
        select
        sa.clock_time clockTime,
        bu.real_name realName,
        bd.dept_name deptName,
        if(sa.clock_type=1,'上班','下班') clockType,
        case when sa.scheduledJob_type=1 then '正常'
        when sa.scheduledJob_type=2 then '迟到'
        when sa.scheduledJob_type=3 then '早退'
        else '无效打卡' end as scheduledJobType
         from sys_scheduledJob sa
        left join blade_user bu on bu.id = sa.user_id
        left join blade_dept bd on bd.id = sa.dept_id
        where 1=1
        <if test="scheduledJob.realName!=null and scheduledJob.realName!=''">
            and bu.real_name like concat('%',#{scheduledJob.realName},'%')
        </if>
        <if test="scheduledJob.deptId!=null">
            and sa.dept_id = #{scheduledJob.deptId}
        </if>
        <if test="scheduledJob.userId!=null">
            and sa.user_id = #{scheduledJob.userId}
        </if>
        <if test="scheduledJob.clockType!=null">
            and sa.clock_type = #{scheduledJob.clockType}
        </if>
        <if test="scheduledJob.scheduledJobType!=null">
            and sa.scheduledJob_type = #{scheduledJob.scheduledJobType}
        </if>
        <if test="scheduledJob.beginTime!=null and scheduledJob.beginTime!=''">
            and sa.clock_time&gt;=#{scheduledJob.beginTime}
        </if>
        <if test="scheduledJob.endTime!=null and scheduledJob.endTime!=''">
            and sa.clock_time&lt;=#{scheduledJob.endTime}
        </if>
        order by sa.id desc
    </select>
    <!--查询当前考勤人员当天的考勤信息-->
    <select id="selAttendanceListNow" resultType="org.springblade.modules.scheduledJob.entity.Attendance">
        select * from sys_scheduledJob
            where
        number = #{number}
            and
        to_days(now())=to_days(clock_time)
    </select>
    <!--查询当前时间之前最新的一条数据-->
    <select id="selAttendanceNewNow" resultType="org.springblade.modules.scheduledJob.entity.Attendance">
        select * from sys_scheduledJob
        where
        user_id = #{userId}
        and
        to_days(now())=to_days(clock_time)
        order by clock_time desc
        limit 1
    </select>
</mapper>