Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
9388ccdf
Commit
9388ccdf
authored
Aug 20, 2021
by
chenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
ef18080d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
RescueEquipmentDto.java
...n/amos/boot/module/common/api/dto/RescueEquipmentDto.java
+3
-4
RescueEquipment.java
...n/amos/boot/module/common/api/entity/RescueEquipment.java
+2
-3
FirefightersThoughtController.java
.../common/biz/controller/FirefightersThoughtController.java
+6
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RescueEquipmentDto.java
View file @
9388ccdf
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.ApiModelProperty
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.util.Date
;
/**
* 救援装备
*
...
...
@@ -32,7 +31,7 @@ public class RescueEquipmentDto extends BaseDto {
private
Long
vehicleNumber
;
@ApiModelProperty
(
value
=
"费用"
)
private
Integer
fee
;
private
Double
fee
;
@ApiModelProperty
(
value
=
"单位名称"
)
private
String
company
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/RescueEquipment.java
View file @
9388ccdf
...
...
@@ -3,12 +3,11 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
java.util.Date
;
/**
* 救援装备
*
...
...
@@ -45,7 +44,7 @@ public class RescueEquipment extends BaseEntity {
* 费用
*/
@TableField
(
"fee"
)
private
Integer
fee
;
private
Double
fee
;
/**
* 单位名称
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersThoughtController.java
View file @
9388ccdf
...
...
@@ -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.RedisUtils
;
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
io.swagger.annotations.Api
;
...
...
@@ -155,7 +156,11 @@ public class FirefightersThoughtController extends BaseController {
firefightersThoughtQueryWrapper
.
eq
(
name
,
fileValue
);
}
else
if
(
type
.
equals
(
String
.
class
))
{
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
))
{
Date
fileValue
=
(
Date
)
field
.
get
(
firefightersThought
);
firefightersThoughtQueryWrapper
.
eq
(
name
,
fileValue
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment