diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java index 481a4ac9d..a15882e65 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/MaintenanceOrderController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.common.security.service.PjcloudUser; import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.integrated.entity.MaintenanceOrderEntity; import com.bsd.pjcloud.integrated.service.MaintenanceOrderService; @@ -132,9 +133,12 @@ public class MaintenanceOrderController { @SysLog("App端-维修申请新增") @PreAuthorize("@pms.hasPermission('integrated_maintenanceOrder_add')") public R appApply(@RequestBody MaintenanceOrderAppCreateDTO dto) { - Long userId = SecurityUtils.getUser().getId(); + PjcloudUser user = SecurityUtils.getUser(); + Long userId = user.getId(); + Long deptId = user.getDeptId(); MaintenanceOrderEntity bean = BeanUtils.toBean(dto, MaintenanceOrderEntity.class); bean.setUserId(userId); + bean.setDeptId(deptId); return R.ok(maintenanceOrderService.save(bean)); } diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/dto/MaintenanceOrderAppCreateDTO.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/dto/MaintenanceOrderAppCreateDTO.java new file mode 100644 index 000000000..841dd6721 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/dto/MaintenanceOrderAppCreateDTO.java @@ -0,0 +1,64 @@ +package com.bsd.pjcloud.integrated.dto; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@Data +public class MaintenanceOrderAppCreateDTO { + /** + * id + */ + @Schema(description="id") + private Long id; + + /** + * 设备名称 + */ + @Schema(description="设备名称") + private String title; + + /** + * 图片 + */ + @Schema(description="图片") + private String picUrl; + + + /** + * 描述 + */ + @Schema(description="描述") + private String description; + + /** + * 发现日期 + */ + @Schema(description="发现日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate dateFound; + + + /** + * 发现地点 + */ + @Schema(description="设备位置") + private String location; + + /** + * 工单紧急层度'high', 'medium', 'low' + */ + @Schema(description="工单紧急层度'high', 'medium', 'low'") + private String urgency; + + + /** + * 维修类型 + */ + @Schema(description="维修类型") + private Long maintainType; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MaintenanceOrderEntity.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MaintenanceOrderEntity.java index ad159bd5e..891505653 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MaintenanceOrderEntity.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/MaintenanceOrderEntity.java @@ -6,6 +6,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import com.bsd.pjcloud.common.core.util.TenantTable; + +import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -63,7 +65,7 @@ public class MaintenanceOrderEntity extends Model { * 发现日期 */ @Schema(description="发现日期") - private LocalDateTime dateFound; + private LocalDate dateFound; /** * 部门id