From 68bb6e383fdb33218f7ac6c37499f8112c1ea9f5 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期三, 31 十二月 2025 15:48:52 +0800
Subject: [PATCH] 调整工单页面提交

---
 fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java |  129 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 128 insertions(+), 1 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 79b8293..0c1f823 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
@@ -1,11 +1,25 @@
 package com.fzzy.work;
 
 import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
 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.WorkOrderConfService;
+import com.fzzy.work.service.WorkOrderProcessService;
 import com.fzzy.work.service.WorkOrderService;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -19,7 +33,10 @@
 
     @Resource
     private WorkOrderService workOrderService;
-
+    @Resource
+    private WorkOrderProcessService workOrderProcessService;
+    @Resource
+    private WorkOrderConfService workOrderConfService;
 
     /**
      *
@@ -33,10 +50,120 @@
 
         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);
 
         // 閲嶆柊灏佽
         page.setEntities(corePage.getRecords());
         page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
     }
+
+    /**
+     *
+     * workOrderPR#pageQuery2
+     * 宸茬粡瀹屾垚锛屽垎椤垫煡璇�
+     * @param page
+     * @param param
+     */
+    @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())));
+    }
+
+
+    /**
+     * 宸ュ崟鐘舵��
+     * ${dorado.getDataProvider("workOrderPR#triggerStatus").getResult()}
+     *
+     * @return
+     */
+    @DataProvider
+    public List<SysDictData> triggerStatus() {
+        return workOrderService.triggerStatus();
+    }
+
+
+    //--------------------宸ュ崟瀹℃壒鍘嗗彶淇℃伅鏌ヨ--------------------
+
+    /**
+     *
+     * workOrderPR#processList
+     * 淇℃伅鍒楄〃
+     * @param orderId 宸ュ崟ID
+     */
+    @DataProvider
+    public List<WorkOrderProcess> processList(String orderId) {
+        return workOrderProcessService.queryList(orderId);
+    }
+
+
+    //--------------------宸ュ崟瀹℃壒閰嶇疆淇℃伅绠＄悊--------------------
+
+    /**
+     *
+     * workOrderPR#confList
+     * 淇℃伅鍒楄〃
+     *
+     */
+    @DataProvider
+    public List<WorkOrderConf> confList(String deptId) {
+        return workOrderConfService.queryList(deptId);
+    }
+
+    /**
+     *
+     * workOrderPR#saveConf
+     * 淇℃伅鍒楄〃
+     *
+     */
+    @DataResolver
+    public void saveConf(WorkOrderConf data) {
+
+        WorkOrderConf newData = new WorkOrderConf();
+        BeanUtils.copyProperties(data, newData);
+
+        if (null == data.getId()) {
+            workOrderConfService.insertConf(newData);
+        } else {
+            workOrderConfService.updateConf(newData);
+        }
+    }
+
+
+    /**
+     *
+     * workOrderPR#deleteConf
+     * 淇℃伅鍒楄〃
+     *
+     */
+    @Expose
+    public BaseResp deleteConf(WorkOrderConf data) {
+        WorkOrderConf newData = new WorkOrderConf();
+        BeanUtils.copyProperties(data, newData);
+        return workOrderConfService.deleteConf(newData);
+    }
+
+    /**
+     * 宸ュ崟涓氬姟绫诲瀷
+     * ${dorado.getDataProvider("workOrderPR#triggerType").getResult()}
+     *
+     * @return
+     */
+    @DataProvider
+    public List<SysDictData> triggerType() {
+        return workOrderService.triggerType();
+    }
 }

--
Gitblit v1.9.3