art: 技术状态鉴定申请-字段修改

zhangherong

13 小时以前 936d2311eb6dd189364dc38500341afebb636481

art: 技术状态鉴定申请-字段修改

 db/430É豸¹ÜÀíÊý¾Ý¿âÉè¼Æ.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-7-21 18:29:46",
  "updatedTime": "2025-7-22 14:27:53",
  "dbConns": [],
  "profile": {
    "default": {
@@ -2328,7 +2328,7 @@
          "id": "951E3090-8A27-4E30-A5F0-308B3E9F8E6D"
        },
        {
          "defKey": "technology_genarate_flag",
          "defKey": "technology_generate_flag",
          "defName": "技术状态鉴定生成标记",
          "comment": "1 å·²ç”Ÿæˆ 0 ä¸‹æ¬¡å¾…生成",
          "type": "",
@@ -2346,7 +2346,7 @@
          "id": "0F8E5A79-4399-42B0-B893-254A6D9DEFAD"
        },
        {
          "defKey": "third_maintenance_genarate_flag",
          "defKey": "third_maintenance_generate_flag",
          "defName": "三保生成标记",
          "comment": "1 å·²ç”Ÿæˆ 0 ä¸‹æ¬¡å¾…生成",
          "type": "",
@@ -30332,6 +30332,24 @@
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "589C45F0-0F8C-4497-8999-A8314DE5D601"
        },
        {
          "defKey": "acceptance_check_comment",
          "defName": "验收意见",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "0177078A-470B-44DE-8196-D8013935A223"
        }
      ],
      "correlations": [],
@@ -30699,6 +30717,24 @@
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "equipment_id",
          "defName": "设备ID",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "013BD2A8-0A95-4AC3-BF62-11D03C96304F"
        },
        {
          "defKey": "application_status",
          "defName": "申请单状态",
          "comment": "待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成",
@@ -30915,6 +30951,24 @@
          "attr9": "",
          "id": "1FDD4335-E2A5-4925-B353-DFB1518E8893",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "remark",
          "defName": "备注",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "77353547-B01B-4592-BCF4-04635339597F"
        }
      ],
      "correlations": [],

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java

@@ -1,14 +1,19 @@
package org.jeecg.modules.eam.controller;

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.TechnicalStatusEvaluationApplicationStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationQuery;
@@ -32,7 +37,10 @@
public class EamTechnicalStatusEvaluationApplicationController extends JeecgController<EamTechnicalStatusEvaluationApplication, IEamTechnicalStatusEvaluationApplicationService> {
    @Autowired
    private IEamTechnicalStatusEvaluationApplicationService eamTechnicalStatusEvaluationApplicationService;

    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;
    /**
     * åˆ†é¡µåˆ—表查询
     *
@@ -149,7 +157,18 @@
    @GetMapping(value = "/queryById")
    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
        EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication = eamTechnicalStatusEvaluationApplicationService.getById(id);
        return Result.OK(eamTechnicalStatusEvaluationApplication);
        if (eamTechnicalStatusEvaluationApplication == null) {
            return Result.error("未找到对应数据");
        }
        try {
            String json = objectMapper.writeValueAsString(eamTechnicalStatusEvaluationApplication);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("applicant", eamTechnicalStatusEvaluationApplication.getApplicant(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("factoryOrgCode", eamTechnicalStatusEvaluationApplication.getFactoryOrgCode(), item, "eam_base_factory,factory_name,org_code");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败！");
        }
    }

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java

@@ -73,6 +73,7 @@
    private Date evaluationDate;
    /**申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成*/
    @ApiModelProperty(value = "申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成")
    @Dict(dicCode = "technical_status_evaluation_application_status")
    private String applicationStatus;
    /**申请单位室级领导签字*/
    @ApiModelProperty(value = "申请单位室级领导签字")
@@ -85,7 +86,7 @@
    private Date departHeaderSignatureTime;
    /**申请单位室级领导签字结果*/
    @ApiModelProperty(value = "申请单位室级领导签字结果")
    @Dict(dicCode = "approved_rejected")
    @Dict(dicCode = "approve_reject")
    private String departHeaderSignatureResult;
    /**申请单位室级领导意见*/
    @ApiModelProperty(value = "申请单位室级领导意见")
@@ -101,7 +102,7 @@
    private Date productionHeaderSignatureTime;
    /**生产设备管理主管签字结果*/
    @ApiModelProperty(value = "生产设备管理主管签字结果")
    @Dict(dicCode = "approved_rejected")
    @Dict(dicCode = "approve_reject")
    private String productionHeaderSignatureResult;
    /**生产设备管理主管意见*/
    @ApiModelProperty(value = "生产设备管理主管意见")
@@ -117,7 +118,7 @@
    private Date productionSupportSignatureTime;
    /**生产保障部领导签字解结果*/
    @ApiModelProperty(value = "生产保障部领导签字解结果")
    @Dict(dicCode = "approved_rejected")
    @Dict(dicCode = "approve_reject")
    private String productionSupportSignatureResult;
    /**生产保障部领导意见*/
    @ApiModelProperty(value = "生产保障部领导意见")