From 9accc8967fed45fb1a7b524ff2b682c7960b51df Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Fri, 22 Nov 2024 20:17:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contraller/WorkOrderController.java | 18 +++--- .../business/enums/WorkOrderStatusEnum.java | 4 ++ .../entity/maintenance/MaintenancePlan.java | 58 ++++++++++++++++++ .../maintenance/MaintenancePlanDetail.java | 47 ++++++++++++++ .../entity/maintenance/MaintenanceRepair.java | 19 ------ .../entity/maintenance/MaintenanceTask.java | 61 +++++++++++++++++++ .../maintenance/MaintenanceTaskDetail.java | 55 +++++++++++++++++ .../modules/system/pojo/entity/Dept.java | 6 ++ 8 files changed, 242 insertions(+), 26 deletions(-) delete mode 100644 src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceRepair.java diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java index 3c35d2c..8239e53 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java @@ -70,12 +70,12 @@ public class WorkOrderController extends BladeController { break; case "2": // 客服 -// eq.in(WorkOrder::getCreateDept, Func.toLongList(AuthUtil.getDeptId())); - eq.ne(WorkOrder::getStatus, -1); + // eq.in(WorkOrder::getCreateDept, Func.toLongList(AuthUtil.getDeptId())); + eq.ne(WorkOrder::getStatus, WorkOrderStatusEnum.CUSTOMER_SUBMIT.getValue()); break; case "3": // 维修负责人 - eq.eq(WorkOrder::getMaintenanceTeam, AuthUtil.getDeptId()); + eq.ge(WorkOrder::getStatus, WorkOrderStatusEnum.SERVICEMAN_CONFIRM.getValue()); break; case "4": // 维修人员 @@ -185,8 +185,8 @@ public class WorkOrderController extends BladeController { @ApiOperationSupport(order = 6) public R serviceReject(@RequestBody WorkOrder workOrder) { workOrder = workOrderService.getById(workOrder.getId()); - workOrder.setRepaiRejectReason(workOrder.getRepaiTeamRejectReason()); - workOrder.setStatus(WorkOrderStatusEnum.SERVICE_SUBMIT.getValue()); + workOrder.setRepaiRejectReason(workOrder.getRepaiRejectReason()); + workOrder.setStatus(WorkOrderStatusEnum.CUSTOMER_SUBMIT.getValue()); workOrderService.updateById(workOrder); // todo 审核拒绝 @@ -321,7 +321,12 @@ public class WorkOrderController extends BladeController { workOrderOld.setIsOkSecure(workOrder.getIsOkSecure()); workOrderOld.setIsOkValidity(workOrder.getIsOkValidity()); workOrderOld.setIsOkQuality(workOrder.getIsOkQuality()); - workOrderOld.setStatus(WorkOrderStatusEnum.EVALUATE_FINISH.getValue()); + // 若未产生费用，直接关闭工单 + if (workOrderOld.getDiscountPrice() == null || workOrderOld.getDiscountPrice() == 0) { + workOrderOld.setStatus(WorkOrderStatusEnum.CLOSE.getValue()); + } else { + workOrderOld.setStatus(WorkOrderStatusEnum.EVALUATE_FINISH.getValue()); + } workOrderService.updateById(workOrderOld); // todo 审核通过 @@ -363,7 +368,6 @@ public class WorkOrderController extends BladeController { // todo, 调用流程，审批通过 - return R.success(""); } diff --git a/src/main/java/org/springblade/modules/business/enums/WorkOrderStatusEnum.java b/src/main/java/org/springblade/modules/business/enums/WorkOrderStatusEnum.java index 4b09c4c..adf7c85 100644 --- a/src/main/java/org/springblade/modules/business/enums/WorkOrderStatusEnum.java +++ b/src/main/java/org/springblade/modules/business/enums/WorkOrderStatusEnum.java @@ -52,6 +52,10 @@ public enum WorkOrderStatusEnum { * 工单关闭 */ CLOSE(8), + /** + * 已开发票 + */ + TICKET(9), ; diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlan.java b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlan.java index 3dd8a31..b11858b 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlan.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlan.java @@ -1,10 +1,14 @@ package org.springblade.modules.business.pojo.entity.maintenance; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 维保计划 @@ -16,4 +20,58 @@ import org.springblade.core.mp.base.BaseEntity; @EqualsAndHashCode(callSuper = true) @Schema(description = "维保计划") public class MaintenancePlan extends BaseEntity { + + /** + * 巡检单号 + */ + private String planCode; + + /** + * 单位 + */ + private Long deptId; + + /** + * 项目名称 + */ + private String planName; + + /** + * 项目地址 + */ + private String address; + + /** + * 巡检人 + */ + private Long servicemanId; + + /** + * 巡检说明 + */ + private String planContent; + + /** + * 计划开始时间 + */ + @DateTimeFormat( + pattern = "yyyy-MM-dd" + ) + @JsonFormat( + pattern = "yyyy-MM-dd" + ) + private Date startTime; + + + /** + * 巡检结束日期 + */ + @DateTimeFormat( + pattern = "yyyy-MM-dd" + ) + @JsonFormat( + pattern = "yyyy-MM-dd" + ) + private Date endTime; + } diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlanDetail.java b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlanDetail.java index acc333a..573df7f 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlanDetail.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlanDetail.java @@ -1,10 +1,14 @@ package org.springblade.modules.business.pojo.entity.maintenance; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 维保计划详细 @@ -18,4 +22,47 @@ import org.springblade.core.mp.base.BaseEntity; public class MaintenancePlanDetail extends BaseEntity { private Long planId; + + /** + * 楼层 + */ + private String floorName; + + /** + * 房间 + */ + private Long deptId; + + /** + * 专业名称 + */ + private String majorName; + + /** + * 巡检内容 + */ + private String checkContent; + + /** + * 工艺要求 + */ + private String craft; + + /** + * 巡检周期 1:月， 2：季， 3：半年 + */ + private Integer period; + + /** + * 计划开始时间 + */ + @DateTimeFormat( + pattern = "yyyy-MM-dd" + ) + @JsonFormat( + pattern = "yyyy-MM-dd" + ) + private Date startTime; + + } diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceRepair.java b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceRepair.java deleted file mode 100644 index 39e3b8c..0000000 --- a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceRepair.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.springblade.modules.business.pojo.entity.maintenance; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.mp.base.BaseEntity; - -/** - * 维保维修 - * - * @author liuqingkun - */ -@Data -@TableName("lab_maintenance_repair") -@EqualsAndHashCode(callSuper = true) -@Schema(description = "维保维修") -public class MaintenanceRepair extends BaseEntity { -} diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTask.java b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTask.java index 08a1cfd..193433d 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTask.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTask.java @@ -1,10 +1,14 @@ package org.springblade.modules.business.pojo.entity.maintenance; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 维保任务 @@ -16,4 +20,61 @@ import org.springblade.core.mp.base.BaseEntity; @EqualsAndHashCode(callSuper = true) @Schema(description = "维保任务") public class MaintenanceTask extends BaseEntity { + + /** + * 计划ID + */ + private Long planId; + + /** + * 巡检单号 + */ + private String taskCode; + + /** + * 单位 + */ + private Long deptId; + + /** + * 项目名称 + */ + private String taskName; + + /** + * 项目地址 + */ + private String address; + + /** + * 巡检人 + */ + private Long servicemanId; + + /** + * 巡检说明 + */ + private String taskContent; + + /** + * 计划开始时间 + */ + @DateTimeFormat( + pattern = "yyyy-MM-dd" + ) + @JsonFormat( + pattern = "yyyy-MM-dd" + ) + private Date startTime; + /** + * 预约上门时间 + */ + @DateTimeFormat( + pattern = "yyyy-MM-dd" + ) + @JsonFormat( + pattern = "yyyy-MM-dd" + ) + private Date reservationTime; + } diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTaskDetail.java b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTaskDetail.java index e421b9c..2d41261 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTaskDetail.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTaskDetail.java @@ -18,4 +18,59 @@ import org.springblade.core.mp.base.BaseEntity; public class MaintenanceTaskDetail extends BaseEntity { private Long taskId; + + /** + * 楼层 + */ + private String floorName; + + /** + * 房间 + */ + private Long deptId; + + /** + * 专业名称 + */ + private String majorName; + + /** + * 巡检内容 + */ + private String checkContent; + + /** + * 工艺要求 + */ + private String craft; + + /** + * 巡检周期 1:月， 2：季， 3：半年 + */ + private Integer period; + + /** + * 现场图片地址 + */ + private String picUrl; + + /** + * 签字图片地址 + */ + private String signUrl; + + /** + * 备注 + */ + private String remark; + + /** + * 维修价格 + */ + private Double price; + + /** + * 客户确认是否维修 + */ + private Integer isRepair; } diff --git a/src/main/java/org/springblade/modules/system/pojo/entity/Dept.java b/src/main/java/org/springblade/modules/system/pojo/entity/Dept.java index ccb2b8d..a4eb427 100644 --- a/src/main/java/org/springblade/modules/system/pojo/entity/Dept.java +++ b/src/main/java/org/springblade/modules/system/pojo/entity/Dept.java @@ -120,5 +120,11 @@ public class Dept implements Serializable { @Schema(description = "是否已删除") private Integer isDeleted; + /** + * 部门种类 + * 实验室，房间 + */ + private Integer deptCat; + }