Lius
7 天以前 04a62d0a1be1b606939720a3e06b43192fd30d68
三保获取详细信息
已修改2个文件
43 ■■■■■ 文件已修改
db/LS/dict_ls.sql 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/LS/dict_ls.sql
@@ -48,6 +48,14 @@
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1945048767556866049', N'1922909404263276545', N'第一次验收中', N'UNDER_FIRST_ACCEPTANCE', '', 4, 1, N'admin', '2025-07-15 17:12:18.1080000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1945048856438362113', N'1922909404263276545', N'第二次验收中', N'UNDER_SECOND_ACCEPTANCE', '', 5, 1, N'admin', '2025-07-15 17:12:39.2920000', NULL, NULL);
delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='third_maintenance_result');
delete from [dbo].[sys_dict] where dict_code='third_maintenance_result';
INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1945421792382902274', N'三保结果', N'third_maintenance_result', '', 0, N'admin', '2025-07-16 17:54:34.1430000', NULL, NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1945421858971672578', N'1945421792382902274', N'正常', N'NORMAL', '', 1, 1, N'admin', '2025-07-16 17:54:50.0220000', NULL, NULL);
INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1945421898058391553', N'1945421792382902274', N'异常', N'ANOMALY', '', 2, 1, N'admin', '2025-07-16 17:54:59.3460000', NULL, NULL);
--设备功能是否
delete from [dbo].[sys_dict_item] where dict_id in (select id from [dbo].[sys_dict] where dict_code='equipment_function_yn');
delete from [dbo].[sys_dict] where dict_code='equipment_function_yn';
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;
@@ -41,6 +47,10 @@
    private IEamThirdMaintenanceOrderService eamThirdMaintenanceOrderService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Resource
    private ObjectMapper objectMapper;
    @Resource
    private TranslateDictTextUtils translateDictTextUtils;
    /**
@@ -125,8 +135,29 @@
    @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);
        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("数据转译失败!");
        }
    }
    /**