Browse Source

#打卡巡检

zhongwei
yang_shj 3 days ago
parent
commit
b7e492c436
  1. 11
      hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/ClockInEntity.java
  2. 3
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/ClockInServiceImpl.java

11
hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/ClockInEntity.java

@ -27,9 +27,11 @@ public class ClockInEntity extends TenantEntity {
@ApiModelProperty(value = "巡检任务ID") @ApiModelProperty(value = "巡检任务ID")
private Long taskId; private Long taskId;
@ApiModelProperty(value = "巡检对象Id") @ApiModelProperty(value = "巡检对象Id")
private Long objectId; private Long objectId;
@ApiModelProperty(value = "计划打卡开始时间") @ApiModelProperty(value = "计划打卡开始时间")
@DateTimeFormat( @DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss" pattern = "yyyy-MM-dd HH:mm:ss"
@ -39,6 +41,8 @@ public class ClockInEntity extends TenantEntity {
) )
private LocalDateTime planStartTime; private LocalDateTime planStartTime;
@ApiModelProperty(value = "计划打卡结束时间") @ApiModelProperty(value = "计划打卡结束时间")
@DateTimeFormat( @DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss" pattern = "yyyy-MM-dd HH:mm:ss"
@ -48,9 +52,13 @@ public class ClockInEntity extends TenantEntity {
) )
private LocalDateTime planEndTime; private LocalDateTime planEndTime;
@ApiModelProperty(value = "打卡人") @ApiModelProperty(value = "打卡人")
private Long clockPerson; private Long clockPerson;
@ApiModelProperty(value = "打卡时间") @ApiModelProperty(value = "打卡时间")
@DateTimeFormat( @DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss" pattern = "yyyy-MM-dd HH:mm:ss"
@ -59,4 +67,7 @@ public class ClockInEntity extends TenantEntity {
pattern = "yyyy-MM-dd HH:mm:ss" pattern = "yyyy-MM-dd HH:mm:ss"
) )
private LocalDateTime clockTime; private LocalDateTime clockTime;
} }

3
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/ClockInServiceImpl.java

@ -1,10 +1,8 @@
package com.hnac.hzinfo.inspect.task.service.impl; package com.hnac.hzinfo.inspect.task.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hnac.hzims.common.logs.utils.StringUtils;
import com.hnac.hzinfo.inspect.ai.vo.ClockInRequestDTO; import com.hnac.hzinfo.inspect.ai.vo.ClockInRequestDTO;
import com.hnac.hzinfo.inspect.ai.vo.ClockInResponseDTO; import com.hnac.hzinfo.inspect.ai.vo.ClockInResponseDTO;
import com.hnac.hzinfo.inspect.ai.vo.ClockInStatisticsResponseDTO; import com.hnac.hzinfo.inspect.ai.vo.ClockInStatisticsResponseDTO;
@ -13,7 +11,6 @@ import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity;
import com.hnac.hzinfo.inspect.task.mapper.ClockInMapper; import com.hnac.hzinfo.inspect.task.mapper.ClockInMapper;
import com.hnac.hzinfo.inspect.task.service.IClockInService; import com.hnac.hzinfo.inspect.task.service.IClockInService;
import com.hnac.hzinfo.inspect.task.service.ITaskObjectService; import com.hnac.hzinfo.inspect.task.service.ITaskObjectService;
import com.hnac.hzinfo.inspect.task.wrapper.ClockInWrapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;

Loading…
Cancel
Save