From ddc0f14384619b9618f26a3f363f679833a68b3d Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期三, 16 四月 2025 09:51:32 +0800
Subject: [PATCH] 自动化产线集成模块添加数据查询
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java | 71 ++++++-----------------------------
1 files changed, 13 insertions(+), 58 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 e30c5b6..51e38a0 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
@@ -15,6 +15,7 @@
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.service.IEamRepairOrderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,6 +23,7 @@
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;
@@ -44,28 +46,21 @@
@Resource
private IEamRepairOrderService eamRepairOrderService;
- @Resource
- private ISysBusinessCodeRuleService businessCodeRuleService;
-
- @Resource
- private IEamReportRepairService eamReportRepairService;
-
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param eamRepairOrder
+ * @param eamRepairOrderQuery
* @param pageNo
* @param pageSize
* @return
*/
- @AutoLog(value = "缁翠慨宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "缁翠慨宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes = "缁翠慨宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(EamRepairOrder eamRepairOrder,
+ public Result<?> queryPageList(EamRepairOrderQuery eamRepairOrderQuery,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Page<EamRepairOrder> page = new Page<EamRepairOrder>(pageNo, pageSize);
- IPage<EamRepairOrder> pageList = eamRepairOrderService.pageList(page, eamRepairOrder);
+ IPage<EamRepairOrder> pageList = eamRepairOrderService.pageList(page, eamRepairOrderQuery);
return Result.OK(pageList);
}
@@ -82,63 +77,23 @@
if (StringUtils.isBlank(eamRepairOrder.getReportId())) {
return Result.error("棰嗗彇澶辫触,璇烽�夋嫨缁翠慨璁板綍锛�");
}
- String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.REPAIR_ORDER_CODE_RULE);
- eamRepairOrder.setRepairCode(codeSeq);
- EamReportRepair eamReportRepair = eamReportRepairService.getById(eamRepairOrder.getReportId());
- eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
- eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
- eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_REPAIR.name());
- eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
- eamRepairOrder.setActualStartTime(DateUtils.getNow());
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- eamRepairOrder.setRepairer(user.getRealname());
- eamReportRepairService.updateById(eamReportRepair);
- eamRepairOrderService.save(eamRepairOrder);
- // TODO 鍚姩娴佺▼
-
+ eamRepairOrderService.saveRepairOrder(eamRepairOrder);
return Result.OK("娣诲姞鎴愬姛锛�");
}
/**
- * 缂栬緫
+ * 鎵ц缁翠慨
*
* @param eamRepairOrder
* @return
*/
- @AutoLog(value = "缁翠慨宸ュ崟-缂栬緫")
- @ApiOperation(value = "缁翠慨宸ュ崟-缂栬緫", notes = "缁翠慨宸ュ崟-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<?> edit(@RequestBody EamRepairOrder eamRepairOrder) {
- eamRepairOrderService.updateById(eamRepairOrder);
- return Result.OK("缂栬緫鎴愬姛!");
- }
+ @AutoLog(value = "缁翠慨宸ュ崟-鎵ц")
+ @ApiOperation(value = "缁翠慨宸ュ崟-鎵ц", notes = "缁翠慨宸ュ崟-鎵ц")
+ @PostMapping(value = "/perform")
+ public Result<?> perform(@RequestBody EamRepairOrder eamRepairOrder) {
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "缁翠慨宸ュ崟-閫氳繃id鍒犻櫎")
- @ApiOperation(value = "缁翠慨宸ュ崟-閫氳繃id鍒犻櫎", notes = "缁翠慨宸ュ崟-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
- eamRepairOrderService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "缁翠慨宸ュ崟-鎵归噺鍒犻櫎")
- @ApiOperation(value = "缁翠慨宸ュ崟-鎵归噺鍒犻櫎", notes = "缁翠慨宸ュ崟-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- this.eamRepairOrderService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+// eamRepairOrderService.updateById(eamRepairOrder);
+ return Result.OK("鎵ц鎴愬姛!");
}
/**
--
Gitblit v1.9.3