From fff68633c2fb6aad6b6b42077bb8d5833b92d4d2 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 23 三月 2026 11:39:39 +0800
Subject: [PATCH] 视频监管页，添加库区监管人及联系方式显示
---
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
index 8ddf2f9..2af3a6b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
@@ -4,9 +4,9 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.work.data.OrderStatus;
import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.data.WorkOrderParam;
import com.fzzy.work.domain.WorkOrderConf;
@@ -15,12 +15,15 @@
import com.fzzy.work.service.WorkOrderConfService;
import com.fzzy.work.service.WorkOrderProcessService;
import com.fzzy.work.service.WorkOrderService;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.enums.BusinessType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
@@ -42,48 +45,33 @@
private BizWorkService bizWorkService;
/**
- *
- * workOrderPR#pageQuery
- * 鍒嗛〉鏌ヨ
- * @param page
- * @param param
+ * 鏍规嵁鐢ㄦ埛瑙掕壊閫夋嫨涓嶅悓鐨勫伐鍗曚俊鎭�
+ * @param page 鍒嗛〉淇℃伅
+ * @param param 鍙傛暟
*/
@DataProvider
- public void pageQuery(Page<WorkOrder> page, WorkOrderParam param) {
+ public void pageQueryByUserType(Page<WorkOrder> page, WorkOrderParam param) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<WorkOrder> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());
if (null == param) param = new WorkOrderParam();
param.setCompanyId(ContextUtil.getCompanyId());
- workOrderService.pageQuery(corePage, param);
+ workOrderService.pageQueryByUserType(corePage, param);
// 閲嶆柊灏佽
page.setEntities(corePage.getRecords());
page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
}
+
/**
- *
- * workOrderPR#pageQuery2
- * 宸茬粡瀹屾垚锛屽垎椤垫煡璇�
- * @param page
- * @param param
+ * workOrderPR#pageSummary
+ * 宸ュ崟姹囨�荤粺璁�
*/
- @DataProvider
- public void pageQuery2(Page<WorkOrder> page, WorkOrderParam param) {
-
- com.baomidou.mybatisplus.extension.plugins.pagination.Page<WorkOrder> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());
-
- if (null == param) param = new WorkOrderParam();
- param.setStatus(OrderStatus.STATUS_50.getCode());
- param.setCompanyId(ContextUtil.getCompanyId());
-
- workOrderService.pageQuery(corePage, param);
-
- // 閲嶆柊灏佽
- page.setEntities(corePage.getRecords());
- page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
+ @Expose
+ public Map<String,String> pageSummary() {
+ return workOrderService.pageSummary();
}
@@ -164,6 +152,7 @@
*
*/
@Expose
+ @Log(title = "宸ュ崟閰嶇疆", businessType = BusinessType.DELETE,bizType = BizTypeEnum.INOUT)
public BaseResp deleteConf(WorkOrderConf data) {
WorkOrderConf newData = new WorkOrderConf();
BeanUtils.copyProperties(data, newData);
@@ -181,6 +170,17 @@
return workOrderService.triggerType();
}
+ /**
+ * 娴佺▼鑺傜偣
+ * ${dorado.getDataProvider("workOrderPR#triggerNode").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<SysDictData> triggerNode() {
+ return workOrderService.triggerNode();
+ }
+
//-----------------------娴佺▼澶勭悊---------------------------//
/**
*
--
Gitblit v1.9.3