From 164a53adaed58ad0519bc214b08c0bfb287723f4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 21 一月 2026 14:40:45 +0800
Subject: [PATCH] 数据导入提交2

---
 fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java |   76 ++++++++++++++++++++++++-------------
 1 files changed, 49 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 0c1f823..ce38f11 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
@@ -6,11 +6,11 @@
 import com.bstek.dorado.data.provider.Page;
 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;
 import com.fzzy.work.domain.WorkOrderProcess;
+import com.fzzy.work.service.BizWorkService;
 import com.fzzy.work.service.WorkOrderConfService;
 import com.fzzy.work.service.WorkOrderProcessService;
 import com.fzzy.work.service.WorkOrderService;
@@ -20,6 +20,7 @@
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
@@ -37,50 +38,37 @@
     private WorkOrderProcessService workOrderProcessService;
     @Resource
     private WorkOrderConfService workOrderConfService;
+    @Resource
+    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();
     }
 
 
@@ -93,6 +81,17 @@
     @DataProvider
     public List<SysDictData> triggerStatus() {
         return workOrderService.triggerStatus();
+    }
+    
+    /**
+     * 宸ュ崟绫诲瀷
+     * ${dorado.getDataProvider("workOrderPR#triggerBizType").getResult()}
+     *
+     * @return
+     */
+    @DataProvider
+    public List<SysDictData> triggerBizType() {
+        return workOrderService.triggerBizType();
     }
 
 
@@ -166,4 +165,27 @@
     public List<SysDictData> triggerType() {
         return workOrderService.triggerType();
     }
+    
+    /**
+     * 娴佺▼鑺傜偣
+     * ${dorado.getDataProvider("workOrderPR#triggerNode").getResult()}
+     *
+     * @return
+     */
+    @DataProvider
+    public List<SysDictData> triggerNode() {
+        return workOrderService.triggerNode();
+    }
+    
+    //-----------------------娴佺▼澶勭悊---------------------------//
+    /**
+    *
+    * workOrderPR#todo
+    * 淇℃伅鍒楄〃
+    *
+    */
+    @Expose
+    public BaseResp todo(WorkOrderProcess data) {
+    	return bizWorkService.todoByProcess(data);
+    }
 }

--
Gitblit v1.9.3