diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/RepairCardApplyDto.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/RepairCardApplyDto.java index 8cf81d6..06782d7 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/RepairCardApplyDto.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/RepairCardApplyDto.java @@ -91,7 +91,7 @@ public class RepairCardApplyDto { * 审核时间 */ @Excel(name = "审核时间") - private Date checkTime; + private String checkTime; /** * 创建人 diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml index 57f9299..36587b2 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml @@ -260,7 +260,7 @@ SELECT pp.id proId, pp.pro_name proName, - count( brca.id ) num, + count( distinct brca.id ) num, count( distinct brcr.worker_id ) personNum, sum( brcr.repair_day ) days, brca.create_time createTime