From 4dda0622ef6e588284dbdb7a155f58b622615e94 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 15 五月 2025 13:33:58 +0800
Subject: [PATCH] art: 设备管理-三保，接口添加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml | 7
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSecondMaintenanceOrderService.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 9
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java | 346 ++++++------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java | 204 +-----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java | 69 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceQuery.java | 23
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 301 ++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceOrderMapper.java | 15
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java | 32 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java | 223 ++++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java | 207 ++++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java | 200 +++++--
13 files changed, 1,071 insertions(+), 569 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java
index 696bed5..f412913 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java
@@ -15,7 +15,6 @@
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder;
import org.jeecg.modules.eam.request.EamSecondMaintenanceQuery;
import org.jeecg.modules.eam.request.EamSecondMaintenanceRequest;
-import org.jeecg.modules.eam.service.IEamSecondMaintenanceOrderDetailService;
import org.jeecg.modules.eam.service.IEamSecondMaintenanceOrderService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,189 +28,188 @@
/**
* @Description: 璁惧浜岀骇淇濆吇
* @Author: jeecg-boot
- * @Date: 2025-04-29
+ * @Date: 2025-04-29
* @Version: V1.0
*/
@Slf4j
-@Api(tags="璁惧浜岀骇淇濆吇")
+@Api(tags = "璁惧浜岀骇淇濆吇")
@RestController
@RequestMapping("/eam/secondMaintenanceOrder")
public class EamSecondMaintenanceOrderController extends JeecgController<EamSecondMaintenanceOrder, IEamSecondMaintenanceOrderService> {
- @Autowired
- private IEamSecondMaintenanceOrderService eamSecondMaintenanceOrderService;
- @Autowired
- private ISysBusinessCodeRuleService businessCodeRuleService;
- @Autowired
- private IEamSecondMaintenanceOrderDetailService secondMaintenanceOrderDetailService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param query
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "璁惧浜岀骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁惧浜岀骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧浜岀骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamSecondMaintenanceQuery query,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
+ @Autowired
+ private IEamSecondMaintenanceOrderService eamSecondMaintenanceOrderService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param query
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "璁惧浜岀骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧浜岀骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧浜岀骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamSecondMaintenanceQuery query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
// QueryWrapper<EamSecondMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamSecondMaintenanceOrder, req.getParameterMap());
- Page<EamSecondMaintenanceOrder> page = new Page<EamSecondMaintenanceOrder>(pageNo, pageSize);
- IPage<EamSecondMaintenanceOrder> pageList = eamSecondMaintenanceOrderService.queryPageList(page, query);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param request
- * @return
- */
- @AutoLog(value = "璁惧浜岀骇淇濆吇-娣诲姞")
- @ApiOperation(value="璁惧浜岀骇淇濆吇-娣诲姞", notes="璁惧浜岀骇淇濆吇-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamSecondMaintenanceRequest request) {
- if (request == null) {
- return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
- }
- if (CollectionUtil.isEmpty(request.getTableDetailList())) {
- return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
- }
- String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.SECOND_MAINTENANCE_CODE_RULE);
- request.setOrderNum(codeSeq);
- request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
- boolean b = eamSecondMaintenanceOrderService.addWeekMaintenance(request);
- if (!b) {
- return Result.error("娣诲姞澶辫触锛�");
- }
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param request
- * @return
- */
- @AutoLog(value = "璁惧浜岀骇淇濆吇-缂栬緫")
- @ApiOperation(value="璁惧浜岀骇淇濆吇-缂栬緫", notes="璁惧浜岀骇淇濆吇-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamSecondMaintenanceRequest request) {
- if (request == null) {
- return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
- }
- if (CollectionUtil.isEmpty(request.getTableDetailList())) {
- return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
- }
- boolean b = eamSecondMaintenanceOrderService.editWeekMaintenance(request);
- if (!b) {
- return Result.error("缂栬緫澶辫触锛�");
- }
- return Result.OK("缂栬緫鎴愬姛!");
- }
+ Page<EamSecondMaintenanceOrder> page = new Page<EamSecondMaintenanceOrder>(pageNo, pageSize);
+ IPage<EamSecondMaintenanceOrder> pageList = eamSecondMaintenanceOrderService.queryPageList(page, query);
+ return Result.OK(pageList);
+ }
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁惧浜岀骇淇濆吇-閫氳繃id鏌ヨ")
- @ApiOperation(value="璁惧浜岀骇淇濆吇-閫氳繃id鏌ヨ", notes="璁惧浜岀骇淇濆吇-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamSecondMaintenanceOrder eamSecondMaintenanceOrder = eamSecondMaintenanceOrderService.getById(id);
- return Result.OK(eamSecondMaintenanceOrder);
- }
+ /**
+ * 娣诲姞
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧浜岀骇淇濆吇-娣诲姞")
+ @ApiOperation(value = "璁惧浜岀骇淇濆吇-娣诲姞", notes = "璁惧浜岀骇淇濆吇-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamSecondMaintenanceRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.SECOND_MAINTENANCE_CODE_RULE);
+ request.setOrderNum(codeSeq);
+ request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+ boolean b = eamSecondMaintenanceOrderService.addMaintenance(request);
+ if (!b) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
- /**
- * 閫氳繃id浣滃簾
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁惧浜岀骇淇濆吇-浣滃簾")
- @ApiOperation(value = "璁惧浜岀骇淇濆吇-浣滃簾", notes = "璁惧浜岀骇淇濆吇-浣滃簾")
- @DeleteMapping(value = "/abolish")
- public Result<?> abolish(@RequestParam(name = "id", required = true) String id) {
- EamSecondMaintenanceOrder entity = eamSecondMaintenanceOrderService.getById(id);
- if (entity == null) {
- return Result.error("瑕佷綔搴熺殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
- }
- if (!SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
- return Result.error("璇ョ姸鎬佺殑鏁版嵁涓嶅厑璁歌繘琛屼綔搴燂紒");
- }
- entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.ABOLISH.name());
- eamSecondMaintenanceOrderService.updateById(entity);
- return Result.OK("浣滃簾鎴愬姛!");
- }
+ /**
+ * 缂栬緫
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧浜岀骇淇濆吇-缂栬緫")
+ @ApiOperation(value = "璁惧浜岀骇淇濆吇-缂栬緫", notes = "璁惧浜岀骇淇濆吇-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamSecondMaintenanceRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ boolean b = eamSecondMaintenanceOrderService.editMaintenance(request);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
- /**
- * 閫氳繃id棰嗗彇
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁惧浜岀骇淇濆吇-棰嗗彇")
- @ApiOperation(value = "璁惧浜岀骇淇濆吇-棰嗗彇", notes = "璁惧浜岀骇淇濆吇-棰嗗彇")
- @GetMapping(value = "/collect")
- public Result<?> collect(@RequestParam(name = "id", required = true) String id) {
- boolean b = eamSecondMaintenanceOrderService.collect(id);
- if (!b) {
- Result.OK("棰嗗彇澶辫触!");
- }
- return Result.OK("棰嗗彇鎴愬姛!");
- }
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧浜岀骇淇濆吇-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁惧浜岀骇淇濆吇-閫氳繃id鏌ヨ", notes = "璁惧浜岀骇淇濆吇-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamSecondMaintenanceOrder eamSecondMaintenanceOrder = eamSecondMaintenanceOrderService.getById(id);
+ return Result.OK(eamSecondMaintenanceOrder);
+ }
- /**
- * 閫氳繃id鎵归噺浣滃簾
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
- @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾", notes = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
- @DeleteMapping(value = "/abolishBatch")
- public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
- List<String> list = Arrays.asList(ids.split(","));
- AtomicInteger i = new AtomicInteger();
- list.forEach(id -> {
- EamSecondMaintenanceOrder entity = eamSecondMaintenanceOrderService.getById(id);
- if (entity != null && SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
- entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.ABOLISH.name());
- eamSecondMaintenanceOrderService.updateById(entity);
- i.getAndIncrement();
- }
- });
- return Result.OK("鎵归噺浣滃簾鎴愬姛 " + i.get() + " 鏉″伐鍗曪紒");
- }
+ /**
+ * 閫氳繃id浣滃簾
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧浜岀骇淇濆吇-浣滃簾")
+ @ApiOperation(value = "璁惧浜岀骇淇濆吇-浣滃簾", notes = "璁惧浜岀骇淇濆吇-浣滃簾")
+ @DeleteMapping(value = "/abolish")
+ public Result<?> abolish(@RequestParam(name = "id", required = true) String id) {
+ EamSecondMaintenanceOrder entity = eamSecondMaintenanceOrderService.getById(id);
+ if (entity == null) {
+ return Result.error("瑕佷綔搴熺殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ return Result.error("璇ョ姸鎬佺殑鏁版嵁涓嶅厑璁歌繘琛屼綔搴燂紒");
+ }
+ entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.ABOLISH.name());
+ eamSecondMaintenanceOrderService.updateById(entity);
+ return Result.OK("浣滃簾鎴愬姛!");
+ }
- /**
- * 閫氳繃id鎵归噺棰嗗彇
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
- @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇", notes = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
- @DeleteMapping(value = "/collectBatch")
- public Result<?> collectBatch(@RequestParam(name = "ids", required = true) String ids) {
- List<String> list = Arrays.asList(ids.split(","));
- AtomicInteger i = new AtomicInteger();
- list.forEach(id -> {
- EamSecondMaintenanceOrder entity = eamSecondMaintenanceOrderService.getById(id);
- if (entity != null && SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
- boolean b = eamSecondMaintenanceOrderService.collect(id);
- if (b) {
- i.getAndIncrement();
- }
- }
- });
- return Result.OK("鎵归噺棰嗗彇鎴愬姛 " + i.get() + " 鏉″伐鍗曪紒");
- }
+ /**
+ * 閫氳繃id棰嗗彇
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧浜岀骇淇濆吇-棰嗗彇")
+ @ApiOperation(value = "璁惧浜岀骇淇濆吇-棰嗗彇", notes = "璁惧浜岀骇淇濆吇-棰嗗彇")
+ @GetMapping(value = "/collect")
+ public Result<?> collect(@RequestParam(name = "id", required = true) String id) {
+ boolean b = eamSecondMaintenanceOrderService.collect(id);
+ if (!b) {
+ Result.OK("棰嗗彇澶辫触!");
+ }
+ return Result.OK("棰嗗彇鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鎵归噺浣滃簾
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾", notes = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
+ @DeleteMapping(value = "/abolishBatch")
+ public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ AtomicInteger i = new AtomicInteger();
+ list.forEach(id -> {
+ EamSecondMaintenanceOrder entity = eamSecondMaintenanceOrderService.getById(id);
+ if (entity != null && SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.ABOLISH.name());
+ eamSecondMaintenanceOrderService.updateById(entity);
+ i.getAndIncrement();
+ }
+ });
+ return Result.OK("鎵归噺浣滃簾鎴愬姛 " + i.get() + " 鏉″伐鍗曪紒");
+ }
+
+ /**
+ * 閫氳繃id鎵归噺棰嗗彇
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇", notes = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
+ @DeleteMapping(value = "/collectBatch")
+ public Result<?> collectBatch(@RequestParam(name = "ids", required = true) String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ AtomicInteger i = new AtomicInteger();
+ list.forEach(id -> {
+ EamSecondMaintenanceOrder entity = eamSecondMaintenanceOrderService.getById(id);
+ if (entity != null && SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ boolean b = eamSecondMaintenanceOrderService.collect(id);
+ if (b) {
+ i.getAndIncrement();
+ }
+ }
+ });
+ return Result.OK("鎵归噺棰嗗彇鎴愬姛 " + i.get() + " 鏉″伐鍗曪紒");
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
index 2406e16..790cd00 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
@@ -1,6 +1,6 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -9,16 +9,23 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
+import org.jeecg.modules.eam.constant.ThirdMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceQuery;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
- /**
+/**
* @Description: 璁惧涓夌骇淇濆吇
* @Author: jeecg-boot
* @Date: 2025-04-29
@@ -27,89 +34,84 @@
@Slf4j
@Api(tags="璁惧涓夌骇淇濆吇")
@RestController
-@RequestMapping("/eam/eamThirdMaintenanceOrder")
+@RequestMapping("/eam/thirdMaintenanceOrder")
public class EamThirdMaintenanceOrderController extends JeecgController<EamThirdMaintenanceOrder, IEamThirdMaintenanceOrderService> {
@Autowired
private IEamThirdMaintenanceOrderService eamThirdMaintenanceOrderService;
-
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param eamThirdMaintenanceOrder
+ * @param query
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(EamThirdMaintenanceOrder eamThirdMaintenanceOrder,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ public Result<?> queryPageList(EamThirdMaintenanceQuery query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamThirdMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamThirdMaintenanceOrder, req.getParameterMap());
Page<EamThirdMaintenanceOrder> page = new Page<EamThirdMaintenanceOrder>(pageNo, pageSize);
- IPage<EamThirdMaintenanceOrder> pageList = eamThirdMaintenanceOrderService.page(page, queryWrapper);
+ IPage<EamThirdMaintenanceOrder> pageList = eamThirdMaintenanceOrderService.queryPageList(page, query);
return Result.OK(pageList);
}
-
+
/**
* 娣诲姞
*
- * @param eamThirdMaintenanceOrder
+ * @param request
* @return
*/
@AutoLog(value = "璁惧涓夌骇淇濆吇-娣诲姞")
- @ApiOperation(value="璁惧涓夌骇淇濆吇-娣诲姞", notes="璁惧涓夌骇淇濆吇-娣诲姞")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-娣诲姞", notes = "璁惧涓夌骇淇濆吇-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamThirdMaintenanceOrder eamThirdMaintenanceOrder) {
- eamThirdMaintenanceOrderService.save(eamThirdMaintenanceOrder);
+ public Result<?> add(@RequestBody EamThirdMaintenanceRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.THIRD_MAINTENANCE_CODE_RULE);
+ request.setOrderNum(codeSeq);
+ request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+ boolean b = eamThirdMaintenanceOrderService.addMaintenance(request);
+ if (!b) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
-
+
/**
* 缂栬緫
*
- * @param eamThirdMaintenanceOrder
+ * @param request
* @return
*/
@AutoLog(value = "璁惧涓夌骇淇濆吇-缂栬緫")
- @ApiOperation(value="璁惧涓夌骇淇濆吇-缂栬緫", notes="璁惧涓夌骇淇濆吇-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamThirdMaintenanceOrder eamThirdMaintenanceOrder) {
- eamThirdMaintenanceOrderService.updateById(eamThirdMaintenanceOrder);
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-缂栬緫", notes = "璁惧涓夌骇淇濆吇-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamThirdMaintenanceRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ boolean b = eamThirdMaintenanceOrderService.editMaintenance(request);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
return Result.OK("缂栬緫鎴愬姛!");
}
-
- /**
- * 閫氳繃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) {
- eamThirdMaintenanceOrderService.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.eamThirdMaintenanceOrderService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
- }
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -117,10 +119,96 @@
* @return
*/
@AutoLog(value = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ")
- @ApiOperation(value="璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ", notes="璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ", notes = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamThirdMaintenanceOrder eamThirdMaintenanceOrder = eamThirdMaintenanceOrderService.getById(id);
- return Result.OK(eamThirdMaintenanceOrder);
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamThirdMaintenanceOrder order = eamThirdMaintenanceOrderService.getById(id);
+ return Result.OK(order);
+ }
+
+ /**
+ * 閫氳繃id浣滃簾
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧涓夌骇淇濆吇-浣滃簾")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-浣滃簾", notes = "璁惧涓夌骇淇濆吇-浣滃簾")
+ @DeleteMapping(value = "/abolish")
+ public Result<?> abolish(@RequestParam(name = "id", required = true) String id) {
+ EamThirdMaintenanceOrder entity = eamThirdMaintenanceOrderService.getById(id);
+ if (entity == null) {
+ return Result.error("瑕佷綔搴熺殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ return Result.error("璇ョ姸鎬佺殑鏁版嵁涓嶅厑璁歌繘琛屼綔搴燂紒");
+ }
+ entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.ABOLISH.name());
+ eamThirdMaintenanceOrderService.updateById(entity);
+ return Result.OK("浣滃簾鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id棰嗗彇
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧涓夌骇淇濆吇-棰嗗彇")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-棰嗗彇", notes = "璁惧涓夌骇淇濆吇-棰嗗彇")
+ @GetMapping(value = "/collect")
+ public Result<?> collect(@RequestParam(name = "id", required = true) String id) {
+ boolean b = eamThirdMaintenanceOrderService.collect(id);
+ if (!b) {
+ Result.OK("棰嗗彇澶辫触!");
+ }
+ return Result.OK("棰嗗彇鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鎵归噺浣滃簾
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾", notes = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
+ @DeleteMapping(value = "/abolishBatch")
+ public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ AtomicInteger i = new AtomicInteger();
+ list.forEach(id -> {
+ EamThirdMaintenanceOrder entity = eamThirdMaintenanceOrderService.getById(id);
+ if (entity != null && ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.ABOLISH.name());
+ eamThirdMaintenanceOrderService.updateById(entity);
+ i.getAndIncrement();
+ }
+ });
+ return Result.OK("鎵归噺浣滃簾鎴愬姛 " + i.get() + " 鏉″伐鍗曪紒");
+ }
+
+ /**
+ * 閫氳繃id鎵归噺棰嗗彇
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇", notes = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
+ @DeleteMapping(value = "/collectBatch")
+ public Result<?> collectBatch(@RequestParam(name = "ids", required = true) String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ AtomicInteger i = new AtomicInteger();
+ list.forEach(id -> {
+ EamThirdMaintenanceOrder entity = eamThirdMaintenanceOrderService.getById(id);
+ if (entity != null && ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ boolean b = eamThirdMaintenanceOrderService.collect(id);
+ if (b) {
+ i.getAndIncrement();
+ }
+ }
+ });
+ return Result.OK("鎵归噺棰嗗彇鎴愬姛 " + i.get() + " 鏉″伐鍗曪紒");
}
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java
index e757b8c..94ca430 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderDetailController.java
@@ -1,167 +1,71 @@
package org.jeecg.modules.eam.controller;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
-import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderDetailService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
+import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
- /**
+import java.util.List;
+
+/**
* @Description: 璁惧涓夌骇淇濆吇鏄庣粏
* @Author: jeecg-boot
- * @Date: 2025-04-29
+ * @Date: 2025-04-29
* @Version: V1.0
*/
@Slf4j
-@Api(tags="璁惧涓夌骇淇濆吇鏄庣粏")
+@Api(tags = "璁惧涓夌骇淇濆吇鏄庣粏")
@RestController
-@RequestMapping("/eam/eamThirdMaintenanceOrderDetail")
+@RequestMapping("/eam/thirdMaintenanceOrderDetail")
public class EamThirdMaintenanceOrderDetailController extends JeecgController<EamThirdMaintenanceOrderDetail, IEamThirdMaintenanceOrderDetailService> {
- @Autowired
- private IEamThirdMaintenanceOrderDetailService eamThirdMaintenanceOrderDetailService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamThirdMaintenanceOrderDetail
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "璁惧涓夌骇淇濆吇鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁惧涓夌骇淇濆吇鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧涓夌骇淇濆吇鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamThirdMaintenanceOrderDetail eamThirdMaintenanceOrderDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamThirdMaintenanceOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamThirdMaintenanceOrderDetail, req.getParameterMap());
- Page<EamThirdMaintenanceOrderDetail> page = new Page<EamThirdMaintenanceOrderDetail>(pageNo, pageSize);
- IPage<EamThirdMaintenanceOrderDetail> pageList = eamThirdMaintenanceOrderDetailService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamThirdMaintenanceOrderDetail
- * @return
- */
- @AutoLog(value = "璁惧涓夌骇淇濆吇鏄庣粏-娣诲姞")
- @ApiOperation(value="璁惧涓夌骇淇濆吇鏄庣粏-娣诲姞", notes="璁惧涓夌骇淇濆吇鏄庣粏-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamThirdMaintenanceOrderDetail eamThirdMaintenanceOrderDetail) {
- eamThirdMaintenanceOrderDetailService.save(eamThirdMaintenanceOrderDetail);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamThirdMaintenanceOrderDetail
- * @return
- */
- @AutoLog(value = "璁惧涓夌骇淇濆吇鏄庣粏-缂栬緫")
- @ApiOperation(value="璁惧涓夌骇淇濆吇鏄庣粏-缂栬緫", notes="璁惧涓夌骇淇濆吇鏄庣粏-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamThirdMaintenanceOrderDetail eamThirdMaintenanceOrderDetail) {
- eamThirdMaintenanceOrderDetailService.updateById(eamThirdMaintenanceOrderDetail);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃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) {
- eamThirdMaintenanceOrderDetailService.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.eamThirdMaintenanceOrderDetailService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁惧涓夌骇淇濆吇鏄庣粏-閫氳繃id鏌ヨ")
- @ApiOperation(value="璁惧涓夌骇淇濆吇鏄庣粏-閫氳繃id鏌ヨ", notes="璁惧涓夌骇淇濆吇鏄庣粏-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamThirdMaintenanceOrderDetail eamThirdMaintenanceOrderDetail = eamThirdMaintenanceOrderDetailService.getById(id);
- return Result.OK(eamThirdMaintenanceOrderDetail);
- }
+ @Autowired
+ private IEamThirdMaintenanceOrderDetailService eamThirdMaintenanceOrderDetailService;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamThirdMaintenanceOrderDetail
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamThirdMaintenanceOrderDetail eamThirdMaintenanceOrderDetail) {
- return super.exportXls(request, eamThirdMaintenanceOrderDetail, EamThirdMaintenanceOrderDetail.class, "璁惧涓夌骇淇濆吇鏄庣粏");
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param orderId
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍛ㄤ繚宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(@RequestParam("orderId") String orderId,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ LambdaQueryWrapper<EamThirdMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamThirdMaintenanceOrderDetail::getOrderId, orderId);
+ queryWrapper.orderByAsc(EamThirdMaintenanceOrderDetail::getItemCode);
+ Page<EamThirdMaintenanceOrderDetail> page = new Page<>(pageNo, pageSize);
+ IPage<EamThirdMaintenanceOrderDetail> pageList = eamThirdMaintenanceOrderDetailService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamThirdMaintenanceOrderDetail.class);
- }
-
+ /**
+ * 涓�娆″姞杞�
+ *
+ * @param orderId
+ * @return
+ */
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟鏄庣粏-涓嶅垎椤靛垪琛ㄦ煡璇�", notes = "鍛ㄤ繚宸ュ崟鏄庣粏-涓嶅垎椤靛垪琛ㄦ煡璇�")
+ @GetMapping(value = "/queryList")
+ public Result<?> queryList(@RequestParam("orderId") String orderId) {
+ LambdaQueryWrapper<EamThirdMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamThirdMaintenanceOrderDetail::getOrderId, orderId);
+ queryWrapper.orderByAsc(EamThirdMaintenanceOrderDetail::getItemCode);
+ List<EamThirdMaintenanceOrderDetail> list = eamThirdMaintenanceOrderDetailService.list(queryWrapper);
+ return Result.OK(list);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
index 57cc814..81095c5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
@@ -16,106 +16,147 @@
import java.io.Serializable;
import java.util.Date;
+
/**
* @Description: 璁惧浜岀骇淇濆吇
* @Author: jeecg-boot
- * @Date: 2025-04-29
+ * @Date: 2025-04-29
* @Version: V1.0
*/
@Data
@TableName("eam_second_maintenance_order")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_second_maintenance_order瀵硅薄", description="璁惧浜岀骇淇濆吇")
+@ApiModel(value = "eam_second_maintenance_order瀵硅薄", description = "璁惧浜岀骇淇濆吇")
public class EamSecondMaintenanceOrder implements Serializable {
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
- /**宸ュ崟鍙�*/
- @Excel(name = "宸ュ崟鍙�", width = 15)
- @ApiModelProperty(value = "宸ュ崟鍙�")
- private String orderNum;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
- @ApiModelProperty(value = "璁惧ID")
- private String equipmentId;
- /**鏍囧噯ID*/
- @Excel(name = "鏍囧噯ID", width = 15)
- @ApiModelProperty(value = "鏍囧噯ID")
- @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
- private String standardId;
- /**璁″垝淇濆吇鏃ユ湡*/
- @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date maintenanceDate;
- /**瀹為檯寮�濮嬫椂闂�*/
- @ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date actualStartTime;
- /**瀹為檯缁撴潫鏃堕棿*/
- @ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date actualEndTime;
- /**淇濆吇浜�*/
- @Excel(name = "淇濆吇浜�", width = 15)
- @ApiModelProperty(value = "淇濆吇浜�")
- @Dict(dicCode = "sys_user, realname, username")
- private String operator;
- /**淇濆吇鐘舵��*/
- @Excel(name = "淇濆吇鐘舵��", width = 15)
- @ApiModelProperty(value = "淇濆吇鐘舵��")
- @Dict(dicCode = "second_maintenance_status")
- private String maintenanceStatus;
- /**鍒涘缓鏂瑰紡*/
- @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
- @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
- @Dict(dicCode = "order_creation_method")
- private String creationMethod;
- /**缁翠慨缁勯暱纭*/
- @Excel(name = "缁翠慨缁勯暱纭", width = 15)
- @ApiModelProperty(value = "缁翠慨缁勯暱纭")
- @Dict(dicCode = "sys_user, realname, username")
- private String confirmUser;
- /**纭鎰忚*/
- @ApiModelProperty(value = "纭鎰忚")
- private String confirmComment;
- /**纭鏃堕棿*/
- @ApiModelProperty(value = "纭鏃堕棿")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date confirmTime;
- /**淇濆吇涓婁紶鍥剧墖*/
- @Excel(name = "淇濆吇涓婁紶鍥剧墖", width = 15)
- @ApiModelProperty(value = "淇濆吇涓婁紶鍥剧墖")
- private String imageFiles;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- //鍒楄〃灞曠ず
- @TableField(exist = false)
- private String equipmentCode;
- @TableField(exist = false)
- private String equipmentName;
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private Integer delFlag;
+ /**
+ * 宸ュ崟鍙�
+ */
+ @Excel(name = "宸ュ崟鍙�", width = 15)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String orderNum;
+ /**
+ * 璁惧ID
+ */
+ @Excel(name = "璁惧ID", width = 15)
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**
+ * 鏍囧噯ID
+ */
+ @Excel(name = "鏍囧噯ID", width = 15)
+ @ApiModelProperty(value = "鏍囧噯ID")
+ @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
+ private String standardId;
+ /**
+ * 璁″垝淇濆吇鏃ユ湡
+ */
+ @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDate;
+ /**
+ * 瀹為檯寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualStartTime;
+ /**
+ * 瀹為檯缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualEndTime;
+ /**
+ * 淇濆吇浜�
+ */
+ @Excel(name = "淇濆吇浜�", width = 15)
+ @ApiModelProperty(value = "淇濆吇浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String operator;
+ /**
+ * 淇濆吇鐘舵��
+ */
+ @Excel(name = "淇濆吇鐘舵��", width = 15)
+ @ApiModelProperty(value = "淇濆吇鐘舵��")
+ @Dict(dicCode = "second_maintenance_status")
+ private String maintenanceStatus;
+ /**
+ * 鍒涘缓鏂瑰紡
+ */
+ @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
+ @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ @Dict(dicCode = "order_creation_method")
+ private String creationMethod;
+ /**
+ * 缁翠慨缁勯暱纭
+ */
+ @Excel(name = "缁翠慨缁勯暱纭", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱纭")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String confirmUser;
+ /**
+ * 纭鎰忚
+ */
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /**
+ * 纭鏃堕棿
+ */
+ @ApiModelProperty(value = "纭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+ /**
+ * 淇濆吇涓婁紶鍥剧墖
+ */
+ @Excel(name = "淇濆吇涓婁紶鍥剧墖", width = 15)
+ @ApiModelProperty(value = "淇濆吇涓婁紶鍥剧墖")
+ private String imageFiles;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
index 9281282..b1200b5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -9,120 +10,158 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
+
/**
* @Description: 璁惧涓夌骇淇濆吇
* @Author: jeecg-boot
- * @Date: 2025-04-29
+ * @Date: 2025-04-29
* @Version: V1.0
*/
@Data
@TableName("eam_third_maintenance_order")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_third_maintenance_order瀵硅薄", description="璁惧涓夌骇淇濆吇")
+@ApiModel(value = "eam_third_maintenance_order瀵硅薄", description = "璁惧涓夌骇淇濆吇")
public class EamThirdMaintenanceOrder implements Serializable {
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @Excel(name = "鍒涘缓浜�", width = 15)
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
+ @Excel(name = "鍒涘缓浜�", width = 15)
@ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @Excel(name = "鍒涘缓鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @Excel(name = "鏇存柊浜�", width = 15)
@ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @Excel(name = "鏇存柊鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ private Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
@ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
- /**宸ュ崟鍙�*/
- @Excel(name = "宸ュ崟鍙�", width = 15)
+ private Integer delFlag;
+ /**
+ * 宸ュ崟鍙�
+ */
+ @Excel(name = "宸ュ崟鍙�", width = 15)
@ApiModelProperty(value = "宸ュ崟鍙�")
- private String orderNum;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
+ private String orderNum;
+ /**
+ * 璁惧ID
+ */
+ @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
- private String equipmentId;
- /**鏍囧噯ID*/
- @Excel(name = "鏍囧噯ID", width = 15)
+ private String equipmentId;
+ /**
+ * 鏍囧噯ID
+ */
+ @Excel(name = "鏍囧噯ID", width = 15)
@ApiModelProperty(value = "鏍囧噯ID")
- private String standardId;
- /**璁″垝寮�濮嬫椂闂�*/
- @Excel(name = "璁″垝寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
- private Date planStartTime;
- /**璁″垝缁撴潫鏃堕棿*/
- @Excel(name = "璁″垝缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
- private Date planEndTime;
- /**瀹為檯寮�濮嬫椂闂�*/
- @Excel(name = "瀹為檯寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
+ private String standardId;
+ /**
+ * 璁″垝淇濆吇鏃ユ湡
+ */
+ @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDate;
+ /**
+ * 瀹為檯寮�濮嬫椂闂�
+ */
+ @Excel(name = "瀹為檯寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
- private Date actualStartTime;
- /**瀹為檯缁撴潫鏃堕棿*/
- @Excel(name = "瀹為檯缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date actualStartTime;
+ /**
+ * 瀹為檯缁撴潫鏃堕棿
+ */
+ @Excel(name = "瀹為檯缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
- private Date actualEndTime;
- /**淇濆吇浜�*/
- @Excel(name = "淇濆吇浜�", width = 15)
+ private Date actualEndTime;
+ /**
+ * 淇濆吇浜�
+ */
+ @Excel(name = "淇濆吇浜�", width = 15)
@ApiModelProperty(value = "淇濆吇浜�")
- private String operator;
- /**淇濆吇鐘舵��*/
- @Excel(name = "淇濆吇鐘舵��", width = 15)
+ @Dict(dicCode = "sys_user, realname, username")
+ private String operator;
+ /**
+ * 淇濆吇鐘舵��
+ */
+ @Excel(name = "淇濆吇鐘舵��", width = 15)
@ApiModelProperty(value = "淇濆吇鐘舵��")
- private String maintenanceStatus;
- /**鍒涘缓鏂瑰紡*/
- @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
+ @Dict(dicCode = "third_maintenance_status")
+ private String maintenanceStatus;
+ /**
+ * 鍒涘缓鏂瑰紡
+ */
+ @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
- private String creationMethod;
- /**璁惧绠＄悊鍛樼‘璁�*/
- @Excel(name = "璁惧绠＄悊鍛樼‘璁�", width = 15)
+ @Dict(dicCode = "order_creation_method")
+ private String creationMethod;
+ /**
+ * 璁惧绠＄悊鍛樼‘璁�
+ */
+ @Excel(name = "璁惧绠＄悊鍛樼‘璁�", width = 15)
@ApiModelProperty(value = "璁惧绠＄悊鍛樼‘璁�")
- private String confirmUser;
- /**纭鏃堕棿*/
- @Excel(name = "纭鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String confirmUser;
+ /**
+ * 纭鎰忚
+ */
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /**
+ * 纭鏃堕棿
+ */
+ @Excel(name = "纭鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "纭鏃堕棿")
- private Date confirmTime;
- /**纭鐘舵��*/
- @Excel(name = "纭鐘舵��", width = 15)
- @ApiModelProperty(value = "纭鐘舵��")
- private String confirmStatus;
- /**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
- @Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧", width = 15)
- @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
- private String imageFiles;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
+ private Date confirmTime;
+ /**
+ * 淇濆吇涓婁紶鍥剧墖
+ */
+ @Excel(name = "淇濆吇涓婁紶鍥剧墖", width = 15)
+ @ApiModelProperty(value = "淇濆吇涓婁紶鍥剧墖")
+ private String imageFiles;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
- private String remark;
+ private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceOrderMapper.java
index b834b01..2a8698d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceOrderMapper.java
@@ -1,14 +1,27 @@
package org.jeecg.modules.eam.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
/**
* @Description: 璁惧涓夌骇淇濆吇
* @Author: jeecg-boot
- * @Date: 2025-04-29
+ * @Date: 2025-04-29
* @Version: V1.0
*/
public interface EamThirdMaintenanceOrderMapper extends BaseMapper<EamThirdMaintenanceOrder> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param queryWrapper
+ * @return
+ */
+ IPage<EamThirdMaintenanceOrder> queryPageList(Page<EamThirdMaintenanceOrder> page, @Param(Constants.WRAPPER) QueryWrapper<EamThirdMaintenanceOrder> queryWrapper);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
index d92ce68..ed3c21e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper">
+ <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder">
+ select wmo.*, e.equipment_code, e.equipment_name
+ from eam_second_maintenance_order wmo
+ inner join eam_equipment e
+ on wmo.equipment_id = e.id
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceQuery.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceQuery.java
new file mode 100644
index 0000000..eb62db5
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceQuery.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.eam.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class EamThirdMaintenanceQuery {
+ private String orderNum;
+ private String equipmentId;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDateBegin;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDateEnd;
+ private String maintenanceStatus;
+
+ private String column;
+ private String order;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
new file mode 100644
index 0000000..5cdd7ce
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
@@ -0,0 +1,69 @@
+package org.jeecg.modules.eam.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.api.vo.FileUploadResult;
+import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
+import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="涓変繚瀵硅薄", description="涓変繚")
+public class EamThirdMaintenanceRequest extends FlowTaskVo implements Serializable {
+
+ /**涓婚敭*/
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**宸ュ崟鍙�*/
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String orderNum;
+ /**璁惧ID*/
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**鏍囧噯ID*/
+ @ApiModelProperty(value = "鏍囧噯ID")
+ private String standardId;
+ /**淇濆吇鏃ユ湡*/
+ @ApiModelProperty(value = "淇濆吇鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDate;
+ /**淇濆吇浜�*/
+ @ApiModelProperty(value = "淇濆吇浜�")
+ private String operator;
+ /**淇濆吇鍥剧墖*/
+ @ApiModelProperty(value = "淇濆吇鍥剧墖")
+ private String imageFiles;
+ /**淇濆吇鍥剧墖*/
+ @ApiModelProperty(value = "淇濆吇鍥剧墖")
+ private List<FileUploadResult> imageFilesResult;
+ /**澶囨敞*/
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**鍒涘缓鏂瑰紡*/
+ @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ private String creationMethod;
+ /**鍒楄〃 淇濆吇椤规槑缁�*/
+ @ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
+ private List<EamThirdMaintenanceOrderDetail> tableDetailList;
+ /**鍒犻櫎 淇濆吇椤规槑缁�*/
+ @ApiModelProperty(value = "鍒犻櫎 淇濆吇椤规槑缁�")
+ private List<EamThirdMaintenanceOrderDetail> removeDetailList;
+
+ //纭鎿嶄綔
+ /**纭鎰忚*/
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ @ApiModelProperty(value = "纭绫诲瀷")
+ private String confirmDealType;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSecondMaintenanceOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSecondMaintenanceOrderService.java
index ac8406b..28a3d7a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSecondMaintenanceOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSecondMaintenanceOrderService.java
@@ -28,14 +28,14 @@
* @param request
* @return
*/
- boolean addWeekMaintenance(EamSecondMaintenanceRequest request);
+ boolean addMaintenance(EamSecondMaintenanceRequest request);
/**
* 缂栬緫
* @param request
* @return
*/
- boolean editWeekMaintenance(EamSecondMaintenanceRequest request);
+ boolean editMaintenance(EamSecondMaintenanceRequest request);
/**
* 宸ュ崟棰嗗彇
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java
index afe3236..b4e656e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.eam.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceQuery;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
/**
* @Description: 璁惧涓夌骇淇濆吇
@@ -11,4 +15,32 @@
*/
public interface IEamThirdMaintenanceOrderService extends IService<EamThirdMaintenanceOrder> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param query
+ * @return
+ */
+ IPage<EamThirdMaintenanceOrder> queryPageList(Page<EamThirdMaintenanceOrder> page, EamThirdMaintenanceQuery query);
+
+ /**
+ * 娣诲姞
+ * @param request
+ * @return
+ */
+ boolean addMaintenance(EamThirdMaintenanceRequest request);
+
+ /**
+ * 缂栬緫
+ * @param request
+ * @return
+ */
+ boolean editMaintenance(EamThirdMaintenanceRequest request);
+
+ /**
+ * 棰嗗彇宸ュ崟
+ * @param id
+ * @return
+ */
+ boolean collect(String id);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index f1d28a2..e292e6a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -15,7 +15,6 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.SecondMaintenanceStatusEnum;
-import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder;
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
@@ -125,7 +124,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean addWeekMaintenance(EamSecondMaintenanceRequest request) {
+ public boolean addMaintenance(EamSecondMaintenanceRequest request) {
EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
if (equipment == null) {
throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
@@ -186,7 +185,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean editWeekMaintenance(EamSecondMaintenanceRequest request) {
+ public boolean editMaintenance(EamSecondMaintenanceRequest request) {
EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
if (equipment == null) {
throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
@@ -195,7 +194,7 @@
if (entity == null) {
throw new JeecgBootException("缂栬緫鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
}
- if (!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ if (!SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
throw new JeecgBootException("鍙湁寰呬繚鍏荤姸鎬佺殑鏁版嵁鎵嶅彲缂栬緫锛�");
}
entity.setMaintenanceDate(request.getMaintenanceDate());
@@ -278,7 +277,7 @@
throw new JeecgBootException("涓嶆槸鎿嶄綔宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒");
}
entity.setOperator(sysUser.getUsername());
- entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
entity.setActualStartTime(new Date());
eamSecondMaintenanceOrderMapper.updateById(entity);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index 26852dd..132c6f6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -1,19 +1,308 @@
package org.jeecg.modules.eam.service.impl;
-import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
-import org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper;
-import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderService;
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.flowable.engine.TaskService;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.DataBaseConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.SecondMaintenanceStatusEnum;
+import org.jeecg.modules.eam.constant.ThirdMaintenanceStatusEnum;
+import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
+import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
+import org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceQuery;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
+import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.service.IFlowDefinitionService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @Description: 璁惧涓夌骇淇濆吇
* @Author: jeecg-boot
- * @Date: 2025-04-29
+ * @Date: 2025-04-29
* @Version: V1.0
*/
@Service
public class EamThirdMaintenanceOrderServiceImpl extends ServiceImpl<EamThirdMaintenanceOrderMapper, EamThirdMaintenanceOrder> implements IEamThirdMaintenanceOrderService {
+ @Resource
+ private EamThirdMaintenanceOrderMapper eamThirdMaintenanceOrderMapper;
+ @Autowired
+ private IEamThirdMaintenanceOrderDetailService thirdMaintenanceOrderDetailService;
+ @Autowired
+ private FlowCommonService flowCommonService;
+ @Autowired
+ private IFlowDefinitionService flowDefinitionService;
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
+ @Autowired
+ private ISysUserService sysUserService;
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
+ @Autowired
+ private IEamReportRepairService eamReportRepairService;
+ @Autowired
+ private IEamEquipmentExtendService eamEquipmentExtendService;
+
+ @Override
+ public IPage<EamThirdMaintenanceOrder> queryPageList(Page<EamThirdMaintenanceOrder> page, EamThirdMaintenanceQuery query) {
+ QueryWrapper<EamThirdMaintenanceOrder> queryWrapper = new QueryWrapper<>();
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return page;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
+ }
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getOrderNum())) {
+ queryWrapper.like("wmo.order_num", query.getOrderNum());
+ }
+ if (StringUtils.isNotBlank(query.getMaintenanceStatus())) {
+ queryWrapper.eq("wmo.maintenance_status", query.getMaintenanceStatus());
+ }
+ if (query.getMaintenanceDateBegin() != null && query.getMaintenanceDateEnd() != null) {
+ queryWrapper.between("wmo.maintenance_date", query.getMaintenanceDateBegin(), query.getMaintenanceDateEnd());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+
+ return eamThirdMaintenanceOrderMapper.queryPageList(page, queryWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean addMaintenance(EamThirdMaintenanceRequest request) {
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
+ }
+ EamThirdMaintenanceOrder order = new EamThirdMaintenanceOrder();
+ order.setOrderNum(request.getOrderNum());
+ order.setEquipmentId(request.getEquipmentId());
+ order.setStandardId(request.getStandardId());
+ order.setMaintenanceDate(request.getMaintenanceDate());
+ order.setOperator(request.getOperator());
+ order.setRemark(request.getRemark());
+ //鐘舵�佸垵濮嬪寲
+ order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
+ order.setCreationMethod(request.getCreationMethod());
+ //鍒犻櫎鏍囪
+ order.setDelFlag(CommonConstant.DEL_FLAG_0);
+ eamThirdMaintenanceOrderMapper.insert(order);
+ //澶勭悊鏄庣粏鏁版嵁
+ if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
+ request.getTableDetailList().forEach(tableDetail -> {
+ tableDetail.setId(null);
+ tableDetail.setOrderId(order.getId());
+ });
+ thirdMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
+ }
+ //鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
+ if (StringUtils.isNotBlank(order.getOperator())) {
+ //鍚姩娴佺▼ TODO
+// flowCommonService.initActBusiness("宸ュ崟鍙�:" + order.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧浜屼繚",
+// order.getId(), "IEamWeekMaintenanceOrderService", "week_maintenance_process", null);
+// Map<String, Object> variables = new HashMap<>();
+// variables.put("dataId", order.getId());
+// if (StrUtil.isEmpty(order.getRemark())) {
+// variables.put("organization", "鏂板鍛ㄤ繚宸ュ崟榛樿鍚姩娴佺▼");
+// variables.put("comment", "鏂板鍛ㄤ繚宸ュ崟榛樿鍚姩娴佺▼");
+// } else {
+// variables.put("organization", order.getRemark());
+// variables.put("comment", order.getRemark());
+// }
+// variables.put("proofreading", true);
+// List<String> usernames = new ArrayList<>();
+// usernames.add(order.getOperator());
+// variables.put("NextAssignee", usernames);
+// Result result = flowDefinitionService.startProcessInstanceByKey("week_maintenance_process", variables);
+// if (result != null) {
+// //鏇存柊鍛ㄤ繚鐘舵��
+// order.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+// order.setActualStartTime(new Date());
+// eamWeekMaintenanceOrderMapper.updateById(order);
+// //鏇存柊璁惧淇濆吇鐘舵��
+// eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
+// return result.isSuccess();
+// }
+ }
+
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean editMaintenance(EamThirdMaintenanceRequest request) {
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
+ }
+ EamThirdMaintenanceOrder entity = eamThirdMaintenanceOrderMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("缂栬緫鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ if (!ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ throw new JeecgBootException("鍙湁寰呬繚鍏荤姸鎬佺殑鏁版嵁鎵嶅彲缂栬緫锛�");
+ }
+ entity.setMaintenanceDate(request.getMaintenanceDate());
+ entity.setOperator(request.getOperator());
+ entity.setRemark(request.getRemark());
+
+ eamThirdMaintenanceOrderMapper.updateById(entity);
+ //澶勭悊璇︽儏
+ if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
+ List<EamThirdMaintenanceOrderDetail> addList = new ArrayList<>();
+ List<EamThirdMaintenanceOrderDetail> updateList = new ArrayList<>();
+ request.getTableDetailList().forEach(tableDetail -> {
+ tableDetail.setOrderId(entity.getId());
+ if (tableDetail.getId() == null) {
+ addList.add(tableDetail);
+ } else {
+ updateList.add(tableDetail);
+ }
+ });
+ if (CollectionUtil.isNotEmpty(addList)) {
+ thirdMaintenanceOrderDetailService.saveBatch(addList);
+ }
+ if (CollectionUtil.isNotEmpty(updateList)) {
+ thirdMaintenanceOrderDetailService.updateBatchById(updateList);
+ }
+ }
+ if (CollectionUtil.isNotEmpty(request.getRemoveDetailList())) {
+ List<String> ids = request.getRemoveDetailList().stream().map(EamThirdMaintenanceOrderDetail::getId).collect(Collectors.toList());
+ thirdMaintenanceOrderDetailService.removeBatchByIds(ids);
+ }
+ //鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
+ if (StringUtils.isNotBlank(entity.getOperator())) {
+ //鍚姩娴佺▼ TODO
+// flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧鍛ㄤ繚",
+// entity.getId(), "IEamWeekMaintenanceOrderService", "week_maintenance_process", null);
+// Map<String, Object> variables = new HashMap<>();
+// variables.put("dataId", entity.getId());
+// if (StrUtil.isEmpty(entity.getRemark())) {
+// variables.put("organization", "鏂板鍛ㄤ繚宸ュ崟榛樿鍚姩娴佺▼");
+// variables.put("comment", "鏂板鍛ㄤ繚宸ュ崟榛樿鍚姩娴佺▼");
+// } else {
+// variables.put("organization", entity.getRemark());
+// variables.put("comment", entity.getRemark());
+// }
+// variables.put("proofreading", true);
+// List<String> usernames = new ArrayList<>();
+// usernames.add(entity.getOperator());
+// variables.put("NextAssignee", usernames);
+// Result result = flowDefinitionService.startProcessInstanceByKey("week_maintenance_process", variables);
+// if (result != null) {
+// //鏇存柊鍛ㄤ繚鐘舵��
+// entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+// entity.setActualStartTime(new Date());
+// eamWeekMaintenanceOrderMapper.updateById(entity);
+// //鏇存柊璁惧淇濆吇鐘舵��
+// eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
+// return result.isSuccess();
+// }
+
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean collect(String id) {
+ EamThirdMaintenanceOrder entity = eamThirdMaintenanceOrderMapper.selectById(id);
+ if (entity == null) {
+ throw new JeecgBootException("瑕侀鍙栫殑宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囬鍙栵紒");
+ }
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if(sysUser == null || !BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
+ throw new JeecgBootException("涓嶆槸鎿嶄綔宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒");
+ }
+ entity.setOperator(sysUser.getUsername());
+ entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ entity.setActualStartTime(new Date());
+ eamThirdMaintenanceOrderMapper.updateById(entity);
+
+// //鍚姩娴佺▼
+// flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧鍛ㄤ繚",
+// entity.getId(), "IEamWeekMaintenanceOrderService", "week_maintenance_process", null);
+// Map<String, Object> variables = new HashMap<>();
+// variables.put("dataId", entity.getId());
+// if (StrUtil.isEmpty(entity.getRemark())) {
+// variables.put("organization", "鏂板鍛ㄤ繚宸ュ崟榛樿鍚姩娴佺▼");
+// variables.put("comment", "鏂板鍛ㄤ繚宸ュ崟榛樿鍚姩娴佺▼");
+// } else {
+// variables.put("organization", entity.getRemark());
+// variables.put("comment", entity.getRemark());
+// }
+// variables.put("proofreading", true);
+// List<String> usernames = new ArrayList<>();
+// usernames.add(entity.getOperator());
+// variables.put("NextAssignee", usernames);
+// Result result = flowDefinitionService.startProcessInstanceByKey("week_maintenance_process", variables);
+// if (result != null) {
+// //鏇存柊璁惧淇濆吇鐘舵��
+// eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
+// return result.isSuccess();
+// }
+ return true;
+ }
}
--
Gitblit v1.9.3