工单处理结果属性类型更改

main
liuyiliang 12 months ago
parent 51dcbaed63
commit 206725842b
  1. 1
      src/main/java/org/energy/modules/auth/utils/TokenUtil.java
  2. 7
      src/main/java/org/energy/modules/smart/controller/WorkOrderController.java
  3. 10
      src/main/java/org/energy/modules/smart/entity/WorkOrder.java

@ -44,6 +44,7 @@ public class TokenUtil {
public final static String HEADER_KEY = "Authorization"; public final static String HEADER_KEY = "Authorization";
public final static String HEADER_PREFIX = "Basic "; public final static String HEADER_PREFIX = "Basic ";
public final static String DEFAULT_AVATAR = "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png"; public final static String DEFAULT_AVATAR = "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png";
public final static String SYSTEM_NOT_DATA = "未找到数据";
/** /**
* 创建认证token * 创建认证token

@ -19,6 +19,7 @@ import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dayu.daf.core.boot.ctrl.DafController; import com.dayu.daf.core.boot.ctrl.DafController;
import com.dayu.daf.core.log.annotation.ApiLog; import com.dayu.daf.core.log.annotation.ApiLog;
import com.dayu.daf.core.log.exception.ServiceException;
import com.dayu.daf.core.mp.support.Condition; import com.dayu.daf.core.mp.support.Condition;
import com.dayu.daf.core.mp.support.Query; import com.dayu.daf.core.mp.support.Query;
import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.api.R;
@ -30,6 +31,7 @@ import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import org.apache.commons.codec.Charsets; import org.apache.commons.codec.Charsets;
import org.energy.modules.auth.utils.TokenUtil;
import org.energy.modules.smart.entity.WorkOrder; import org.energy.modules.smart.entity.WorkOrder;
import org.energy.modules.smart.excel.WorkOrderExcel; import org.energy.modules.smart.excel.WorkOrderExcel;
import org.energy.modules.smart.service.IWorkOrderService; import org.energy.modules.smart.service.IWorkOrderService;
@ -159,7 +161,10 @@ public class WorkOrderController extends DafController {
public R approve(Integer status, String ids) { public R approve(Integer status, String ids) {
List<WorkOrder> list = new ArrayList<>(); List<WorkOrder> list = new ArrayList<>();
for (String id : ids.split(",")) { for (String id : ids.split(",")) {
WorkOrder workOrder = new WorkOrder(); WorkOrder workOrder = workOrderService.getById(id);
if (workOrder == null) {
throw new ServiceException(TokenUtil.SYSTEM_NOT_DATA);
}
workOrder.setId(Long.parseLong(id)); workOrder.setId(Long.parseLong(id));
workOrder.setApprovalStatus(status); workOrder.setApprovalStatus(status);
list.add(workOrder); list.add(workOrder);

@ -1,5 +1,7 @@
package org.energy.modules.smart.entity; package org.energy.modules.smart.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.dayu.daf.core.mp.base.BaseEntity; import com.dayu.daf.core.mp.base.BaseEntity;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
@ -18,7 +20,7 @@ import java.time.LocalDateTime;
* 实体类 * 实体类
* *
* @author Daf * @author Daf
* @since 2024-07-12 * @since 2024-07-@TableField(updateStrategy = FieldStrategy.IGNORED)
*/ */
@Data @Data
@TableName("smt_work_order") @TableName("smt_work_order")
@ -54,6 +56,7 @@ public class WorkOrder extends BaseEntity {
/** /**
* 内容描述 * 内容描述
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "内容描述") @ApiModelProperty(value = "内容描述")
private String description; private String description;
/** /**
@ -75,6 +78,7 @@ public class WorkOrder extends BaseEntity {
/** /**
* 维护作业类型 * 维护作业类型
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "维护作业类型") @ApiModelProperty(value = "维护作业类型")
private String maintenanceTaskType; private String maintenanceTaskType;
/** /**
@ -96,6 +100,7 @@ public class WorkOrder extends BaseEntity {
/** /**
* 处理时间 * 处理时间
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "处理时间") @ApiModelProperty(value = "处理时间")
private LocalDateTime processingTime; private LocalDateTime processingTime;
/** /**
@ -106,17 +111,20 @@ public class WorkOrder extends BaseEntity {
/** /**
* 处理过程描述 * 处理过程描述
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "处理过程描述") @ApiModelProperty(value = "处理过程描述")
private String processDescription; private String processDescription;
/** /**
* 结束时间 * 结束时间
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "结束时间") @ApiModelProperty(value = "结束时间")
private LocalDateTime endTime; private LocalDateTime endTime;
/** /**
* 处理结果 * 处理结果
*/ */
@JsonSerialize(nullsUsing = NullSerializer.class) @JsonSerialize(nullsUsing = NullSerializer.class)
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "处理结果") @ApiModelProperty(value = "处理结果")
private Integer handlingResult; private Integer handlingResult;
/** /**

Loading…
Cancel
Save