art: 技术状态鉴定工单-数据库设计修改

zhangherong

2025-07-10 16cd6a3d63f3352c1a20abb5fc73f48a4204bc62

art: 技术状态鉴定工单-数据库设计修改

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

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-7-10 12:02:35",
  "updatedTime": "2025-7-10 19:45:43",
  "dbConns": [],
  "profile": {
    "default": {
@@ -11536,24 +11536,6 @@
          "id": "D5F4AD3E-A9C5-41BB-A699-720C3EAEC040"
        },
        {
          "defKey": "is_processed",
          "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": "06BF0EBA-007A-451D-95F9-E00553E5F6CD"
        },
        {
          "defKey": "fault_start_time",
          "defName": "故障开始时间",
          "comment": "",
@@ -11678,6 +11660,34 @@
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "1229A626-1039-4386-A28C-25297478328B"
        },
        {
          "defKey": "image_files",
          "defName": "照片文件ids",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "domain": "13DE7063-440C-426F-B1DF-25EC824C6DB8",
          "refDict": "",
          "extProps": {},
          "notes": {},
          "attr1": "",
          "attr2": "",
          "attr3": "",
          "attr4": "",
          "attr5": "",
          "attr6": "",
          "attr7": "",
          "attr8": "",
          "attr9": "",
          "id": "0552EC0A-4846-49B3-BA5A-6049CD295D13",
          "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075"
        },
        {
          "defKey": "remark",
@@ -12017,7 +12027,7 @@
        {
          "defKey": "repair_status",
          "defName": "维修状态",
          "comment": "待维修、维修中、待确认、维修完成",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
@@ -12031,78 +12041,6 @@
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "E3F4CCD6-CA19-4A44-AEE6-EAB76C447B6B"
        },
        {
          "defKey": "fault_reason",
          "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": "BCE8BD76-B110-4B3E-B64C-5753B9F0598C"
        },
        {
          "defKey": "fault_analysis",
          "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": "DF070EAC-2AA1-482B-B8F2-5BFE2BFBF294"
        },
        {
          "defKey": "fault_process",
          "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": "AF768E3B-7329-4C6C-959E-BE4F0E4E0ED2"
        },
        {
          "defKey": "fault_prevent",
          "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": "88AA9F44-C655-4140-B34E-26E2A10E0F1D"
        },
        {
          "defKey": "actual_start_time",
@@ -12195,6 +12133,250 @@
          "id": "E3BD4018-31D8-412D-AD9C-00ED3F068906"
        },
        {
          "defKey": "fault_reason",
          "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": "BCE8BD76-B110-4B3E-B64C-5753B9F0598C"
        },
        {
          "defKey": "repair_description",
          "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": "C158BB3C-06F2-451C-974F-7A8A46A4026B"
        },
        {
          "defKey": "repairer",
          "defName": "维修人",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "39B6A4DB-4B2F-4997-BE68-04267F517AD6"
        },
        {
          "defKey": "leader_user",
          "defName": "确认领导",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "BE863706-C9DD-45D3-9303-4180F1A444E2"
        },
        {
          "defKey": "leader_confirm",
          "defName": "领导确认结果",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "958A9D56-586D-483A-B670-EA3351BEEF50"
        },
        {
          "defKey": "leader_confirm_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": "F7BAD961-9011-4A25-B80B-7D6865B93F92"
        },
        {
          "defKey": "leader_confirm_time",
          "defName": "领导确认时间",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "32CAA017-36BD-4EB3-B4E5-88F972CEE9CD"
        },
        {
          "defKey": "external_repairer",
          "defName": "机动办维修人",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "AC27EA79-E7DA-4B72-B39B-8ECA8D968958"
        },
        {
          "defKey": "external_confirm",
          "defName": "机动办确认结果",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "ED829432-3B4C-49D4-8B91-05DF171070E9"
        },
        {
          "defKey": "external_confirm_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": "16D85E43-DC62-4809-BC8C-8274A8EACD4C"
        },
        {
          "defKey": "external_confirm_time",
          "defName": "机动办确认时间",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "1FFC3F79-6226-4B7C-9F96-233CCEB9FE6E"
        },
        {
          "defKey": "outsourced_user",
          "defName": "委外负责人",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "69D5E505-79B5-4960-804B-26F679622056"
        },
        {
          "defKey": "image_files",
          "defName": "照片文件ids",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "domain": "13DE7063-440C-426F-B1DF-25EC824C6DB8",
          "refDict": "",
          "extProps": {},
          "notes": {},
          "attr1": "",
          "attr2": "",
          "attr3": "",
          "attr4": "",
          "attr5": "",
          "attr6": "",
          "attr7": "",
          "attr8": "",
          "attr9": "",
          "id": "F12C512D-9550-40EA-8583-C6476F69C135",
          "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075"
        },
        {
          "defKey": "confirmer",
          "defName": "操作工",
          "comment": "",
@@ -12247,359 +12429,6 @@
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "D78104A0-7502-4867-BE4D-6727F35FAE54"
        }
      ],
      "correlations": [],
      "indexes": [],
      "type": "P"
    },
    {
      "id": "B058461D-4E6B-4E93-AC93-202C470F32FD",
      "env": {
        "base": {
          "nameSpace": "",
          "codeRoot": ""
        }
      },
      "defKey": "eam_repair_person",
      "defName": "故障维修人员",
      "comment": "",
      "properties": {
        "partitioned by": "(date string)",
        "row format delimited": "",
        "fields terminated by ','": "",
        "collection items terminated by '-'": "",
        "map keys terminated by ':'": "",
        "store as textfile;": ""
      },
      "sysProps": {
        "nameTemplate": "{defKey}[{defName}]"
      },
      "notes": {},
      "headers": [
        {
          "refKey": "hideInGraph",
          "hideInGraph": true
        },
        {
          "refKey": "defKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "defName",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "comment",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "primaryKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "notNull",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "autoIncrement",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "domain",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "type",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "len",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "scale",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "refDict",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "defaultValue",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "isStandard",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "uiHint",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "extProps",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr1",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr2",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr3",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr4",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr5",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr6",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr7",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr8",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr9",
          "freeze": false,
          "hideInGraph": true
        }
      ],
      "fields": [
        {
          "defKey": "id",
          "defName": "主键",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": true,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "id": "D7DEA958-4C18-479C-B2C0-94FE06DA3ADF"
        },
        {
          "defKey": "create_by",
          "defName": "创建人",
          "comment": "",
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "58D6FF91-89A9-490A-B90A-327E81A74E23",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "create_time",
          "defName": "创建时间",
          "comment": "",
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "8F4966FE-F0C2-4AB2-83EF-94B24B7B224E",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "update_by",
          "defName": "更新人",
          "comment": "",
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "4F8FB139-0BB5-415D-831E-6143E3A8D8F6",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "update_time",
          "defName": "更新时间",
          "comment": "",
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "A032D1CD-7BBA-4E7B-BE9B-B11D37E43D0D",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "del_flag",
          "defName": "删除标记",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
          "extProps": {},
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "id": "15E782AF-A99B-49CC-9782-59BE3F710287"
        },
        {
          "defKey": "repair_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": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "32E4CAED-83AE-4227-B398-586CA02E9879"
        },
        {
          "defKey": "repair_user",
          "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": "4C1E8950-C463-4892-9132-2CDAA4EBBD19"
        },
        {
          "defKey": "repair_primary",
          "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": "1BD2D6BC-3EF4-40EF-99C0-D322F854E501"
        },
        {
          "defKey": "repair_duration",
          "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": "0950E648-7BD4-4A85-A658-1F6F5E74E1EA"
        },
        {
          "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": "4B6B2E90-0A46-44BC-B297-CB8C5AF2C1E7"
        }
      ],
      "correlations": [],
@@ -24950,6 +24779,276 @@
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "safety_check_completed",
          "defName": "安全装置检查是否完成",
          "comment": "是否",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "1226D96E-90ED-41A9-8A3D-81A2CAD83E65"
        },
        {
          "defKey": "precision_check_completed",
          "defName": "设备精度检查是否完成",
          "comment": "是否",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "4F856A18-C459-480C-A387-DCD7B0583832"
        },
        {
          "defKey": "other_check_completed",
          "defName": "其他检查是否完成",
          "comment": "是否",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "35857684-55E4-4AA2-836C-7F382D9D3632"
        },
        {
          "defKey": "safety_check_confirm",
          "defName": "安全装置检查确认人",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "C0F0D065-46A8-4D7E-BB20-123F21C213CA"
        },
        {
          "defKey": "safety_check_confirm_time",
          "defName": "安全装置检查确认时间",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "7C33F96F-F828-4A60-AA98-8847020EF388"
        },
        {
          "defKey": "safety_check_result",
          "defName": "安全装置检查确认结果",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "699E6979-B91F-4471-8DE7-A527AD2C82B7"
        },
        {
          "defKey": "safety_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": "0F955349-F512-45D6-A377-3C46CEAFD278"
        },
        {
          "defKey": "precision_check_confirm",
          "defName": "设备精度检查确认人",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "07FB0F0E-DE49-40F4-82C3-FBD9CE3FA808"
        },
        {
          "defKey": "precision_check_confirm_time",
          "defName": "设备精度检查确认时间",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "362A3251-5FFF-42A6-B6E4-F8B7FE740CA6"
        },
        {
          "defKey": "precision_check_confirm_result",
          "defName": "设备精度检查确认结果",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "92F9F3CA-B9E9-414B-8280-0CE3EE3C9466"
        },
        {
          "defKey": "precision_check_confirm_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": "BEA65C76-CDF4-49A2-A72B-1CCDB9E2EA66"
        },
        {
          "defKey": "other_check_confirm",
          "defName": "其他检查确认人",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "7480CDF8-6DCF-44BB-9323-5E77499DBC80"
        },
        {
          "defKey": "other_check_confirm_time",
          "defName": "其他检查确认时间",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "5971A72F-A97E-464B-A0FC-79EC2CF2C5FD"
        },
        {
          "defKey": "other_check_confirm_result",
          "defName": "其他检查确认结果",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "FEE0B289-45F0-420D-87C1-DA28FC3EB3D9"
        },
        {
          "defKey": "other_check_confirm_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": "73800093-E07C-471B-B0E8-32F1834FF633"
        },
        {
          "defKey": "safety_equipment_check_result",
          "defName": "安全装置检查结果",
          "comment": "是、否",
@@ -25042,6 +25141,42 @@
          "id": "A77E37BB-DEEE-4A7D-94EA-AAAAE0C65D81"
        },
        {
          "defKey": "repairer_signature",
          "defName": "维修人签字",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "BE092B65-E9ED-434B-8734-0E1D5DE4F3E1"
        },
        {
          "defKey": "repairer_signature_time",
          "defName": "维修人签字时间",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "AABAD199-8918-41C0-AB50-F74EEDB7A75B"
        },
        {
          "defKey": "repair_manager_signature",
          "defName": "维修室主任签字",
          "comment": "",
@@ -25096,6 +25231,24 @@
          "attr9": "",
          "id": "ADE87D39-0E76-4D32-8C2E-05F1D4C0B137",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "repair_manager_signature_result",
          "defName": "维修室主任签字结果",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "0C21EC0C-D6AA-4A67-A935-2DCE2C0483C7"
        },
        {
          "defKey": "repair_manager_comment",
@@ -25224,6 +25377,24 @@
          "id": "0B2E03D2-7AE1-447D-AE76-91D7287805A9"
        },
        {
          "defKey": "depart_technical_leader_signature_result",
          "defName": "使用单位技术主管签字结果",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
          "id": "F1F685DB-7067-4522-B9D3-36D25FBDC8B7"
        },
        {
          "defKey": "depart_technical_leader_comment",
          "defName": "使用单位技术主管意见",
          "comment": "",
@@ -25261,7 +25432,7 @@
        },
        {
          "defKey": "evaluation_reason",
          "defName": "限\\禁用原因(多选)",
          "defName": "限/禁用原因(多选)",
          "comment": "安全装置、设备功能、精度、试件、其他",
          "type": "",
          "len": "",
@@ -29614,7 +29785,6 @@
        "1A3E4955-3BDA-4628-A07A-37D3AD875659",
        "B57F92D3-3089-453E-A007-85C497CEE088",
        "EE37A932-3559-47C8-A1F3-1E788DE4A116",
        "B058461D-4E6B-4E93-AC93-202C470F32FD",
        "4A919A9B-7871-44DF-8C20-878564B3B502",
        "F4027093-9CA4-4A9B-BA41-8891528459A8",
        "64408D01-665E-43FB-92AE-916BE3234D48",

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationOrderStatusEnum.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamTechnicalStatusEvaluationOrderEnum.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package org.jeecg.modules.eam.constant;

public enum EamTechnicalStatusEvaluationOrderEnum {
public enum TechnicalStatusEvaluationOrderStatusEnum {
    WAIT_EVALUATION, //待鉴定
    UNDER_EVALUATION, //鉴定中
    repair_manager_signing, //维修室主任签字

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

@@ -77,23 +77,26 @@
        }
        return Result.OK("添加成功！");
    }
	
    /**
     * ç¼–辑
     *
     * @param eamTechnicalStatusEvaluationOrder
     * @return
     */
    @AutoLog(value = "技术状态鉴定工单-编辑")
    @ApiOperation(value="技术状态鉴定工单-编辑", notes="技术状态鉴定工单-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder) {
        eamTechnicalStatusEvaluationOrderService.updateById(eamTechnicalStatusEvaluationOrder);
        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 = eamTechnicalStatusEvaluationOrderService.collect(id);
         if (!b) {
             Result.OK("领取失败!");
         }
         return Result.OK("领取成功!");
     }


     /**
     * é€šè¿‡id查询
     *
     * @param id

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

@@ -15,7 +15,7 @@
/**
 * @Description: æŠ€æœ¯çŠ¶æ€é‰´å®šå·¥å•
 * @Author: jeecg-boot
 * @Date:   2025-07-09
 * @Date:   2025-07-10
 * @Version: V1.0
 */
@Data
@@ -71,12 +71,57 @@
    /**鉴定人*/
    @ApiModelProperty(value = "鉴定人")
    private String evaluator;
    /**鉴定状态;待鉴定、鉴定中、维修室主任签字、工艺人员签字、技术主管签字、设备检验员签字、已完成、已锁定、变更中、已过期*/
    @ApiModelProperty(value = "鉴定状态;待鉴定、鉴定中、维修室主任签字、工艺人员签字、技术主管签字、设备检验员签字、已完成、已锁定、变更中、已过期")
    /**鉴定状态;待鉴定、鉴定中、维修室主任签字、工艺人员签字、使用单位技术主管签字、设备检验员签字、已完成、已锁定、变更中、已过期*/
    @ApiModelProperty(value = "鉴定状态;待鉴定、鉴定中、维修室主任签字、工艺人员签字、使用单位技术主管签字、设备检验员签字、已完成、已锁定、变更中、已过期")
    private String evaluationStatus;
    /**创建方式*/
    @ApiModelProperty(value = "创建方式")
    private String creationMethod;
    /**安全装置检查是否完成*/
    @ApiModelProperty(value = "安全装置检查是否完成")
    private String safetyCheckCompleted;
    /**设备精度检查是否完成*/
    @ApiModelProperty(value = "设备精度检查是否完成")
    private String precisionCheckCompleted;
    /**其他检查是否完成*/
    @ApiModelProperty(value = "其他检查是否完成")
    private String otherCheckCompleted;
    /**安全装置检查确认人*/
    @ApiModelProperty(value = "安全装置检查确认人")
    private String safetyCheckConfirm;
    /**安全装置检查确认时间*/
    @ApiModelProperty(value = "安全装置检查确认时间")
    private Date safetyCheckConfirmTime;
    /**安全装置检查确认结果*/
    @ApiModelProperty(value = "安全装置检查确认结果")
    private String safetyCheckResult;
    /**安全装置检查确认意见*/
    @ApiModelProperty(value = "安全装置检查确认意见")
    private String safetyCheckComment;
    /**设备精度检查确认人*/
    @ApiModelProperty(value = "设备精度检查确认人")
    private String precisionCheckConfirm;
    /**设备精度检查确认时间*/
    @ApiModelProperty(value = "设备精度检查确认时间")
    private Date precisionCheckConfirmTime;
    /**设备精度检查确认结果*/
    @ApiModelProperty(value = "设备精度检查确认结果")
    private String precisionCheckConfirmResult;
    /**设备精度检查确认意见*/
    @ApiModelProperty(value = "设备精度检查确认意见")
    private String precisionCheckConfirmComment;
    /**其他检查确认人*/
    @ApiModelProperty(value = "其他检查确认人")
    private String otherCheckConfirm;
    /**其他检查确认时间*/
    @ApiModelProperty(value = "其他检查确认时间")
    private Date otherCheckConfirmTime;
    /**其他检查确认结果*/
    @ApiModelProperty(value = "其他检查确认结果")
    private String otherCheckConfirmResult;
    /**其他检查确认意见*/
    @ApiModelProperty(value = "其他检查确认意见")
    private String otherCheckConfirmComment;
    /**安全装置检查结果;是、否*/
    @ApiModelProperty(value = "安全装置检查结果;是、否")
    private String safetyEquipmentCheckResult;
@@ -89,14 +134,23 @@
    /**其他检查结果;是、否、无*/
    @ApiModelProperty(value = "其他检查结果;是、否、无")
    private String otherCheckResult;
    /**维修人签字*/
    @ApiModelProperty(value = "维修人签字")
    private String repairerSignature;
    /**维修人签字时间*/
    @ApiModelProperty(value = "维修人签字时间")
    private Date repairerSignatureTime;
    /**维修室主任签字*/
    @ApiModelProperty(value = "维修室主任签字")
    private String repairManagerSignature;
    /**维修室主任签字时间*/
    @ApiModelProperty(value = "维修室主任签字时间")
    private Date repairManagerSignatureTime;
    /**维修室主任签字结果*/
    @ApiModelProperty(value = "维修室主任签字结果")
    private String repairManagerSignatureResult;
    /**维修室主任意见*/
    @ApiModelProperty(value = "维修室主任意见")
    @ApiModelProperty(value = "维修室主任意见")
    private String repairManagerComment;
    /**试件检查结果;合格、不合格*/
    @ApiModelProperty(value = "试件检查结果;合格、不合格")
@@ -108,21 +162,24 @@
    @ApiModelProperty(value = "工艺员签字时间")
    private Date processTechnicianSignatureTime;
    /**工艺员意见*/
    @ApiModelProperty(value = "工艺员意见")
    @ApiModelProperty(value = "工艺员意见")
    private String processTechnicianComment;
    /**使用单位技术主管签字*/
    @ApiModelProperty(value = "使用单位技术主管签字")
    @ApiModelProperty(value = "使用单位技术主管签字")
    private String departTechnicalLeaderSignature;
    /**使用单位技术主管签字时间*/
    @ApiModelProperty(value = "使用单位技术主管签字时间")
    private Date departTechnicalLeaderSignatureTime;
    @ApiModelProperty(value = "使用单位技术主管签字时间")
    private String departTechnicalLeaderSignatureTime;
    /**使用单位技术主管签字结果*/
    @ApiModelProperty(value = "使用单位技术主管签字结果")
    private String departTechnicalLeaderSignatureResult;
    /**使用单位技术主管意见*/
    @ApiModelProperty(value = "使用单位技术主管意见")
    @ApiModelProperty(value = "使用单位技术主管意见")
    private String departTechnicalLeaderComment;
    /**鉴定结果;合格、限用、禁用*/
    @ApiModelProperty(value = "鉴定结果;合格、限用、禁用")
    private String evaluationResult;
    /**限\禁用原因(多选);安全装置、设备功能、精度、试件、其他*/
    /**限/禁用原因(多选);安全装置、设备功能、精度、试件、其他*/
    @ApiModelProperty(value = "限/禁用原因(多选);安全装置、设备功能、精度、试件、其他")
    private String evaluationReason;
    /**设备检查人签字*/
@@ -132,7 +189,7 @@
    @ApiModelProperty(value = "设备检查人签字时间")
    private Date inspectorSignatureTime;
    /**设备检查人意见*/
    @ApiModelProperty(value = "设备检查人意见")
    @ApiModelProperty(value = "设备检查人意见")
    private String inspectorComment;
    /**附录A HF编码*/
    @ApiModelProperty(value = "附录A HF编码")

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java

@@ -29,4 +29,11 @@
     * @return
     */
    boolean addTechnicalStatusEvaluationOrder(EamTechnicalStatusEvaluationOrderRequest request);

    /**
     * é¢†å–工单
     * @param id
     * @return
     */
    boolean collect(String id);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,15 +10,16 @@
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.EamTechnicalStatusEvaluationOrderEnum;
import org.jeecg.modules.eam.constant.HfTemplateCategoryEnum;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationOrderStatusEnum;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
@@ -26,18 +28,23 @@
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
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.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
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 java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -46,8 +53,8 @@
 * @Date: 2025-07-09
 * @Version: V1.0
 */
@Service
public class EamTechnicalStatusEvaluationOrderServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderMapper, EamTechnicalStatusEvaluationOrder> implements IEamTechnicalStatusEvaluationOrderService {
@Service("IEamTechnicalStatusEvaluationOrderService")
public class EamTechnicalStatusEvaluationOrderServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderMapper, EamTechnicalStatusEvaluationOrder> implements IEamTechnicalStatusEvaluationOrderService, FlowCallBackServiceI {

    @Autowired
    private IBaseFactoryUserService baseFactoryUserService;
@@ -63,6 +70,21 @@
    private IEamTechnicalStatusEvaluationStandardService standardService;
    @Autowired
    private IEamBaseHFCodeService hfCodeService;
    @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 IEamEquipmentExtendService equipmentExtendService;

    @Override
    public IPage<EamTechnicalStatusEvaluationOrder> queryPageList(Page<EamTechnicalStatusEvaluationOrder> page, EamTechnicalStatusEvaluationOrderQuery query) {
@@ -148,7 +170,7 @@
        request.setOrderNum(codeSeq);
        request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
        //状态初始化
        order.setEvaluationStatus(EamTechnicalStatusEvaluationOrderEnum.WAIT_EVALUATION.name());
        order.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name());
        order.setCreationMethod(request.getCreationMethod());
        //删除标记
        order.setDelFlag(CommonConstant.DEL_FLAG_0);
@@ -187,4 +209,77 @@
        }
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean collect(String id) {
        EamTechnicalStatusEvaluationOrder entity = super.getBaseMapper().selectById(id);
        if (entity == null) {
            throw new JeecgBootException("要领取的工单不存在，请刷新重试！");
        }
        if (!TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name().equals(entity.getEvaluationStatus())) {
            throw new JeecgBootException("该工单已进行过领取！");
        }
        EamEquipment equipment = equipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，添加失败！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if(sysUser == null) {
            throw new JeecgBootException("不是维修工，无法领取此工单！");
        }
        entity.setEvaluator(sysUser.getUsername());
        entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.UNDER_EVALUATION.name());
        entity.setActualStartTime(new Date());
        this.getBaseMapper().updateById(entity);

        //启动流程
        flowCommonService.initActBusiness("工单号: " + entity.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
                entity.getId(), "IEamTechnicalStatusEvaluationOrderService", "technical_status_evaluation_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("second_maintenance_process", variables);
//        if (result != null) {
//            //更新设备保养状态
//            eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name());
//            return result.isSuccess();
//        }
        return true;
    }

    @Override
    public void afterFlowHandle(FlowMyBusiness business) {
        business.getTaskNameId();//接下来审批的节点
        business.getValues();//前端传进来的参数
        business.getActStatus();
    }

    @Override
    public Object getBusinessDataById(String dataId) {
        return this.getById(dataId);
    }

    @Override
    public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
        return null;
    }

    @Override
    public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
        //业务是否干预流程，业务干预，流程干预，指定人员进行处理
        //获取下一步处理人
        Object object = values.get("NextAssignee");
        return (List<String>) object;
    }
}