Commit 9388ccdf authored by chenhao's avatar chenhao

修改bug

parent ef18080d
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
/** /**
* 救援装备 * 救援装备
* *
...@@ -32,7 +31,7 @@ public class RescueEquipmentDto extends BaseDto { ...@@ -32,7 +31,7 @@ public class RescueEquipmentDto extends BaseDto {
private Long vehicleNumber; private Long vehicleNumber;
@ApiModelProperty(value = "费用") @ApiModelProperty(value = "费用")
private Integer fee; private Double fee;
@ApiModelProperty(value = "单位名称") @ApiModelProperty(value = "单位名称")
private String company; private String company;
......
...@@ -3,12 +3,11 @@ package com.yeejoin.amos.boot.module.common.api.entity; ...@@ -3,12 +3,11 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date;
/** /**
* 救援装备 * 救援装备
* *
...@@ -45,7 +44,7 @@ public class RescueEquipment extends BaseEntity { ...@@ -45,7 +44,7 @@ public class RescueEquipment extends BaseEntity {
* 费用 * 费用
*/ */
@TableField("fee") @TableField("fee")
private Integer fee; private Double fee;
/** /**
* 单位名称 * 单位名称
......
...@@ -29,6 +29,7 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils; ...@@ -29,6 +29,7 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought; import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersThoughtServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersThoughtServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -155,7 +156,11 @@ public class FirefightersThoughtController extends BaseController { ...@@ -155,7 +156,11 @@ public class FirefightersThoughtController extends BaseController {
firefightersThoughtQueryWrapper.eq(name, fileValue); firefightersThoughtQueryWrapper.eq(name, fileValue);
} else if (type.equals(String.class)) { } else if (type.equals(String.class)) {
String fileValue = (String) field.get(firefightersThought); String fileValue = (String) field.get(firefightersThought);
firefightersThoughtQueryWrapper.eq(name, fileValue); if("SPEAKER".equals(name)) {
firefightersThoughtQueryWrapper.like(name,fileValue);
}else {
firefightersThoughtQueryWrapper.eq(name, fileValue);
}
}else if (type.equals(Date.class)) { }else if (type.equals(Date.class)) {
Date fileValue = (Date) field.get(firefightersThought); Date fileValue = (Date) field.get(firefightersThought);
firefightersThoughtQueryWrapper.eq(name, fileValue); firefightersThoughtQueryWrapper.eq(name, fileValue);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment