Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
6add0b51
Commit
6add0b51
authored
Sep 24, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改车型列表
parent
16ee86e0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
56 deletions
+53
-56
VehicleModelQueryCondition.java
...xfc/platform/vehicle/pojo/VehicleModelQueryCondition.java
+1
-4
VehicleModelMapper.xml
...e-server/src/main/resources/mapper/VehicleModelMapper.xml
+52
-52
No files found.
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelQueryCondition.java
View file @
6add0b51
...
@@ -27,14 +27,11 @@ public class VehicleModelQueryCondition {
...
@@ -27,14 +27,11 @@ public class VehicleModelQueryCondition {
@ApiModelProperty
(
value
=
"是否删除"
)
@ApiModelProperty
(
value
=
"是否删除"
)
private
Integer
isDel
;
private
Integer
isDel
;
@ApiModelProperty
(
value
=
"状态"
)
@ApiModelProperty
(
value
=
"状态"
)
private
Integer
status
;
private
Integer
status
=
1
;
@ApiModelProperty
(
"分类逗号分割"
)
@ApiModelProperty
(
"分类逗号分割"
)
String
catasStr
;
String
catasStr
;
@ApiModelProperty
(
"排除的车型id"
)
@ApiModelProperty
(
"排除的车型id"
)
String
notInIds
;
String
notInIds
;
@ApiModelProperty
(
value
=
"分类列表"
,
hidden
=
true
)
@ApiModelProperty
(
value
=
"分类列表"
,
hidden
=
true
)
Map
<
Integer
,
List
<
VehiclePlatCata
>>
catas
;
Map
<
Integer
,
List
<
VehiclePlatCata
>>
catas
;
@ApiModelProperty
(
value
=
"分类列表(1-后台,2-app和小程序)"
,
hidden
=
true
)
private
Integer
pathType
=
2
;
}
}
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleModelMapper.xml
View file @
6add0b51
...
@@ -17,25 +17,25 @@
...
@@ -17,25 +17,25 @@
<if
test=
"isDel !=null "
>
<if
test=
"isDel !=null "
>
and isdel=#{isDel}
and isdel=#{isDel}
</if>
</if>
<if
test=
"pathType ==2"
>
and status = 1
</if>
<if
test=
"pathType!=2"
>
<if
test=
"status != null"
>
<if
test=
"status != null"
>
and status = #{status}
and status = #{status}
</if>
</if>
</if>
<if
test=
"vehicleName !=null and vehicleName !=''"
>
<if
test=
"vehicleName !=null and vehicleName !=''"
>
AND vmqc.name LIKE CONCAT('%',#{vehicleName},'%')
AND vmqc.name LIKE CONCAT('%',#{vehicleName},'%')
</if>
</if>
<if
test=
"vehicleType!=null and vehicleType!=''"
>
<if
test=
"vehicleType!=null and vehicleType!=''"
>
AND EXISTS (SELECT vc.vehicle_model_id FROM vehicle_cata vc WHERE vc.cata_id=#{vehicleType} AND vmqc.id=vc.vehicle_model_id )
AND EXISTS (SELECT vc.vehicle_model_id FROM vehicle_cata vc WHERE vc.cata_id=#{vehicleType} AND
vmqc.id=vc.vehicle_model_id )
</if>
</if>
<if
test=
"takeALieTheNumber!=null and takeALieTheNumber!=''"
>
<if
test=
"takeALieTheNumber!=null and takeALieTheNumber!=''"
>
AND EXISTS(SELECT vc2.vehicle_model_id FROM vehicle_cata vc2 WHERE vc2.cata_id=#{takeALieTheNumber} AND vmqc.id=vc2.vehicle_model_id)
AND EXISTS(SELECT vc2.vehicle_model_id FROM vehicle_cata vc2 WHERE vc2.cata_id=#{takeALieTheNumber} AND
vmqc.id=vc2.vehicle_model_id)
</if>
</if>
<if
test=
"catas != null"
>
<if
test=
"catas != null"
>
...
...
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