执法车辆、执法立案等功能调整
This commit is contained in:
parent
7937817628
commit
0fb03be771
|
|
@ -130,7 +130,10 @@
|
||||||
<div class="content enterprise_content">
|
<div class="content enterprise_content">
|
||||||
<img src="../../assets/bigscreen/59.png">
|
<img src="../../assets/bigscreen/59.png">
|
||||||
<div class="content_top">
|
<div class="content_top">
|
||||||
|
<div class="icon icon3"></div>
|
||||||
|
<div class="label">执法车辆数量</div>
|
||||||
|
<div class="num" @click="handLawEnforceVehiclePage">{{ zfcls }}</div>
|
||||||
|
</div>
|
||||||
<div class="content_bottom">
|
<div class="content_bottom">
|
||||||
<div class="content_bottom_item">
|
<div class="content_bottom_item">
|
||||||
<div class="label"><span class="icon gtfh"></span>个体防护</div>
|
<div class="label"><span class="icon gtfh"></span>个体防护</div>
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,14 @@ public class Zfzbgl extends BaseModel {
|
||||||
@Comment("ID(ULID)")
|
@Comment("ID(ULID)")
|
||||||
private String zfzbglid;
|
private String zfzbglid;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 所属机构ID
|
||||||
|
*/
|
||||||
|
@ManyToOne(fetch = FetchType.EAGER)
|
||||||
|
@JoinColumn(name = "agency_id")
|
||||||
|
@NotFound(action = NotFoundAction.IGNORE)
|
||||||
|
@Comment("所属机构ID")
|
||||||
|
private Agency agency;
|
||||||
|
|
||||||
|
|
||||||
@Column(length = 50)
|
@Column(length = 50)
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ public class ZsfzglService {
|
||||||
Integer _page = Optional.ofNullable(query.page()).filter(f -> f > 0).map(f -> f - 1).orElse(0);
|
Integer _page = Optional.ofNullable(query.page()).filter(f -> f > 0).map(f -> f - 1).orElse(0);
|
||||||
String _sort = Optional.ofNullable(query.sort()).filter(com.aisino.iles.common.util.StringUtils::isNotEmpty).orElse(Zsfzgl_.GZSJ);
|
String _sort = Optional.ofNullable(query.sort()).filter(com.aisino.iles.common.util.StringUtils::isNotEmpty).orElse(Zsfzgl_.GZSJ);
|
||||||
String _dir = Optional.ofNullable(query.dir()).filter(d -> Sort.Direction.fromOptionalString(d).isPresent()).orElse("desc");
|
String _dir = Optional.ofNullable(query.dir()).filter(d -> Sort.Direction.fromOptionalString(d).isPresent()).orElse("desc");
|
||||||
|
|
||||||
return zsfzglRepository.findAll(buildQueryCondition(query), PageRequest.of(_page, _psize, Sort.by(Sort.Direction.fromString(_dir), _sort)));
|
return zsfzglRepository.findAll(buildQueryCondition(query), PageRequest.of(_page, _psize, Sort.by(Sort.Direction.fromString(_dir), _sort)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue