Browse Source

fit:值班接口调整

master
pengwei 5 months ago
parent
commit
6bd7e0fd1f
  1. 2
      src/main/java/com/biutag/supervision/job/Job.java
  2. 4
      src/main/java/com/biutag/supervision/mapper/SupRotaMapper.java
  3. 2
      src/main/java/com/biutag/supervision/pojo/entity/SupRota.java
  4. 4
      src/main/java/com/biutag/supervision/pojo/param/SupRotaQueryParam.java

2
src/main/java/com/biutag/supervision/job/Job.java

@ -260,7 +260,7 @@ public class Job {
private final SupRotaMapper supRotaMapper; private final SupRotaMapper supRotaMapper;
//每天一次 00:20:00 //每天一次 00:20:00
//值班人员 //值班人员
@Scheduled(cron = "0 20 00 * * ?") @Scheduled(cron = "0 30 12 * * ?")
public void operator(){ public void operator(){
log.info("operator--------------------"); log.info("operator--------------------");
log.info("值班人员抓取中---------------------"); log.info("值班人员抓取中---------------------");

4
src/main/java/com/biutag/supervision/mapper/SupRotaMapper.java

@ -20,7 +20,7 @@ public interface SupRotaMapper extends BaseMapper<SupRota> {
" from sup_depart a " + " from sup_depart a " +
"LEFT JOIN sup_rota b on a.id = b.dept_code and b.rota_time = #{dateTime} " + "LEFT JOIN sup_rota b on a.id = b.dept_code and b.rota_time = #{dateTime} " +
"where statistics_group_id = #{groupId} ") "where statistics_group_id = #{groupId} ")
List<SupRotaVo> getSubofficeData(Date dateTime,String groupId); List<SupRotaVo> getSubofficeData(String dateTime,String groupId);
@Select("SELECT " + @Select("SELECT " +
"a.id as departId, " + "a.id as departId, " +
@ -33,5 +33,5 @@ public interface SupRotaMapper extends BaseMapper<SupRota> {
" from sup_depart a " + " from sup_depart a " +
"LEFT JOIN sup_rota b on a.id = b.dept_code and b.rota_time = #{dateTime} " + "LEFT JOIN sup_rota b on a.id = b.dept_code and b.rota_time = #{dateTime} " +
"where a.pid =#{departId} ") "where a.pid =#{departId} ")
List<SupRotaVo> getSupRotaList(Date dateTime,String departId); List<SupRotaVo> getSupRotaList(String dateTime,String departId);
} }

2
src/main/java/com/biutag/supervision/pojo/entity/SupRota.java

@ -23,7 +23,7 @@ public class SupRota {
private String idCode; private String idCode;
//值班时间 //值班时间
@TableField("rota_time") @TableField("rota_time")
private Date rotaTime; private String rotaTime;
//单位 //单位
@TableField("dept_name") @TableField("dept_name")
private String deptName; private String deptName;

4
src/main/java/com/biutag/supervision/pojo/param/SupRotaQueryParam.java

@ -12,6 +12,6 @@ import java.util.Date;
public class SupRotaQueryParam { public class SupRotaQueryParam {
private String deptId; private String deptId;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date date; private String date;
} }

Loading…
Cancel
Save