diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionResultController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionResultController.java index 8fbbf29..ee761cd 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionResultController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionResultController.java @@ -28,6 +28,7 @@ import com.dayu.daf.core.mp.support.Query; import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.utils.Func; import org.energy.modules.inspection.entity.InspectionTasks; +import org.energy.modules.leger.entity.InventoryDocument; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestParam; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,6 +37,8 @@ import org.energy.modules.inspection.vo.InspectionResultVO; import org.energy.modules.inspection.service.IInspectionResultService; import com.dayu.daf.core.boot.ctrl.DafController; +import java.util.List; + /** * 巡检结果 控制器 * @@ -124,7 +127,6 @@ public class InspectionResultController extends DafController { return R.status(inspectionResultService.saveOrUpdate(inspectionResult)); } - /** * 删除 巡检结果 */ @@ -135,5 +137,15 @@ public class InspectionResultController extends DafController { return R.status(inspectionResultService.deleteLogic(Func.toLongList(ids))); } + /** + * 列表 技术参数一览 + */ + @GetMapping("/getList") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "列表", notes = "传入inventoryDocument") + public R> getList(InspectionResult inspectionResult) { + List list = inspectionResultService.list(Condition.getQueryWrapper(inspectionResult)); + return R.data(list); + } } diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java index 12f5bc8..b632682 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java @@ -190,7 +190,7 @@ public class InspectionTasksController extends DafController { @ApiOperationSupport(order = 8) @ApiOperation(value = "更新", notes = "传入ids") public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return this.approve("1",ids); + return this.approve("1",ids, ""); } /** @@ -199,19 +199,20 @@ public class InspectionTasksController extends DafController { @PostMapping("/stop") @ApiOperationSupport(order = 9) @ApiOperation(value = "更新", notes = "传入ids") - public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return this.approve("2",ids); + public R stop(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @RequestParam String reason) { + return this.approve("2",ids, reason); } /** * 启动OR停止 巡检任务 */ - public R approve(String status, String ids) { + public R approve(String status, String ids, String reason) { List list = new ArrayList<>(); for (String id : ids.split(",")) { InspectionTasks inspectionTasks = new InspectionTasks(); inspectionTasks.setId(Long.parseLong(id)); inspectionTasks.setTaskStatus(Long.parseLong(status)); + inspectionTasks.setCancelReason(reason); list.add(inspectionTasks); } return R.status(inspectionTasksService.updateBatchById(list)); diff --git a/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java b/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java index c8e9196..3803776 100644 --- a/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java +++ b/src/main/java/org/energy/modules/inspection/entity/InspectionResult.java @@ -3,6 +3,7 @@ package org.energy.modules.inspection.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.dayu.daf.core.mp.base.BaseEntity; import java.io.Serializable; +import java.time.LocalDateTime; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -45,12 +46,12 @@ public class InspectionResult extends BaseEntity { * 任务执行开始时间 */ @ApiModelProperty(value = "任务执行开始时间") - private String executeStartDate; + private LocalDateTime executeStartDate; /** * 任务执行结束时间 */ @ApiModelProperty(value = "任务执行结束时间") - private String executeEndDate; + private LocalDateTime executeEndDate; /** * 巡检结果 */ diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionTasksExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionTasksExcel.java index 9b6896a..d6de300 100644 --- a/src/main/java/org/energy/modules/inspection/excel/InspectionTasksExcel.java +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionTasksExcel.java @@ -46,11 +46,11 @@ public class InspectionTasksExcel implements Serializable { @ExcelProperty(value = "场站") private String stationExt; - @ColumnWidth(15) + @ColumnWidth(20) @ExcelProperty(value = "任务生成日期") private String taskStartDate; - @ColumnWidth(15) + @ColumnWidth(20) @ExcelProperty(value = "任务完成日期") private String taskEndDate; diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml index ab1de66..5368366 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml @@ -43,7 +43,7 @@