|
|
|
|
@ -24,6 +24,7 @@ import org.springblade.modules.business.service.IMaintenanceTaskService; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
|
import java.time.LocalDate; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
@ -99,6 +100,9 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
public R taskPage(MaintenanceTask task, Query query) { |
|
|
|
|
LambdaQueryWrapper<MaintenanceTask> wrapper = Wrappers.lambdaQuery(MaintenanceTask.class); |
|
|
|
|
wrapper.eq(MaintenanceTask::getIsDeleted, CommonConstant.FALSE_STR); |
|
|
|
|
if (Func.isNotEmpty(task.getPlanId())) { |
|
|
|
|
wrapper.eq(MaintenanceTask::getPlanId, task.getPlanId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
IPage<MaintenanceTask> pages = taskService.page(Condition.getPage(query), wrapper); |
|
|
|
|
return R.data(pages); |
|
|
|
|
@ -107,11 +111,8 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
@GetMapping("/task-detail") |
|
|
|
|
@Operation(summary = "任务明细", description = "任务明细") |
|
|
|
|
public R taskDetail(@RequestParam Long id) { |
|
|
|
|
MaintenanceTask task = taskService.getById(id); |
|
|
|
|
List<MaintenanceTaskDetail> detailList = taskDetailService.list(Wrappers.lambdaQuery(MaintenanceTaskDetail.class).eq(MaintenanceTaskDetail::getTaskId, id)); |
|
|
|
|
|
|
|
|
|
MaintenanceTaskDto taskDto = new MaintenanceTaskDto(task, detailList); |
|
|
|
|
return R.data(taskDto); |
|
|
|
|
MaintenanceTask task = taskService.taskDetail(id); |
|
|
|
|
return R.data(task); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@PostMapping("/task-supervisor-confirm") |
|
|
|
|
@ -129,6 +130,7 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
@Operation(summary = "维修人员确认接收", description = "维修人员确认接收") |
|
|
|
|
public R taskServicemanReceive(@RequestBody MaintenanceTask task) { |
|
|
|
|
MaintenanceTask taskOld = taskService.getById(task.getId()); |
|
|
|
|
taskOld.setStartTime(DateUtil.now()); |
|
|
|
|
taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SERVICEMAN_CONFIRM.getValue()); |
|
|
|
|
taskService.updateById(taskOld); |
|
|
|
|
|
|
|
|
|
@ -145,11 +147,19 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
return R.success(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@GetMapping("/task-serviceman-update-detail") |
|
|
|
|
@PostMapping("/task-serviceman-update-detail") |
|
|
|
|
@Operation(summary = "维修人员更新维修明细", description = "维修人员更新维修明细") |
|
|
|
|
public R taskServicemanUpdateDetail(@RequestBody List<MaintenanceTaskDetail> taskDetailList) { |
|
|
|
|
// 获取详细中的异常项目数量
|
|
|
|
|
long count = taskDetailList.stream().filter(e -> CommonConstant.TRUE_INT.equals(e.getStatus())).count(); |
|
|
|
|
if (count > 0) { |
|
|
|
|
// 若异常数量大于0, 更新巡检的维修状态
|
|
|
|
|
MaintenanceTask taskOld = taskService.getById(taskDetailList.get(0).getTaskId()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_CREATE.getValue()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 只更新设备状态
|
|
|
|
|
taskDetailService.saveBatch(taskDetailList); |
|
|
|
|
taskDetailService.saveOrUpdateBatch(taskDetailList); |
|
|
|
|
|
|
|
|
|
return R.success(); |
|
|
|
|
} |
|
|
|
|
@ -193,6 +203,29 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
/*---------- 维修任务结束 ----------*/ |
|
|
|
|
|
|
|
|
|
/*---------- 维修方案开始 ----------*/ |
|
|
|
|
@GetMapping("/repair-page") |
|
|
|
|
@Operation(summary = "维保维修列表", description = "维保维修列表") |
|
|
|
|
public R repairPage(MaintenanceTask task, Query query) { |
|
|
|
|
LambdaQueryWrapper<MaintenanceTask> wrapper = Wrappers.lambdaQuery(MaintenanceTask.class); |
|
|
|
|
wrapper.eq(MaintenanceTask::getIsDeleted, CommonConstant.FALSE_STR); |
|
|
|
|
wrapper.gt(MaintenanceTask::getRepairStatus, MaintenanceStatusEnum.REPAIR_NO.getValue()); |
|
|
|
|
if (Func.isNotEmpty(task.getPlanId())) { |
|
|
|
|
wrapper.eq(MaintenanceTask::getPlanId, task.getPlanId()); |
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(task.getDeptName())) { |
|
|
|
|
wrapper.eq(MaintenanceTask::getDeptName, task.getDeptName()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
IPage<MaintenanceTask> pages = taskService.page(Condition.getPage(query), wrapper); |
|
|
|
|
return R.data(pages); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@GetMapping("/repair-detail") |
|
|
|
|
@Operation(summary = "任务明细", description = "任务明细") |
|
|
|
|
public R repairDetail(@RequestParam Long id) { |
|
|
|
|
MaintenanceTask task = taskService.repairDetail(id); |
|
|
|
|
return R.data(task); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@PostMapping("/repair-solution-save") |
|
|
|
|
@Operation(summary = "维修人员保存维修方案", description = "维修人员保存维修方案") |
|
|
|
|
@ -203,7 +236,7 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
taskService.updateById(taskOld); |
|
|
|
|
|
|
|
|
|
List<MaintenanceTaskDetail> detailList = taskDto.getDetailList(); |
|
|
|
|
taskDetailService.saveBatch(detailList); |
|
|
|
|
taskDetailService.saveOrUpdateBatch(detailList); |
|
|
|
|
|
|
|
|
|
return R.success(); |
|
|
|
|
} |
|
|
|
|
@ -222,7 +255,7 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
@Operation(summary = "主管审核维修方案", description = "主管审核维修方案") |
|
|
|
|
public R repairSupervisorConfirm(@RequestBody MaintenanceTask task) { |
|
|
|
|
MaintenanceTask taskOld = taskService.getById(task.getId()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_CUSTOMER_CONFIRM.getValue()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SUPERVISOR_CONFIRM.getValue()); |
|
|
|
|
taskService.updateById(taskOld); |
|
|
|
|
|
|
|
|
|
return R.success(); |
|
|
|
|
@ -232,6 +265,11 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
@Operation(summary = "主管审核维修方案", description = "主管审核维修方案") |
|
|
|
|
public R repairSupervisorRefuse(@RequestBody MaintenanceTask task) { |
|
|
|
|
MaintenanceTask taskOld = taskService.getById(task.getId()); |
|
|
|
|
taskOld.setApprovePoint("主管审核维修方案"); |
|
|
|
|
taskOld.setApprovePerson(task.getApprovePerson()); |
|
|
|
|
taskOld.setApproveResult(CommonConstant.FALSE_INT); |
|
|
|
|
taskOld.setApproveTime(DateUtil.now()); |
|
|
|
|
taskOld.setApproveRemark(task.getApproveRemark()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_CREATE.getValue()); |
|
|
|
|
taskService.updateById(taskOld); |
|
|
|
|
|
|
|
|
|
@ -243,26 +281,27 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
public R repairCustomerConfirmDetail(@RequestBody MaintenanceTaskDto taskDto) { |
|
|
|
|
MaintenanceTask task = taskDto.getTask(); |
|
|
|
|
MaintenanceTask taskOld = taskService.getById(task.getId()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_REPAIRING.getValue()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_CUSTOMER_CONFIRM.getValue()); |
|
|
|
|
taskService.updateById(taskOld); |
|
|
|
|
|
|
|
|
|
List<MaintenanceTaskDetail> detailList = taskDto.getDetailList(); |
|
|
|
|
taskDetailService.saveBatch(detailList); |
|
|
|
|
taskDetailService.updateBatchById(detailList); |
|
|
|
|
|
|
|
|
|
return R.success(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@PostMapping("/repair-solution-customer-refuse") |
|
|
|
|
@Operation(summary = "客户驳回维修明细", description = "客户驳回维修明细") |
|
|
|
|
public R repairCustomerRefuseDetail(@RequestBody MaintenanceTaskDto taskDto) { |
|
|
|
|
MaintenanceTask task = taskDto.getTask(); |
|
|
|
|
public R repairCustomerRefuseDetail(@RequestBody MaintenanceTask task) { |
|
|
|
|
MaintenanceTask taskOld = taskService.getById(task.getId()); |
|
|
|
|
taskOld.setApprovePoint("客户审核维修方案"); |
|
|
|
|
taskOld.setApprovePerson(task.getApprovePerson()); |
|
|
|
|
taskOld.setApproveResult(CommonConstant.FALSE_INT); |
|
|
|
|
taskOld.setApproveTime(DateUtil.now()); |
|
|
|
|
taskOld.setApproveRemark(task.getApproveRemark()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_CREATE.getValue()); |
|
|
|
|
taskService.updateById(taskOld); |
|
|
|
|
|
|
|
|
|
List<MaintenanceTaskDetail> detailList = taskDto.getDetailList(); |
|
|
|
|
taskDetailService.saveBatch(detailList); |
|
|
|
|
|
|
|
|
|
return R.success(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -290,7 +329,7 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
@Operation(summary = "客户确认维修完成", description = "客户确认维修完成") |
|
|
|
|
public R repairCustomerRefuseFinish(@RequestBody MaintenanceTask task) { |
|
|
|
|
MaintenanceTask taskOld = taskService.getById(task.getId()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_REPAIRING.getValue()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_CUSTOMER_CONFIRM.getValue()); |
|
|
|
|
taskService.updateById(taskOld); |
|
|
|
|
|
|
|
|
|
return R.success(); |
|
|
|
|
@ -308,10 +347,15 @@ public class MaintenanceController extends BladeController { |
|
|
|
|
|
|
|
|
|
@PostMapping("/repair-service-confirm-invoice") |
|
|
|
|
@Operation(summary = "客服确认开发票", description = "客服确认开发票") |
|
|
|
|
public R repairServiceConfirmInvoice(@RequestBody MaintenanceTask task) { |
|
|
|
|
MaintenanceTask taskOld = taskService.getById(task.getId()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_INVOICE.getValue()); |
|
|
|
|
taskService.updateById(taskOld); |
|
|
|
|
public R repairServiceConfirmInvoice(@RequestBody List<MaintenanceTask> taskList) { |
|
|
|
|
List<MaintenanceTask> taskOldList = new ArrayList<>(); |
|
|
|
|
for (MaintenanceTask task : taskList) { |
|
|
|
|
MaintenanceTask taskOld = taskService.getById(task.getId()); |
|
|
|
|
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_INVOICE.getValue()); |
|
|
|
|
taskOldList.add(taskOld); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
taskService.updateBatchById(taskOldList); |
|
|
|
|
|
|
|
|
|
return R.success(); |
|
|
|
|
} |
|
|
|
|
|