From 561313b5a3b1b6b3c0214eb5d16795ce36ab07de Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 22 四月 2025 11:40:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 29 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 406 +++++++++++++++++++++++++-------------------------
3 files changed, 235 insertions(+), 202 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index e0285ec..9758ecc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -187,6 +187,8 @@
params.setTitleRows(0);
params.setHeadRows(1);
params.setNeedSave(true);
+ params.setStartSheetIndex(0);
+ params.setSheetNum(1);
try {
List<EamEquipment> list = ExcelImportUtil.importExcel(file.getInputStream(), EamEquipment.class, params);
//update-begin-author:taoyan date:20190528 for:鎵归噺鎻掑叆鏁版嵁
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index f609451..c549b7e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -31,209 +31,213 @@
/**
* @Description: 鐐规宸ュ崟
* @Author: jeecg-boot
- * @Date: 2025-04-02
+ * @Date: 2025-04-02
* @Version: V1.0
*/
-@Api(tags="鐐规宸ュ崟")
+@Api(tags = "鐐规宸ュ崟")
@RestController
@RequestMapping("/eam/eamInspectionOrder")
@Slf4j
public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> {
- @Autowired
- private IEamInspectionOrderService eamInspectionOrderService;
- @Autowired
- private ISysBusinessCodeRuleService businessCodeRuleService;
- @Autowired
- private ObjectMapper objectMapper;
-
- @Autowired
- private TranslateDictTextUtils translateDictTextUtils;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param query
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes="鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
-// QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
- Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);
- IPage<EamInspectionOrder> pageList = eamInspectionOrderService.queryPageList(page, query);
- return Result.OK(pageList);
- }
-
- /**
- * 鏌ヨ鐐规宸ュ崟鍩烘湰淇℃伅
- * @param id
- * @return
- */
- @ApiOperation(value = "鏌ヨ鐐规宸ュ崟鍩烘湰淇℃伅", notes = "鏌ヨ鐐规宸ュ崟鍩烘湰淇℃伅")
- @GetMapping(value = "/selectVoById")
- public Result<?> selectVoById(@RequestParam(name="id") String id){
- return eamInspectionOrderService.selectVoById(id);
- }
-
-
- /**
- * 娣诲姞
- *
- * @param eamInspectionOrderRequest
- * @return
- */
- @AutoLog(value = "鐐规宸ュ崟-娣诲姞")
- @ApiOperation(value="鐐规宸ュ崟-娣诲姞", notes="鐐规宸ュ崟-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
- String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
- eamInspectionOrderRequest.setOrderNum(codeSeq);
- eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL));
- eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamInspectionOrderRequest
- * @return
- */
- @AutoLog(value = "鐐规宸ュ崟-缂栬緫")
- @ApiOperation(value="鐐规宸ュ崟-缂栬緫", notes="鐐规宸ュ崟-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
- eamInspectionOrderService.editInspectionOrder(eamInspectionOrderRequest);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 棰嗗彇鐐规宸ュ崟
- * @param id
- * @return
- */
- @AutoLog(value = "鐐规宸ュ崟-棰嗗彇鐐规宸ュ崟")
- @ApiOperation(value="鐐规宸ュ崟-棰嗗彇鐐规宸ュ崟", notes="鐐规宸ュ崟-棰嗗彇鐐规宸ュ崟")
- @GetMapping(value = "/receiveInspectionOrder")
- public Result<String> receiveInspectionOrder(@RequestParam(name="id") String id) {
- eamInspectionOrderService.takeInspectionOrder(id);
- return Result.OK("棰嗗彇鎴愬姛");
- }
-
- /**
- * 浣滃簾鐐规宸ュ崟
- * @param id
- * @return
- */
- @AutoLog(value = "鐐规宸ュ崟-浣滃簾鐐规宸ュ崟")
- @ApiOperation(value="鐐规宸ュ崟-浣滃簾鐐规宸ュ崟", notes="鐐规宸ュ崟-浣滃簾鐐规宸ュ崟")
- @GetMapping(value = "/cancelInspectionOrder")
- public Result<String> cancelInspectionOrder(@RequestParam(name="id") String id) {
- eamInspectionOrderService.cancelInspectionOrder(id);
- return Result.OK("浣滃簾鎴愬姛");
- }
-
- /**
- * 鎵归噺浣滃簾涓庨鍙�
- * @param ids
- * @param type
- * @return
- */
- @AutoLog(value = "鐐规宸ュ崟-鎵归噺浣滃簾涓庨鍙�")
- @ApiOperation(value="鐐规宸ュ崟-鎵归噺浣滃簾涓庨鍙�", notes="鐐规宸ュ崟-鎵归噺浣滃簾涓庨鍙�")
- @GetMapping(value = "/cancelOrReceive")
- public Result<?> cancelOrReceive(@RequestParam(name="ids") String ids, @RequestParam(name="type") String type) {
- return eamInspectionOrderService.batchCancelOrTakeInspectionOrder(ids, type);
- }
-
- /**
- * 鐐规娴佺▼
- * @param eamInspectionOrderRequest
- * @return
- */
- @AutoLog(value = "鐐规娴佺▼")
- @ApiOperation(value="鐐规宸ュ崟-鐐规娴佺▼", notes="鐐规宸ュ崟-鐐规娴佺▼")
- @PostMapping("/approval")
- public Result<?> approval(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
- eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
- return Result.OK("鎿嶄綔鎴愬姛");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鐐规宸ュ崟-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鐐规宸ュ崟-閫氳繃id鍒犻櫎", notes="鐐规宸ュ崟-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- eamInspectionOrderService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鐐规宸ュ崟-鎵归噺鍒犻櫎")
- @ApiOperation(value="鐐规宸ュ崟-鎵归噺鍒犻櫎", notes="鐐规宸ュ崟-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.eamInspectionOrderService.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) {
- EamInspectionOrder eamInspectionOrder = eamInspectionOrderService.getById(id);
- if(eamInspectionOrder==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- try {
- String json = objectMapper.writeValueAsString(eamInspectionOrder);
- JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
- translateDictTextUtils.translateField("createBy", eamInspectionOrder.getCreateBy(), item, "sys_user,realname,username");
- translateDictTextUtils.translateField("standardId", eamInspectionOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
- translateDictTextUtils.translateField("operator", eamInspectionOrder.getOperator(), item, "sys_user,realname,username");
- translateDictTextUtils.translateField("creationMethod", eamInspectionOrder.getCreationMethod(), item, "order_creation_method");
- translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");
- translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");
- translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");
- return Result.OK(item);
- } catch (JsonProcessingException e) {
- return Result.error("鏁版嵁杞瘧澶辫触锛�");
- }
- }
+ @Autowired
+ private IEamInspectionOrderService eamInspectionOrderService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamInspectionOrder
- */
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param query
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+// QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
+ Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);
+ IPage<EamInspectionOrder> pageList = eamInspectionOrderService.queryPageList(page, query);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 鏌ヨ鐐规宸ュ崟鍩烘湰淇℃伅
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "鏌ヨ鐐规宸ュ崟鍩烘湰淇℃伅", notes = "鏌ヨ鐐规宸ュ崟鍩烘湰淇℃伅")
+ @GetMapping(value = "/selectVoById")
+ public Result<?> selectVoById(@RequestParam(name = "id") String id) {
+ return eamInspectionOrderService.selectVoById(id);
+ }
+
+
+ /**
+ * 娣诲姞
+ *
+ * @param eamInspectionOrderRequest
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-娣诲姞")
+ @ApiOperation(value = "鐐规宸ュ崟-娣诲姞", notes = "鐐规宸ュ崟-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
+ eamInspectionOrderRequest.setOrderNum(codeSeq);
+ eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL));
+ eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param eamInspectionOrderRequest
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-缂栬緫")
+ @ApiOperation(value = "鐐规宸ュ崟-缂栬緫", notes = "鐐规宸ュ崟-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
+ eamInspectionOrderService.editInspectionOrder(eamInspectionOrderRequest);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 棰嗗彇鐐规宸ュ崟
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-棰嗗彇鐐规宸ュ崟")
+ @ApiOperation(value = "鐐规宸ュ崟-棰嗗彇鐐规宸ュ崟", notes = "鐐规宸ュ崟-棰嗗彇鐐规宸ュ崟")
+ @GetMapping(value = "/receiveInspectionOrder")
+ public Result<String> receiveInspectionOrder(@RequestParam(name = "id") String id) {
+ eamInspectionOrderService.takeInspectionOrder(id);
+ return Result.OK("棰嗗彇鎴愬姛");
+ }
+
+ /**
+ * 浣滃簾鐐规宸ュ崟
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-浣滃簾鐐规宸ュ崟")
+ @ApiOperation(value = "鐐规宸ュ崟-浣滃簾鐐规宸ュ崟", notes = "鐐规宸ュ崟-浣滃簾鐐规宸ュ崟")
+ @GetMapping(value = "/cancelInspectionOrder")
+ public Result<String> cancelInspectionOrder(@RequestParam(name = "id") String id) {
+ eamInspectionOrderService.cancelInspectionOrder(id);
+ return Result.OK("浣滃簾鎴愬姛");
+ }
+
+ /**
+ * 鎵归噺浣滃簾涓庨鍙�
+ *
+ * @param ids
+ * @param type
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-鎵归噺浣滃簾涓庨鍙�")
+ @ApiOperation(value = "鐐规宸ュ崟-鎵归噺浣滃簾涓庨鍙�", notes = "鐐规宸ュ崟-鎵归噺浣滃簾涓庨鍙�")
+ @GetMapping(value = "/cancelOrReceive")
+ public Result<?> cancelOrReceive(@RequestParam(name = "ids") String ids, @RequestParam(name = "type") String type) {
+ return eamInspectionOrderService.batchCancelOrTakeInspectionOrder(ids, type);
+ }
+
+ /**
+ * 鐐规娴佺▼
+ *
+ * @param eamInspectionOrderRequest
+ * @return
+ */
+ @AutoLog(value = "鐐规娴佺▼")
+ @ApiOperation(value = "鐐规宸ュ崟-鐐规娴佺▼", notes = "鐐规宸ュ崟-鐐规娴佺▼")
+ @PostMapping("/approval")
+ public Result<?> approval(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
+ eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
+ return Result.OK("鎿嶄綔鎴愬姛");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "鐐规宸ュ崟-閫氳繃id鍒犻櫎", notes = "鐐规宸ュ崟-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ eamInspectionOrderService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鐐规宸ュ崟-鎵归噺鍒犻櫎", notes = "鐐规宸ュ崟-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.eamInspectionOrderService.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) {
+ EamInspectionOrder eamInspectionOrder = eamInspectionOrderService.getById(id);
+ if (eamInspectionOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamInspectionOrder);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("createBy", eamInspectionOrder.getCreateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("standardId", eamInspectionOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
+ translateDictTextUtils.translateField("operator", eamInspectionOrder.getOperator(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("creationMethod", eamInspectionOrder.getCreationMethod(), item, "order_creation_method");
+ translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");
+ translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param eamInspectionOrder
+ */
//@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrder eamInspectionOrder) {
@@ -241,12 +245,12 @@
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
//@RequiresPermissions("鐐规宸ュ崟:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
index 388807e..6050f33 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.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.WeekMaintenanceStatusEnum;
@@ -40,6 +45,10 @@
private IEamWeekMaintenanceOrderService eamWeekMaintenanceOrderService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -209,7 +218,25 @@
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
EamWeekMaintenanceOrder eamWeekMaintenanceOrder = eamWeekMaintenanceOrderService.getById(id);
- return Result.OK(eamWeekMaintenanceOrder);
+ if (eamWeekMaintenanceOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamWeekMaintenanceOrder);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("equipmentId", eamWeekMaintenanceOrder.getEquipmentId(), item, "eam_equipment,equipment_code,id");
+ translateDictTextUtils.translateField("standardId", eamWeekMaintenanceOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
+ translateDictTextUtils.translateField("operator", eamWeekMaintenanceOrder.getOperator(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("creationMethod", eamWeekMaintenanceOrder.getCreationMethod(), item, "order_creation_method");
+ translateDictTextUtils.translateField("maintenanceStatus", eamWeekMaintenanceOrder.getMaintenanceStatus(), item, "week_maintenance_status");
+ translateDictTextUtils.translateField("confirmUser", eamWeekMaintenanceOrder.getConfirmUser(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("confirmDealType", eamWeekMaintenanceOrder.getConfirmDealType(), item, "approved_rejected");
+ translateDictTextUtils.translateField("initialAcceptanceUser", eamWeekMaintenanceOrder.getInitialAcceptanceUser(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("finalAcceptanceUser", eamWeekMaintenanceOrder.getFinalAcceptanceUser(), item, "sys_user,realname,username");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
/**
--
Gitblit v1.9.3