Merge remote-tracking branch 'origin/dev' into dev2.0

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);
+    }
+
 
 
 

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;
 

src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java

@@ -25,6 +25,11 @@ public class DeviceInspectTaskService extends ServiceImpl<DeviceInspectTaskMappe
        return true;
     }
 
+    public Boolean delectDeviceInspectTask(DeviceInspectTaskEntity deviceInspectTaskEntity){
+        deviceInspectTaskMapper.deleteById(deviceInspectTaskEntity);
+        return true;
+    }
+
 
 
     public List<DeviceInspectTakeResponse> filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest) {

src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml

@@ -35,7 +35,7 @@
         AND content like concat('%',#{content},'%')
       </if>
       <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-        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')
       </if>