Commit 261d50591f7eb5f3bc9d4dd385baf315de285d40

Authored by 胡翰林
1 parent ca431821

bug修复

... ... @@ -61,7 +61,7 @@ public class TkRepairOrderController extends BaseController {
61 61 }
62 62
63 63 if (dto.getStatus() == null) {
64   - dto.setStatus(RepairOrderStatusEnum.DRAFT);
  64 + dto.setStatus(RepairOrderStatusEnum.SCHEDULING);
65 65 }
66 66
67 67 TkRepairOrderDTO deviceDTO = tkRepairOrderService.save(dto);
... ...
... ... @@ -23,4 +23,7 @@ public class TkPreserveDetailStatusDTO extends TenantDTO {
23 23
24 24 @ApiModelProperty(value = "设备信息")
25 25 private TkDeviceAccountDTO deviceInfo;
  26 +
  27 + @ApiModelProperty(value = "明细编码")
  28 + private String detailCode;
26 29 }
... ...
1 1 package org.thingsboard.server.common.data.yunteng.enums;
2 2
3 3 public enum RepairOrderStatusEnum {
4   - //DRAFT
5   - DRAFT,
6 4 //排期中
7 5 SCHEDULING,
8 6 //维修完成
... ...
... ... @@ -8,6 +8,7 @@
8 8 <result property="preserveDetailId" column="preserve_detail_id"/>
9 9 <result property="status" column="status" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
10 10 <result property="preserveDetail" column="preserve_detail"/>
  11 + <result property="detailCode" column="detail_code"/>
11 12 <association property="deviceInfo" javaType="org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO">
12 13 <id property="id" column="device_id"/>
13 14 <result property="name" column="daName"/>
... ... @@ -35,7 +36,7 @@
35 36 , pds.preserve_record_id
36 37 , pds.preserve_detail_id
37 38 , pds.status
38   - , pd.preserve_detail,
  39 + , pd.preserve_detail,pd.detail_code,
39 40 da.name as daName,da.code as daCode,da.category_id,da.status as daStatus,da.director_id,da.is_online,
40 41 da.brand,da.model_num,da.specifications,da.manufacturer,da.buy_date,da.price,da.product_date,
41 42 da.receive_date,da.registe_date,da.supplier_id,da.device_img,da.description as daDescription
... ...