提交 3d1627a3 authored 作者: liuhaiquan's avatar liuhaiquan

修改承运货主查询不到数据的问题

上级 864fcb6c
...@@ -10,7 +10,7 @@ import java.util.Optional; ...@@ -10,7 +10,7 @@ import java.util.Optional;
public enum OwnerLoanAccountRunningWaterRecordEnum { public enum OwnerLoanAccountRunningWaterRecordEnum {
; ;
//10:运单核销 20:借款
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum RunWaterType { public enum RunWaterType {
......
...@@ -23,7 +23,7 @@ public class PageOwnerLoanRunWaterRecordParam extends PageParam { ...@@ -23,7 +23,7 @@ public class PageOwnerLoanRunWaterRecordParam extends PageParam {
private Long runningWaterNo; private Long runningWaterNo;
@ApiModelProperty("流水类型 10:运单核销 20:借款") @ApiModelProperty("流水类型")
private Integer runningWaterType; private Integer runningWaterType;
......
package com.clx.performance.vo.pc.loan.owner; package com.clx.performance.vo.pc.loan.owner;
import com.clx.performance.enums.loan.OwnerLoanAccountRunningWaterRecordEnum;
import com.msl.common.convertor.type.MoneyOutConvert; import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
...@@ -46,9 +47,18 @@ public class OwnerLoanRunWaterRecordVO { ...@@ -46,9 +47,18 @@ public class OwnerLoanRunWaterRecordVO {
private String childNo; private String childNo;
@ApiModelProperty("流水类型 10:运单核销 20:借款") @ApiModelProperty("流水类型")
private Integer runningWaterType; private Integer runningWaterType;
@ApiModelProperty("流水类型")
private String runningWaterTypeMsg;
public String getRunningWaterTypeMsg() {
return OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.getMsgByCode(runningWaterType);
}
@MoneyOutConvert @MoneyOutConvert
@ApiModelProperty("金额") @ApiModelProperty("金额")
private BigDecimal alterationBalance; private BigDecimal alterationBalance;
...@@ -63,9 +73,9 @@ public class OwnerLoanRunWaterRecordVO { ...@@ -63,9 +73,9 @@ public class OwnerLoanRunWaterRecordVO {
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private LocalDateTime createTime; private String createTime;
@ApiModelProperty("修改时间") @ApiModelProperty("修改时间")
private LocalDateTime modifiedTime; private String modifiedTime;
} }
...@@ -27,7 +27,7 @@ public class OwnerLoanAccountRunningWaterRecordSqlProvider { ...@@ -27,7 +27,7 @@ public class OwnerLoanAccountRunningWaterRecordSqlProvider {
WHERE("owner_user_no = #{param.ownerUserNo}"); WHERE("owner_user_no = #{param.ownerUserNo}");
if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");} if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
if (Objects.nonNull(param.getRunningWaterNo())) {WHERE("running_water_no = #{param.runningWaterNo}");} if (StringUtils.isNotBlank(param.getRunningWaterNo())) {WHERE("running_water_no = #{param.runningWaterNo}");}
if (Objects.nonNull(param.getRunningWaterType())) {WHERE("running_water_type = #{param.runningWaterType}");} if (Objects.nonNull(param.getRunningWaterType())) {WHERE("running_water_type = #{param.runningWaterType}");}
ORDER_BY("create_time desc"); ORDER_BY("create_time desc");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论