From c00af7e5bfa382528b3bef7ee2484d872fceda17 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期六, 17 一月 2026 17:05:25 +0800
Subject: [PATCH] 样式修改，出库通知单流程查询纠正
---
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java | 36 ++++++------------------------------
1 files changed, 6 insertions(+), 30 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 c3ac938..dca987b 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
@@ -17,6 +17,7 @@
import com.fzzy.work.service.WorkOrderService;
import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -42,44 +43,19 @@
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);
-
- // 閲嶆柊灏佽
- 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(WorkStatus.STATUS_50.getCode());
- param.setCompanyId(ContextUtil.getCompanyId());
-
- workOrderService.pageQuery(corePage, param);
+ workOrderService.pageQueryByUserType(corePage, param);
// 閲嶆柊灏佽
page.setEntities(corePage.getRecords());
--
Gitblit v1.9.3