From b3eabfc54ae08cbce3777aa20142f75cb9d0fb2e Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 四月 2025 15:11:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
index 51e38a0..2378ea9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
@@ -1,32 +1,21 @@
package org.jeecg.modules.eam.controller;
-import java.util.Arrays;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.ReportRepairEnum;
import org.jeecg.modules.eam.entity.EamRepairOrder;
-import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
+import org.jeecg.modules.eam.request.EamRepairOrderRequest;
+import org.jeecg.modules.eam.request.EamRepairOrderResponse;
import org.jeecg.modules.eam.service.IEamRepairOrderService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.modules.eam.service.IEamReportRepairService;
-import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
-import org.jeecg.modules.mdc.util.DateUtils;
-import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -82,18 +71,27 @@
}
/**
- * 鎵ц缁翠慨
+ * 鎴戠殑寰呭姙 鎵ц/瀹℃壒
*
- * @param eamRepairOrder
+ * @param request
* @return
*/
- @AutoLog(value = "缁翠慨宸ュ崟-鎵ц")
- @ApiOperation(value = "缁翠慨宸ュ崟-鎵ц", notes = "缁翠慨宸ュ崟-鎵ц")
+ @AutoLog(value = "缁翠慨宸ュ崟-鎵ц/瀹℃壒")
+ @ApiOperation(value = "缁翠慨宸ュ崟-鎵ц/瀹℃壒", notes = "缁翠慨宸ュ崟-鎵ц/瀹℃壒")
@PostMapping(value = "/perform")
- public Result<?> perform(@RequestBody EamRepairOrder eamRepairOrder) {
-
-// eamRepairOrderService.updateById(eamRepairOrder);
- return Result.OK("鎵ц鎴愬姛!");
+ public Result<?> perform(@RequestBody EamRepairOrderRequest request) {
+ if (request == null) {
+ return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ // 妫�鏌ヨ姹傚弬鏁�
+ if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
+ return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
+ }
+ EamRepairOrder b = eamRepairOrderService.perform(request);
+ if(b == null) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.OK("鎿嶄綔鎴愬姛!");
}
/**
@@ -106,7 +104,7 @@
@ApiOperation(value = "缁翠慨宸ュ崟-閫氳繃id鏌ヨ", notes = "缁翠慨宸ュ崟-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
- EamRepairOrder eamRepairOrder = eamRepairOrderService.getById(id);
+ EamRepairOrderResponse eamRepairOrder = eamRepairOrderService.findById(id);
return Result.OK(eamRepairOrder);
}
--
Gitblit v1.9.3