diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java index d334d3e59..31ee8ef7d 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java @@ -86,6 +86,13 @@ public class DeviceInspectTakeController { return ResultVOUtils.success(deviceInspectTaskEntity); } + @PostMapping("/udiwms/inv/device/inspect/take/delectDeviceInspecTake") + public BaseResponse delectDeviceInspecTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) { + + deviceInspectTaskService.delectDeviceInspectTask(deviceInspectTaskEntity); + return ResultVOUtils.success(deviceInspectTaskEntity); + } + diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java index f51a2ad9f..0dec45fe5 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java @@ -11,7 +11,7 @@ import java.util.Date; @Data @TableName(value = "device_inspect_task") -public class DeviceInspectTaskEntity implements Serializable { +public class DeviceInspectTaskEntity{ @TableId(value = "id", type = IdType.AUTO) private Integer id; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java index 28b7e125d..529eb532d 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java @@ -25,6 +25,11 @@ public class DeviceInspectTaskService extends ServiceImpl filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest) { diff --git a/src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml index 21edfe657..6a38c6a8c 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml @@ -35,7 +35,7 @@ AND content like concat('%',#{content},'%') - AND date_format(udpateTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and + AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')