diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue
index ace0890..e0f307d 100644
--- a/client/src/views/big-screen/bigdata.vue
+++ b/client/src/views/big-screen/bigdata.vue
@@ -2002,9 +2002,7 @@ function showCheckCaseChart(data) {
{
name: '在线巡查数',
type: 'line',
- lineStyle: {
- width: size(4)
- },
+
itemStyle: {
color: '#14B1CA'
},
diff --git a/client/src/views/dtsjygl/qyxxcx.vue b/client/src/views/dtsjygl/qyxxcx.vue
index 4918540..8abad08 100644
--- a/client/src/views/dtsjygl/qyxxcx.vue
+++ b/client/src/views/dtsjygl/qyxxcx.vue
@@ -355,7 +355,7 @@ async function handleDetail(row) {
dialogConfig.value.show = true
dialogConfig.value.mode = 'detail'
dialogConfig.value.title = '详情企业信息'
-
+ findOne(row)
}
async function handleModify(row) {
diff --git a/client/src/views/fxczfgl/zxxcxx.vue b/client/src/views/fxczfgl/zxxcxx.vue
index 3d33bb5..81dc530 100644
--- a/client/src/views/fxczfgl/zxxcxx.vue
+++ b/client/src/views/fxczfgl/zxxcxx.vue
@@ -60,10 +60,6 @@
-
- 在线巡查
-
-
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java
index b3f3b7e..b9c5da5 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java
@@ -19,7 +19,6 @@ public class OnlinePatrolDto {
private String createUserName;//录入人名称
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;//录入时间
-
private String approvalStatus;//审批状态
private String approvalUserId;//审批人id
private String approvalUserName;//审批人名称
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/repository/InsEnterprseRepository.java b/server/src/main/java/com/aisino/iles/lawenforcement/repository/InsEnterprseRepository.java
index afb177a..6df963d 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/repository/InsEnterprseRepository.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/repository/InsEnterprseRepository.java
@@ -10,4 +10,5 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface InsEnterprseRepository extends BaseRepo {
+
}
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java
index f2a16cf..d1cf909 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java
@@ -79,7 +79,15 @@ public class CaseService {
*
* @param query@return 分页案件信息
*/
-
+ @Transactional(readOnly = true)
+ public Page findCasesPage(CaseQuery query, RemoteUserInfo user) {
+ if ("zfwsquery".equals(query.getSpecialCondition()))
+ return caseRepository.findAll(buildSpec(query, user), PageableHelper.buildPageRequest(query.page(), query.pageSize(), "fillingDate", "desc")).map(this::handleResult);
+ if (query.getStatus() != null && ("filed".equals(query.getStatus().getValue()) || "investigation_done".equals(query.getStatus().getValue())))
+ return caseRepository.findAll(buildSpec(query, user), PageableHelper.buildPageRequest(query.page(), query.pageSize(), "fillingDate", "desc")).map(this::getCaseevidenceDetailInfo);
+ else
+ return caseRepository.findAll(buildSpec(query, user), PageableHelper.buildPageRequest(query.page(), query.pageSize(), "fillingDate", "desc")).map(this::getCaseDetailInfo);
+ }
private Case handleResult(Case caseInfoDto) {