From cfda6a07227caa1a9dfe2e403fbe4345b239a4e6 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期五, 19 十二月 2025 18:40:43 +0800
Subject: [PATCH] 提交工单管理功能2
---
fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
index 08605f8..de5299e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
@@ -3,10 +3,17 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
+import com.fzzy.work.data.OrderStatus;
import com.fzzy.work.data.WorkOrderParam;
import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.mapper.WorkOrderMapper;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
import javax.annotation.Resource;
@@ -26,11 +33,32 @@
if (null == param) {
param = new WorkOrderParam();
+
}
- param.setCompanyId(ContextUtil.getCompanyId());
+ if(null == param.getCompanyId())param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
+
+ queryWrapper.eq(null != param.getDeptId(), "dept_id", param.getDeptId());
+ queryWrapper.like(null != param.getName(), "title", param.getName());
+ queryWrapper.eq(null != param.getStatus(), "status", param.getStatus());
+
+ if(null != param.getStart()){
+ queryWrapper.gt("create_time", DateUtil.getNextZero(param.getStart()));
+ }
+ if(null != param.getEnd()){
+ queryWrapper.lt("create_time", DateUtil.getCurZero(param.getEnd()));
+ }
+
workOrderMapper.selectPage(page, queryWrapper);
}
+
+ public List<SysDictData> triggerStatus() {
+ List<SysDictData> list = new ArrayList<SysDictData>();
+ for (OrderStatus w : OrderStatus.values()) {
+ list.add(new SysDictData(w.getMsg(), w.getCode()));
+ }
+ return list;
+ }
}
--
Gitblit v1.9.3