接口增加参数返回值

performance-api/src/main/java/com/clx/performance/enums/BreakContractOwnerRecordEnum.java

@@ -28,5 +28,24 @@ public enum BreakContractOwnerRecordEnum {
         }
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum CompensationStatusStatus {
+        NOT(0, "未赔付"),
+        YES(1, "已赔付"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<CompensationStatusStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(CompensationStatusStatus::getMsg).orElse(null);
+        }
+    }
+
 
 }

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/owner/PageOwnerBreakContractOwnerRecordParam.java

@@ -25,7 +25,7 @@ public class PageOwnerBreakContractOwnerRecordParam extends PageParam {
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3司机", example = "1")
     private Integer breachContractPartyType;
 
-    @ApiModelProperty(value = "缴费状态：0未缴费;1已缴费", example = "1")
+    @ApiModelProperty(value = "缴费状态：0未缴费;1已缴费/赔付状态：0未赔付;1已赔付", example = "1")
     private Integer payStatus;
 
     @ApiModelProperty(value = "开始时间", example = "2012-01-01 00:00:00")

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/owner/PageOwnerBreakContractOwnerRecordVO.java

@@ -34,13 +34,19 @@ public class PageOwnerBreakContractOwnerRecordVO {
     @ApiModelProperty("缴费状态：0未缴费;1已缴费")
     private String payStatusMsg;
 
-    @ApiModelProperty("缴费状态：0未缴费;1已缴费")
+    @ApiModelProperty("赔付状态：0未赔付;1已赔付")
+    private String compensationStatusMsg;
+
+    @ApiModelProperty("缴费状态：0未缴费;1已缴费 /赔付状态：0未赔付;1已赔付")
     private Integer payStatus;
 
     @ApiModelProperty("备注")
     private String remark;
 
-    @ApiModelProperty("创建时间")
+    @ApiModelProperty("违约时间")
     private String createTime;
 
+    @ApiModelProperty("赔付时间")
+    private String payTime;
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractOwnerRecordDaoImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.breakcontract.BreakContractOwnerRecordDao;
+import com.clx.performance.enums.BreakContractSettlementDriverEnum;
 import com.clx.performance.mapper.breakcontract.BreakContractOwnerRecordMapper;
 import com.clx.performance.model.breakcontract.BreakContractOwnerRecord;
 import com.clx.performance.param.pc.breakcontract.carrier.PageBreakContractOwnerRecordParam;
@@ -37,8 +38,13 @@ public class BreakContractOwnerRecordDaoImpl extends BaseDaoImpl<BreakContractOw
         query.eq(Objects.nonNull(param.getOwnerUserNo()),BreakContractOwnerRecord :: getOwnerUserNo,param.getOwnerUserNo());
         query.eq(Objects.nonNull(param.getBreachContractPartyType()),BreakContractOwnerRecord :: getBreachContractPartyType,param.getBreachContractPartyType());
         query.eq(Objects.nonNull(param.getPayStatus()),BreakContractOwnerRecord :: getPayStatus,param.getPayStatus());
+        if(Objects.equals(param.getBreachContractPartyType(), BreakContractSettlementDriverEnum.BreachContractPartyType.PLATFORM.getCode())){
+            query.ge(StringUtils.isNotBlank(param.getBeginTime()), BreakContractOwnerRecord:: getPayTime,param.getBeginTime());
+            query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractOwnerRecord :: getPayTime,param.getEndTime());
+        }else{
             query.ge(StringUtils.isNotBlank(param.getBeginTime()), BreakContractOwnerRecord:: getCreateTime,param.getBeginTime());
             query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractOwnerRecord :: getCreateTime,param.getEndTime());
+        }
         query.orderByDesc(BreakContractOwnerRecord::getId);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }

performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractOwnerRecord.java

@@ -63,6 +63,10 @@ public class BreakContractOwnerRecord   implements HasKey<Integer> {
     @ApiModelProperty("缴费状态：0未缴费;1已缴费")
     private Integer payStatus;
 
+    @TableField("pay_time")
+    @ApiModelProperty("支付时间")
+    private LocalDateTime payTime;
+
     @TableField("remark")
     @ApiModelProperty("备注")
     private String remark;

performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractOwnerRecordStruct.java

@@ -18,6 +18,7 @@ public interface BreakContractOwnerRecordStruct {
 
     @Named("toBaseVo")
     @Mapping(target = "payStatusMsg", expression = "java(BreakContractOwnerRecordEnum.PayStatus.getMsgByCode(detail.getPayStatus()))")
+    @Mapping(target = "compensationStatusMsg", expression = "java(BreakContractOwnerRecordEnum.CompensationStatusStatus.getMsgByCode(detail.getPayStatus()))")
     PageOwnerBreakContractOwnerRecordVO convert(BreakContractOwnerRecord detail);
 
     @IterableMapping(qualifiedByName = "toBaseVo")