diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTickets.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTickets.java index 5681566b..26f90dee 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTickets.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTickets.java @@ -264,6 +264,8 @@ public class DlRepairTickets extends TenantBaseDO { private String payConfirmRemark; /** 结算方式 方式 gz 挂账 xj 现结 */ private String settlementType; + /** 绑定的A单Id */ + private String parentTicketId; /** 更新时上传的图片 */ @TableField(exist = false) diff --git a/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml b/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml index aa561d14..e8daa417 100644 --- a/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml @@ -70,7 +70,7 @@ LEFT JOIN system_dict_data sdd ON drt.repair_type = sdd.value AND sdd.dict_type = 'repair_type' AND sdd.deleted = 0 WHERE drt.deleted = 0 - AND drt.tickets_status !='03' + AND drt.tickets_status !='03' AND drt.ticket_type != '02' AND drt.create_time BETWEEN CONCAT(#{reqVO.dateRange[0]}, ' 00:00:00') AND CONCAT(#{reqVO.dateRange[1]}, ' 23:59:59')