维修报修关联设备台账

@@ -70,6 +70,7 @@ COMMENT ON COLUMN "public"."qg_repair_order"."creator" IS '创建用户';
 
 
 CREATE TABLE "public"."qg_repair_record" (
 CREATE TABLE "public"."qg_repair_record" (
     "id" varchar(36)  NOT NULL,
     "id" varchar(36)  NOT NULL,
+    "code" varchar(50),
     "order_id" varchar(36),
     "order_id" varchar(36),
     "repair_date" timestamp(6),
     "repair_date" timestamp(6),
     "repair_by" varchar(36),
     "repair_by" varchar(36),

@@ -927,6 +927,7 @@ CREATE TABLE IF NOT EXISTS qg_repair_order (
 
 
 CREATE TABLE IF NOT EXISTS qg_repair_record (
 CREATE TABLE IF NOT EXISTS qg_repair_record (
      "id" varchar(36)  NOT NULL,
      "id" varchar(36)  NOT NULL,
+     "code" varchar(50),
      "order_id" varchar(36),
      "order_id" varchar(36),
      "repair_date" timestamp(6),
      "repair_date" timestamp(6),
      "repair_by" varchar(36),
      "repair_by" varchar(36),

@@ -53,13 +53,13 @@ public class TkRepairOrderController extends BaseController {
 
 
         if (StringUtils.isBlank(dto.getId())) {
         if (StringUtils.isBlank(dto.getId())) {
             TkRepairOrderDTO roInfo = tkRepairOrderService.loadByDeviceId(dto.getDeviceId());
             TkRepairOrderDTO roInfo = tkRepairOrderService.loadByDeviceId(dto.getDeviceId());
-            if (roInfo != null && RepairOrderStatusEnum.valueOf(roInfo.getStatus()) == RepairOrderStatusEnum.SCHEDULING) {
+            if (roInfo != null && roInfo.getStatus().name().equals(RepairOrderStatusEnum.SCHEDULING.name())) {
                 throw new TkDataValidationException("该设备已报修！");
                 throw new TkDataValidationException("该设备已报修！");
             }
             }
         }
         }
 
 
-        if (StringUtils.isBlank(dto.getStatus())) {
-            dto.setStatus(RepairOrderStatusEnum.DRAFT.name());
+        if (dto.getStatus() == null) {
+            dto.setStatus(RepairOrderStatusEnum.DRAFT);
         }
         }
 
 
         TkRepairOrderDTO deviceDTO = tkRepairOrderService.save(dto);
         TkRepairOrderDTO deviceDTO = tkRepairOrderService.save(dto);
@@ -103,7 +103,7 @@ public class TkRepairOrderController extends BaseController {
             throw new TkDataValidationException("工单不存在！");
             throw new TkDataValidationException("工单不存在！");
         }
         }
 
 
-        tkRepairOrderService.updateStatus(dto.getId(), dto.getStatus());
+        tkRepairOrderService.updateStatus(dto.getId(), dto.getStatus().name());
         return ResponseEntity.ok(orderInfo);
         return ResponseEntity.ok(orderInfo);
     }
     }
 }
 }

@@ -19,6 +19,8 @@ import org.thingsboard.server.dao.yunteng.service.TkRepairOrderService;
 import org.thingsboard.server.dao.yunteng.service.TkRepairRecordService;
 import org.thingsboard.server.dao.yunteng.service.TkRepairRecordService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 
+import java.util.Map;
+
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE_SIZE;
 
 
@@ -74,10 +76,10 @@ public class TkRepairRecordController extends BaseController {
     public TkPageData<TkRepairRecordDTO> page(
     public TkPageData<TkRepairRecordDTO> page(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(PAGE) int page,
-            @RequestBody TkRepairRecordDTO params)
+            @RequestBody Map<String, Object> params)
             throws ThingsboardException {
             throws ThingsboardException {
-        params.setPage(page);
-        params.setPageSize(pageSize);
-        return tkRepairRecordService.page(getCurrentUser().getCurrentTenantId(), params);
+        params.put(PAGE, page);
+        params.put(PAGE_SIZE, pageSize);
+        return tkRepairRecordService.page(params);
     }
     }
 }
 }

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum;
 
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
@@ -30,8 +31,8 @@ public class TkRepairOrderDTO extends TenantDTO {
     @ApiModelProperty(value = "报修人")
     @ApiModelProperty(value = "报修人")
     private String reportByName;
     private String reportByName;
 
 
-    @ApiModelProperty(value = "状态(RepairOrderStatusEnum) SCHEDULING排期中 REPAIRFINISH维修完成 ACCEPTANCEPASSED验收通过")
-    private String status;
+    @ApiModelProperty(value = "状态(DRAFT草稿 SCHEDULING排期中 REPAIRFINISH维修完成 ACCEPTANCEPASSED验收通过)")
+    private RepairOrderStatusEnum status;
 
 
     @ApiModelProperty(value = "是否紧急")
     @ApiModelProperty(value = "是否紧急")
     private Boolean emergency;
     private Boolean emergency;
@@ -43,7 +44,7 @@ public class TkRepairOrderDTO extends TenantDTO {
     private String description;
     private String description;
 
 
     @ApiModelProperty(value = "关联设备")
     @ApiModelProperty(value = "关联设备")
-    private DeviceDTO deviceInfo;
+    private TkDeviceAccountDTO deviceInfo;
 
 
     @ApiModelProperty(value = "查询开始时间")
     @ApiModelProperty(value = "查询开始时间")
     private LocalDateTime startDate;
     private LocalDateTime startDate;

@@ -16,6 +16,9 @@ public class TkRepairRecordDTO extends TenantDTO {
     @ApiModelProperty(value = "维修工单id")
     @ApiModelProperty(value = "维修工单id")
     private String orderId;
     private String orderId;
 
 
+    @ApiModelProperty(value = "维修编号")
+    private String code;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "维修时间")
     @ApiModelProperty(value = "维修时间")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonSerialize(using = LocalDateTimeSerializer.class)
@@ -33,6 +36,9 @@ public class TkRepairRecordDTO extends TenantDTO {
     @ApiModelProperty(value = "维修工单")
     @ApiModelProperty(value = "维修工单")
     private TkRepairOrderDTO tkRepairOrderDTO;
     private TkRepairOrderDTO tkRepairOrderDTO;
 
 
+    @ApiModelProperty(value = "设备名称")
+    private String deviceAccountName;
+
     @ApiModelProperty(value = "查询开始时间")
     @ApiModelProperty(value = "查询开始时间")
     private LocalDateTime startDate;
     private LocalDateTime startDate;
 
 

@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.entities;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.ModelConstants;
 
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -23,7 +24,7 @@ public class TkRepairOrderEntity extends TenantBaseEntity {
 
 
     private String reportBy;
     private String reportBy;
 
 
-    private String status;
+    private RepairOrderStatusEnum status;
 
 
     private Boolean emergency;
     private Boolean emergency;
 
 

@@ -17,6 +17,8 @@ public class TkRepairRecordEntity  extends TenantBaseEntity {
 
 
     private String orderId;
     private String orderId;
 
 
+    private String code;
+
     private LocalDateTime repairDate;
     private LocalDateTime repairDate;
 
 
     private String repairBy;
     private String repairBy;

@@ -37,6 +37,7 @@ public class TkDeviceAccountServiceImpl extends AbstractBaseService<TkDeviceAcco
 
 
     @Override
     @Override
     public TkPageData<TkDeviceAccountDTO> page(Map<String, Object> params) throws ThingsboardException {
     public TkPageData<TkDeviceAccountDTO> page(Map<String, Object> params) throws ThingsboardException {
+        params.put("tenantId", SpringBeanUtils.getTenantId().getId().toString());
         TkPageData<TkDeviceAccountDTO> result = new TkPageData<>();
         TkPageData<TkDeviceAccountDTO> result = new TkPageData<>();
         IPage<TkDeviceAccountEntity> page =
         IPage<TkDeviceAccountEntity> page =
                 getPage(params, "create_time", false);
                 getPage(params, "create_time", false);

@@ -12,6 +12,7 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.RepairOrderStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
@@ -20,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkRepairOrderEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkRepairOrderEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkRepairOrderMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkRepairOrderMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.TkRepairOrderService;
 import org.thingsboard.server.dao.yunteng.service.TkRepairOrderService;
 
 
@@ -36,28 +38,16 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
 
 
     private final TkDeviceService tkdeviceService;
     private final TkDeviceService tkdeviceService;
 
 
+    private final TkDeviceAccountService tkDeviceAccountService;
+
     @Override
     @Override
-    public TkPageData<TkRepairOrderDTO> page(String tenantId, Map<String, Object> params) {
+    public TkPageData<TkRepairOrderDTO> page(String tenantId, Map<String, Object> params) throws ThingsboardException {
+        params.put("tenantId", SpringBeanUtils.getTenantId().getId().toString());
         TkPageData<TkRepairOrderDTO> result = new TkPageData<>();
         TkPageData<TkRepairOrderDTO> result = new TkPageData<>();
         IPage<TkRepairOrderEntity> page =
         IPage<TkRepairOrderEntity> page =
                 getPage(params, "create_time", false);
                 getPage(params, "create_time", false);
 
 
         IPage<TkRepairOrderDTO> pageData = baseMapper.getRepairOrderPage(page, params);
         IPage<TkRepairOrderDTO> pageData = baseMapper.getRepairOrderPage(page, params);
-        if (pageData != null && CollectionUtils.isNotEmpty(pageData.getRecords())) {
-            Map<String, DeviceDTO> deviceMap = new HashMap<>();
-            pageData.getRecords().forEach(item -> {
-                String deviceId = item.getDeviceId();
-                if (StringUtils.isNotBlank(deviceId)) {
-                    DeviceDTO deviceDTO = deviceMap.get(tenantId);
-                    if (deviceDTO == null) {
-                        deviceDTO = tkdeviceService.checkDeviceByTenantIdAndDeviceId(UUID.fromString(tenantId), UUID.fromString(deviceId));
-                        deviceMap.put(tenantId, deviceDTO);
-                    }
-
-                    item.setDeviceInfo(deviceDTO);
-                }
-            });
-        }
         if (pageData != null) {
         if (pageData != null) {
             result.setItems(pageData.getRecords());
             result.setItems(pageData.getRecords());
         }
         }
@@ -65,34 +55,6 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
         return result;
         return result;
     }
     }
 
 
-    private QueryWrapper<TkRepairOrderEntity> getCondition(String tenantId, TkRepairOrderDTO params) {
-        QueryWrapper<TkRepairOrderEntity> queryWrapper = new QueryWrapper<>();
-        LambdaQueryWrapper<TkRepairOrderEntity> lambda = queryWrapper.lambda();
-        lambda.eq(TenantBaseEntity::getTenantId, tenantId);
-        if (StringUtils.isNotBlank(params.getDeviceId())) {
-            lambda.eq(TkRepairOrderEntity::getDeviceId, params.getDeviceId());
-        }
-        if (params.getStartDate() != null) {
-            lambda.ge(TkRepairOrderEntity::getReportDate, params.getStartDate());
-        }
-        if (params.getEndDate() != null) {
-            lambda.le(TkRepairOrderEntity::getReportDate, params.getEndDate());
-        }
-
-        if (StringUtils.isNotBlank(params.getReportBy())) {
-            lambda.eq(TkRepairOrderEntity::getReportBy, params.getReportBy());
-        }
-
-        if (StringUtils.isNotBlank(params.getStatus())) {
-            lambda.eq(TkRepairOrderEntity::getStatus, params.getStatus());
-        }
-
-        if (params.getEmergency() != null) {
-            lambda.eq(TkRepairOrderEntity::getEmergency, params.getEmergency());
-        }
-        return queryWrapper;
-    }
-
 
 
     @Override
     @Override
     public TkRepairOrderDTO save(TkRepairOrderDTO dto) throws ThingsboardException {
     public TkRepairOrderDTO save(TkRepairOrderDTO dto) throws ThingsboardException {
@@ -125,8 +87,7 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
         entity.copyToDTO(detail);
         entity.copyToDTO(detail);
         String deviceId = entity.getDeviceId();
         String deviceId = entity.getDeviceId();
         if (StringUtils.isNotBlank(deviceId)) {
         if (StringUtils.isNotBlank(deviceId)) {
-            TenantId tenantInfo = SpringBeanUtils.getTenantId();
-            DeviceDTO deviceDTO = tkdeviceService.checkDeviceByTenantIdAndDeviceId(tenantInfo.getId(), UUID.fromString(deviceId));
+            TkDeviceAccountDTO deviceDTO = tkDeviceAccountService.load(deviceId);
             detail.setDeviceInfo(deviceDTO);
             detail.setDeviceInfo(deviceDTO);
         }
         }
 
 
@@ -138,7 +99,7 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
         TkRepairOrderDTO result = null;
         TkRepairOrderDTO result = null;
         TkRepairOrderEntity entity = baseMapper.selectById(id);
         TkRepairOrderEntity entity = baseMapper.selectById(id);
         if (entity != null) {
         if (entity != null) {
-            result=new TkRepairOrderDTO();
+            result = new TkRepairOrderDTO();
             entity.copyToDTO(result);
             entity.copyToDTO(result);
         }
         }
         return result;
         return result;
@@ -153,7 +114,7 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
         lambda.eq(TkRepairOrderEntity::getDeviceId, deviceId);
         lambda.eq(TkRepairOrderEntity::getDeviceId, deviceId);
         TkRepairOrderEntity entity = baseMapper.selectOne(queryWrapper);
         TkRepairOrderEntity entity = baseMapper.selectOne(queryWrapper);
         if (entity != null) {
         if (entity != null) {
-            result=new TkRepairOrderDTO();
+            result = new TkRepairOrderDTO();
             entity.copyToDTO(result);
             entity.copyToDTO(result);
         }
         }
         return result;
         return result;
@@ -171,7 +132,7 @@ public class TkRepairOrderServiceImpl extends AbstractBaseService<TkRepairOrderM
         }
         }
         TkRepairOrderEntity entity = new TkRepairOrderEntity();
         TkRepairOrderEntity entity = new TkRepairOrderEntity();
         orderDTO.copyToEntity(entity);
         orderDTO.copyToEntity(entity);
-        entity.setStatus(statusEnum.name());
+        entity.setStatus(statusEnum);
         LambdaQueryWrapper<TkRepairOrderEntity> filter = new QueryWrapper<TkRepairOrderEntity>().lambda()
         LambdaQueryWrapper<TkRepairOrderEntity> filter = new QueryWrapper<TkRepairOrderEntity>().lambda()
                 .eq(TkRepairOrderEntity::getId, entity.getId());
                 .eq(TkRepairOrderEntity::getId, entity.getId());
         baseMapper.update(entity, filter);
         baseMapper.update(entity, filter);

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairRecordDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkRepairRecordDTO;
@@ -40,14 +41,12 @@ public class TkRepairRecordServiceImpl extends AbstractBaseService<TkRepairRecor
     private final TkUserService tkUserService;
     private final TkUserService tkUserService;
 
 
     @Override
     @Override
-    public TkPageData<TkRepairRecordDTO> page(String tenantId, TkRepairRecordDTO params) {
+    public TkPageData<TkRepairRecordDTO> page(Map<String, Object> params) throws ThingsboardException {
+        params.put("tenantId", SpringBeanUtils.getTenantId().getId().toString());
         TkPageData<TkRepairRecordDTO> result = new TkPageData<>();
         TkPageData<TkRepairRecordDTO> result = new TkPageData<>();
-        Map<String, Object> queryMap = new HashMap<>();
-        queryMap.put(PAGE, params.getPage());
-        queryMap.put(PAGE_SIZE, params.getPageSize());
         IPage<TkRepairRecordEntity> page =
         IPage<TkRepairRecordEntity> page =
-                getPage(queryMap, "rr.create_time", false);
-        IPage<TkRepairRecordDTO> pageData = baseMapper.getRepairRecordPage(page, queryMap);
+                getPage(params, "rr.create_time", false);
+        IPage<TkRepairRecordDTO> pageData = baseMapper.getRepairRecordPage(page, params);
         if (pageData != null) {
         if (pageData != null) {
             result.setItems(pageData.getRecords());
             result.setItems(pageData.getRecords());
         }
         }
@@ -103,6 +102,10 @@ public class TkRepairRecordServiceImpl extends AbstractBaseService<TkRepairRecor
         String orderId = entity.getOrderId();
         String orderId = entity.getOrderId();
         if (StringUtils.isNotBlank(orderId)) {
         if (StringUtils.isNotBlank(orderId)) {
             TkRepairOrderDTO repairOrderDTO = tkRepairOrderService.load(orderId);
             TkRepairOrderDTO repairOrderDTO = tkRepairOrderService.load(orderId);
+            if (StringUtils.isNotBlank(repairOrderDTO.getReportBy())) {
+                UserDTO reportInfo = tkUserService.findUserInfoById(repairOrderDTO.getReportBy());
+                repairOrderDTO.setReportByName(reportInfo.getRealName());
+            }
             detail.setTkRepairOrderDTO(repairOrderDTO);
             detail.setTkRepairOrderDTO(repairOrderDTO);
         }
         }
         UserDTO userInfo = tkUserService.findUserInfoById(detail.getRepairBy());
         UserDTO userInfo = tkUserService.findUserInfoById(detail.getRepairBy());

@@ -10,7 +10,7 @@ import java.util.Map;
 
 
 public interface TkRepairOrderService extends BaseService<TkRepairOrderEntity> {
 public interface TkRepairOrderService extends BaseService<TkRepairOrderEntity> {
 
 
-    TkPageData<TkRepairOrderDTO> page(String tenantId,Map<String, Object> params);
+    TkPageData<TkRepairOrderDTO> page(String tenantId,Map<String, Object> params) throws ThingsboardException;
 
 
     TkRepairOrderDTO save(TkRepairOrderDTO dto) throws ThingsboardException;
     TkRepairOrderDTO save(TkRepairOrderDTO dto) throws ThingsboardException;
 
 

@@ -5,9 +5,11 @@ import org.thingsboard.server.common.data.yunteng.dto.TkRepairRecordDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkRepairRecordEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkRepairRecordEntity;
 
 
+import java.util.Map;
+
 public interface TkRepairRecordService extends BaseService<TkRepairRecordEntity>{
 public interface TkRepairRecordService extends BaseService<TkRepairRecordEntity>{
 
 
-    TkPageData<TkRepairRecordDTO> page(String tenantId, TkRepairRecordDTO params);
+    TkPageData<TkRepairRecordDTO> page(Map<String, Object> params) throws ThingsboardException;
 
 
     TkRepairRecordDTO save(TkRepairRecordDTO dto) throws ThingsboardException;
     TkRepairRecordDTO save(TkRepairRecordDTO dto) throws ThingsboardException;
 
 

@@ -49,16 +49,16 @@
         inner join qg_supplier sp on sp.id=o.supplier_id
         inner join qg_supplier sp on sp.id=o.supplier_id
         inner join qg_device_cagegory dc on dc.id=o.category_id
         inner join qg_device_cagegory dc on dc.id=o.category_id
         <where>
         <where>
-            <if test="queryMap.tenantId !=null ">
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND o.tenant_id = #{queryMap.tenantId}
                 AND o.tenant_id = #{queryMap.tenantId}
             </if>
             </if>
-            <if test="queryMap.code !=null ">
+            <if test="queryMap.code !=null and queryMap.code !=''">
                 AND o.code LIKE concat('%',#{queryMap.code}::TEXT,'%')
                 AND o.code LIKE concat('%',#{queryMap.code}::TEXT,'%')
             </if>
             </if>
-            <if test="queryMap.status !=null ">
+            <if test="queryMap.status !=null and queryMap.status !=''">
                 AND o.status = #{queryMap.status}
                 AND o.status = #{queryMap.status}
             </if>
             </if>
-            <if test="queryMap.directorId !=null ">
+            <if test="queryMap.directorId !=null and queryMap.directorId !=''">
                 AND o.director_id = #{queryMap.directorId}
                 AND o.director_id = #{queryMap.directorId}
             </if>
             </if>
             <if test="queryMap.categoryIds !=null">
             <if test="queryMap.categoryIds !=null">

@@ -3,31 +3,69 @@
 
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TkRepairOrderMapper">
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TkRepairOrderMapper">
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO" id="repairOrderMap">
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO" id="repairOrderMap">
+        <result property="orderCode" column="order_code"/>
+        <result property="deviceId" column="device_id"/>
+        <result property="reportDate" column="report_date"/>
+        <result property="reportBy" column="report_by"/>
+        <result property="status" column="status" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="emergency" column="emergency"/>
+        <result property="situationImg" column="situation_img"/>
+        <result property="description" column="description"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updater" column="updater"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="creator" column="creator"/>
         <result property="reportByName" column="reportByName"/>
         <result property="reportByName" column="reportByName"/>
+        <association property="deviceInfo" javaType="org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO">
+            <id property="id" column="device_id"/>
+            <result property="name" column="daName"/>
+            <result property="code" column="daCode"/>
+            <result property="categoryId" column="category_id"/>
+            <result property="status" column="daStatus" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+            <result property="directorId" column="director_id"/>
+            <result property="isOnline" column="is_online"/>
+            <result property="deviceImg" column="device_img"/>
+            <result property="brand" column="brand"/>
+            <result property="modelNum" column="model_num"/>
+            <result property="specifications" column="specifications"/>
+            <result property="manufacturer" column="manufacturer"/>
+            <result property="buyDate" column="buy_date"/>
+            <result property="price" column="price"/>
+            <result property="productDate" column="product_date"/>
+            <result property="receiveDate" column="receive_date"/>
+            <result property="registeDate" column="registe_date"/>
+            <result property="supplierId" column="supplier_id"/>
+            <result property="description" column="daDescription"/>
+        </association>
     </resultMap>
     </resultMap>
     <select id="getRepairOrderPage" resultMap="repairOrderMap">
     <select id="getRepairOrderPage" resultMap="repairOrderMap">
         SELECT
         SELECT
-        o.id,o.device_id,o.order_code,o.report_date,o.report_by,o.status,o.emergency,o.situation_img,o.description
-        ,o.tenant_id,o.create_time,o.updater,o.update_time,o.creator,su.real_name as reportByName
+        o.id,o.device_id,o.order_code,o.report_date,o.report_by,o.status,o.emergency,o.situation_img,o.description,
+        da.name as daName,da.code as daCode,da.category_id,da.status as daStatus,da.director_id,da.is_online,
+        da.brand,da.model_num,da.specifications,da.manufacturer,da.buy_date,da.price,da.product_date,
+        da.receive_date,da.registe_date,da.supplier_id,da.device_img,da.description as daDescription,
+        o.tenant_id,o.create_time,o.updater,o.update_time,o.creator,su.real_name as reportByName
         from qg_repair_order o
         from qg_repair_order o
         inner join sys_user su on su.id=o.report_by
         inner join sys_user su on su.id=o.report_by
+        inner join qg_device_account da on da.id=o.device_id
         <where>
         <where>
-            <if test="queryMap.tenantId !=null ">
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND o.tenant_id = #{queryMap.tenantId}
                 AND o.tenant_id = #{queryMap.tenantId}
             </if>
             </if>
-            <if test="queryMap.status !=null ">
+            <if test="queryMap.status !=null and queryMap.status !=''">
                 AND o.status = #{queryMap.status}
                 AND o.status = #{queryMap.status}
             </if>
             </if>
-            <if test="queryMap.deviceId !=null ">
+            <if test="queryMap.deviceId !=null and queryMap.deviceId !=''">
                 AND o.device_id = #{queryMap.deviceId}
                 AND o.device_id = #{queryMap.deviceId}
             </if>
             </if>
-            <if test="queryMap.emergency !=null ">
+            <if test="queryMap.emergency !=null and queryMap.emergency !=''">
                 AND o.emergency = #{queryMap.emergency}
                 AND o.emergency = #{queryMap.emergency}
             </if>
             </if>
-            <if test="queryMap.startDate !=null ">
+            <if test="queryMap.startDate !=null and queryMap.startDate !=''">
                 AND to_char(o.report_date, 'YYYY-MM-DD HH24:MI:SS') &gt;= #{queryMap.startDate}
                 AND to_char(o.report_date, 'YYYY-MM-DD HH24:MI:SS') &gt;= #{queryMap.startDate}
             </if>
             </if>
-            <if test="queryMap.endDate !=null ">
+            <if test="queryMap.endDate !=null and queryMap.endDate !=''">
                 AND to_char(o.report_date, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{queryMap.endDate}
                 AND to_char(o.report_date, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{queryMap.endDate}
             </if>
             </if>
         </where>
         </where>

@@ -3,17 +3,51 @@
 
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TkRepairRecordMapper">
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TkRepairRecordMapper">
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.TkRepairRecordDTO" id="repairRecordMap">
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.TkRepairRecordDTO" id="repairRecordMap">
-        <result property="id" column="id" />
-        <result property="repairDate" column="repair_date" />
-        <result property="orderId" column="order_id" />
-        <result property="repairBy" column="repair_by" />
-        <result property="description" column="description" />
-        <result property="repairName" column="repairName" />
+        <result property="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="repairDate" column="repair_date"/>
+        <result property="orderId" column="order_id"/>
+        <result property="repairBy" column="repair_by"/>
+        <result property="description" column="description"/>
+        <result property="repairName" column="repairName"/>
+        <result property="deviceAccountName" column="deviceAccountName"/>
+        <association property="tkRepairOrderDTO"
+                     javaType="org.thingsboard.server.common.data.yunteng.dto.TkRepairOrderDTO">
+            <id property="id" column="order_id"/>
+            <result property="orderCode" column="order_code"/>
+            <result property="deviceId" column="device_id"/>
+            <result property="reportDate" column="report_date"/>
+            <result property="reportBy" column="report_by"/>
+            <result property="status" column="roStatus" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+            <result property="emergency" column="emergency"/>
+            <result property="situationImg" column="situation_img"/>
+            <result property="description" column="roDescription"/>
+            <result property="reportByName" column="reportByName"/>
+        </association>
     </resultMap>
     </resultMap>
-    <select id="getRepairRecordPage"  resultMap="repairRecordMap">
-        SELECT rr.id,rr.order_id,rr.repair_date,rr.repair_by,rr.description
-             ,rr.tenant_id,rr.create_time,rr.updater,rr.update_time,rr.creator,su.real_name as repairName
+    <select id="getRepairRecordPage" resultMap="repairRecordMap">
+        SELECT rr.id,rr.code,rr.order_id,rr.repair_date,rr.repair_by,rr.description,da.name as deviceAccountName,
+        ro.order_code,ro.device_id,ro.report_date,ro.report_by,ro.status as roStatus,
+        ro.emergency,ro.situation_img,ro.description as roDescription,su2.real_name as reportByName,
+        rr.tenant_id,rr.create_time,rr.updater,rr.update_time,rr.creator,su.real_name as repairName
         from qg_repair_record rr
         from qg_repair_record rr
+        inner join qg_repair_order ro on ro.id=rr.order_id
         inner join sys_user su on su.id=rr.repair_by
         inner join sys_user su on su.id=rr.repair_by
+        inner join sys_user su2 on su2.id=ro.report_by
+        inner join qg_device_account da on da.id=ro.device_id
+        <where>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
+                AND rr.tenant_id = #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.repairBy !=null and queryMap.repairBy !=''">
+                AND rr.repair_by = #{queryMap.repairBy}
+            </if>
+            <if test="queryMap.reportBy !=null and queryMap.reportBy !=''">
+                AND ro.report_by = #{queryMap.reportBy}
+            </if>
+            <if test="queryMap.orderCode !=null and queryMap.orderCode !=''">
+                AND ro.order_code LIKE concat('%',#{queryMap.orderCode}::TEXT,'%')
+            </if>
+        </where>
     </select>
     </select>
 </mapper>
 </mapper>