From a4e30eb43219ccc05b0826f49ecd5a3b639cf0c0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 28 八月 2025 09:27:20 +0800
Subject: [PATCH] 修改计算百分比位置
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java | 447 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 257 insertions(+), 190 deletions(-)
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 9f1260a..69c5722 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
@@ -2,14 +2,19 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
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.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.constant.ThirdMaintenanceStatusEnum;
@@ -21,6 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.List;
@@ -29,210 +35,271 @@
/**
* @Description: 璁惧涓夌骇淇濆吇
* @Author: jeecg-boot
- * @Date: 2025-04-29
+ * @Date: 2025-04-29
* @Version: V1.0
*/
@Slf4j
-@Api(tags="璁惧涓夌骇淇濆吇")
+@Api(tags = "璁惧涓夌骇淇濆吇")
@RestController
@RequestMapping("/eam/thirdMaintenanceOrder")
public class EamThirdMaintenanceOrderController extends JeecgController<EamThirdMaintenanceOrder, IEamThirdMaintenanceOrderService> {
- @Autowired
- private IEamThirdMaintenanceOrderService eamThirdMaintenanceOrderService;
- @Autowired
- private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private IEamThirdMaintenanceOrderService eamThirdMaintenanceOrderService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Resource
+ private ObjectMapper objectMapper;
+ @Resource
+ private TranslateDictTextUtils translateDictTextUtils;
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param query
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamThirdMaintenanceQuery query,
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- Page<EamThirdMaintenanceOrder> page = new Page<EamThirdMaintenanceOrder>(pageNo, pageSize);
- IPage<EamThirdMaintenanceOrder> pageList = eamThirdMaintenanceOrderService.queryPageList(page, query);
- return Result.OK(pageList);
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param query
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamThirdMaintenanceQuery query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Page<EamThirdMaintenanceOrder> page = new Page<EamThirdMaintenanceOrder>(pageNo, pageSize);
+ IPage<EamThirdMaintenanceOrder> pageList = eamThirdMaintenanceOrderService.queryPageList(page, query);
+ return Result.OK(pageList);
+ }
- /**
- * 娣诲姞
- *
- * @param request
- * @return
- */
- @AutoLog(value = "璁惧涓夌骇淇濆吇-娣诲姞")
- @ApiOperation(value = "璁惧涓夌骇淇濆吇-娣诲姞", notes = "璁惧涓夌骇淇濆吇-娣诲姞")
- @PostMapping(value = "/add")
- 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 id
+ * @return
+ */
+ @ApiOperation(value = "鏌ヨ涓変繚宸ュ崟鍩烘湰淇℃伅", notes = "鏌ヨ涓変繚宸ュ崟鍩烘湰淇℃伅")
+ @GetMapping(value = "/selectVoById")
+ public Result<?> selectVoById(@RequestParam(name = "id") String id) {
+ return eamThirdMaintenanceOrderService.selectVoById(id);
+ }
- /**
- * 缂栬緫
- *
- * @param request
- * @return
- */
- @AutoLog(value = "璁惧涓夌骇淇濆吇-缂栬緫")
- @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("缂栬緫鎴愬姛!");
- }
+ /**
+ * 娣诲姞
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧涓夌骇淇濆吇-娣诲姞")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-娣诲姞", notes = "璁惧涓夌骇淇濆吇-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamThirdMaintenanceRequest request) {
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.THIRD_MAINTENANCE_CODE_RULE);
+ request.setOrderNum(codeSeq);
+ request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+ return eamThirdMaintenanceOrderService.addMaintenance(request);
+ }
- /**
- * 閫氳繃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) {
- EamThirdMaintenanceOrder order = eamThirdMaintenanceOrderService.getById(id);
- return Result.OK(order);
- }
+ /**
+ * 缂栬緫
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "璁惧涓夌骇淇濆吇-缂栬緫")
+ @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 = "璁惧涓夌骇淇濆吇-浣滃簾")
- @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 = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ", notes = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamThirdMaintenanceOrder eamThirdMaintenanceOrder = eamThirdMaintenanceOrderService.getById(id);
+ if (eamThirdMaintenanceOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamThirdMaintenanceOrder);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("createBy", eamThirdMaintenanceOrder.getCreateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("standardId", eamThirdMaintenanceOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
+ translateDictTextUtils.translateField("repairman", eamThirdMaintenanceOrder.getRepairman(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("maintenanceStatus", eamThirdMaintenanceOrder.getMaintenanceStatus(), item, "third_maintenance_status");
+ translateDictTextUtils.translateField("creationMethod", eamThirdMaintenanceOrder.getCreationMethod(), item, "order_creation_method");
+ translateDictTextUtils.translateField("fullyFunctional", eamThirdMaintenanceOrder.getFullyFunctional(), item, "yn");
+ translateDictTextUtils.translateField("runningNormally", eamThirdMaintenanceOrder.getRunningNormally(), item, "yn");
+ translateDictTextUtils.translateField("inspector", eamThirdMaintenanceOrder.getInspector(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("operatorSignature", eamThirdMaintenanceOrder.getOperatorSignature(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("repairmanSignature", eamThirdMaintenanceOrder.getRepairmanSignature(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("repairManagerSignature", eamThirdMaintenanceOrder.getRepairManagerSignature(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("inspectorSignature", eamThirdMaintenanceOrder.getInspectorSignature(), item, "sys_user,realname,username");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
- /**
- * 閫氳繃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 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 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 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 = "/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() + " 鏉″伐鍗曪紒");
- }
+ /**
+ * 閫氳繃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() + " 鏉″伐鍗曪紒");
+ }
- /**
- * 鎴戠殑寰呭姙锛屽鎵瑰姩浣�
- *
- * @param request
- * @return
- */
- @ApiOperation(value = "涓変繚宸ュ崟-鎵ц鎿嶄綔", notes = "涓変繚宸ュ崟-鎵ц鎿嶄綔")
- @PutMapping(value = "/approval")
- public Result<?> approval(@RequestBody EamThirdMaintenanceRequest request) {
- if (request == null) {
- return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
- }
- // 妫�鏌ヨ姹傚弬鏁�
- if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
- return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
- }
- EamThirdMaintenanceOrder entity = eamThirdMaintenanceOrderService.approval(request);
- if (entity == null) {
- return Result.error("鎿嶄綔澶辫触锛�");
- }
- 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 -> {
+ 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() + " 鏉″伐鍗曪紒");
+ }
+
+ /**
+ * 鎴戠殑寰呭姙锛屽鎵瑰姩浣�
+ *
+ * @param request
+ * @return
+ */
+ @ApiOperation(value = "涓変繚宸ュ崟-鎵ц鎿嶄綔", notes = "涓変繚宸ュ崟-鎵ц鎿嶄綔")
+ @PutMapping(value = "/approval")
+ public Result<?> approval(@RequestBody EamThirdMaintenanceRequest request) {
+ if (request == null) {
+ return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ // 妫�鏌ヨ姹傚弬鏁�
+ if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
+ return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
+ }
+ EamThirdMaintenanceOrder entity = eamThirdMaintenanceOrderService.approval(request);
+ if (entity == null) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.ok("鎿嶄綔鎴愬姛锛�");
+ }
+
+ /**
+ * 瀵煎嚭鑾峰彇宸ュ崟鍩烘湰淇℃伅
+ *
+ * @return
+ */
+ @GetMapping("/exportThirdMaintenanceOrderBaseInfo")
+ public JSONObject exportThirdMaintenanceOrderBaseInfo(@RequestParam(name = "id", required = true) String id) {
+ return eamThirdMaintenanceOrderService.exportThirdMaintenanceOrderBaseInfo(id);
+ }
+
+ /**
+ * 鎵归噺鍔犲伐璁惧涓夌骇淇濆吇瀹屽伐绉讳氦鍗�
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "璁惧涓夌骇淇濆吇-鍔犲伐璁惧涓夌骇淇濆吇瀹屽伐绉讳氦鍗�")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-鍔犲伐璁惧涓夌骇淇濆吇瀹屽伐绉讳氦鍗�", notes = "璁惧涓夌骇淇濆吇-鍔犲伐璁惧涓夌骇淇濆吇瀹屽伐绉讳氦鍗�")
+ @GetMapping(value = "/batchExport")
+ public Result<?> export(String ids){
+ return Result.ok(eamThirdMaintenanceOrderService.export(ids));
+ }
+
+ /**
+ * 鎵归噺鍔犲伐璁惧涓夌骇淇濆吇楠屾敹鍗�
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "璁惧涓夌骇淇濆吇-鍔犲伐璁惧涓夌骇淇濆吇楠屾敹鍗�")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-鍔犲伐璁惧涓夌骇淇濆吇楠屾敹鍗�", notes = "璁惧涓夌骇淇濆吇-鍔犲伐璁惧涓夌骇淇濆吇楠屾敹鍗�")
+ @GetMapping(value = "/batchExportCheck")
+ public Result<?> exportCheck(String ids) {
+ return Result.ok(eamThirdMaintenanceOrderService.exportAcceptance(ids));
+ }
}
--
Gitblit v1.9.3