From bff1768d0a287e7be7a9e7a17690ab44a8729d26 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 11 八月 2025 17:26:12 +0800
Subject: [PATCH] 飞书同步用户/安灯获取产线 用户表增加 飞书用户open_id（后期发送消息标识）
---
src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java b/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
index d712a21..3f2cbac 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
@@ -10,7 +10,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
@@ -25,7 +24,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
@@ -63,16 +61,8 @@
HttpServletRequest req) {
Map<String, String[]> parameterMap = req.getParameterMap();
QueryWrapper<MesProductionWorkOrder> queryWrapper = QueryGenerator.initQueryWrapper(mesProductionWorkOrder, parameterMap);
- String[] startDates = parameterMap.get("startDate");
- String[] endDates = parameterMap.get("endDate");
- if (startDates != null && startDates.length > 0) {
- queryWrapper.ge("work_order_date", startDates[0]);
- }
- if (endDates != null && endDates.length > 0) {
- queryWrapper.le("work_order_date", endDates[0]);
- }
Page<MesProductionWorkOrder> page = new Page<MesProductionWorkOrder>(pageNo, pageSize);
- IPage<MesProductionWorkOrder> pageList = mesProductionWorkOrderService.page(page, queryWrapper);
+ IPage<MesProductionWorkOrder> pageList = mesProductionWorkOrderService.queryPageList(page, parameterMap);
return Result.OK(pageList);
}
@@ -99,8 +89,12 @@
if (!validatePlan(mesProductionWorkOrderList)) {
return Result.error("鎺掍骇璁″垝涓嶅悎鐞嗭紝淇濆瓨澶辫触锛�");
}
- mesProductionWorkOrderList.forEach(item -> item.setWorkOrderStatus(ProductionWorkOrderStatus.NEW.name()));
- mesProductionWorkOrderService.saveBatch(mesProductionWorkOrderList);
+ mesProductionWorkOrderList.forEach(item -> {
+ if (Objects.isNull(item.getId())) {
+ item.setWorkOrderStatus(ProductionWorkOrderStatus.NEW.name());
+ }
+ });
+ mesProductionWorkOrderService.saveOrUpdateBatch(mesProductionWorkOrderList);
return Result.OK("娣诲姞鎴愬姛锛�");
}
--
Gitblit v1.9.3