移装告知和安装告知 暂存和驳回待办处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml

@@ -106,12 +106,13 @@
             tjtn.street_name AS streetName,
             tjtn.promoter AS promoter,
             tjtn.plan_date AS installStartDate,
+            tec2.name                       AS equCategory,
+            tec1.name                       AS equList,
+            tec.name                        AS equDefine,
+            oi.SUPERVISORY_CODE as supervisoryCode,
             tjtn.construction_manager AS installLeaderName,
             tjtn.construction_manager_phone AS installLeaderPhone,
             ri.equ_code AS equRegisterCode,
-            ri.equ_list AS equList,
-            ri.equ_category AS equCategory,
-            ri.EQU_DEFINE AS equDefine,
             ri.product_name AS productName,
             ri.brand_name AS brandName,
             ri.equ_type AS equType,
@@ -152,8 +153,12 @@
                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
                 LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
                 LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
+                left join idx_biz_jg_other_info oi on oi.RECORD = re.equ_id
                 LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = tjtn.use_unit_credit_code
                 LEFT JOIN tz_base_enterprise_info eio ON eio.use_code = tjtn.install_unit_credit_code
+                LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
+                 LEFT JOIN amos_tzs_biz.tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
+            LEFT JOIN amos_tzs_biz.tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
         WHERE
             tjtn.sequence_nbr = #{sequenceNbr}
             LIMIT 1

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -7,6 +7,12 @@
   },
   {
     "type": "102",
+    "pageType": "draft",
+    "name": "安装告知",
+    "url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=edit"
+  },
+  {
+    "type": "102",
     "pageType": "look",
     "name": "安装告知",
     "url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=detail"
@@ -15,7 +21,7 @@
     "type": "102",
     "pageType": "edit",
     "name": "安装告知",
-    "url": ""
+    "url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=edit"
   },
   {
     "type": "103",