fix(jg):设备移交代码提交,修改bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.java

@@ -102,7 +102,7 @@ public class JgEquipTransferDto  extends BaseDto {
     private String factoryNum;
 
     @ApiModelProperty(value = "设备注册代码")
-    private String equRegisterCode;
+    private String equCode;
 
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;

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

@@ -23,14 +23,15 @@
             jet.instance_status AS instanceStatus,
             jet.accept_date AS acceptDate,
             jet.task_name AS taskName,
-            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,
-            ri.equ_price AS equPrice,
-            ri.product_photo AS productPhoto,
+            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,
+            ri.EQU_PRICE AS equPrice,
+            ri.PRODUCT_PHOTO AS productPhoto,
+            ri.EQU_CODE,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,
@@ -53,7 +54,7 @@
             fi.ins_use_maintain_explain AS insUseMaintainExplain,
             ui.safety_manager AS safetyManager,
             ui.phone AS safetyManagerPhone,
-            CONCAT(ui.PROVINCE_NAME,'', ui.CITY_NAME, ' ', ui.COUNTY_NAME, ' ', ui.ADDRESS, ' ', ui.street_name) AS concatenatedAddress,
+            CONCAT_WS(', ',ui.PROVINCE_NAME, ui.CITY_NAME, ui.COUNTY_NAME, ui.STREET_NAME, ui.ADDRESS) AS concatenatedAddress,
             ui.USE_INNER_CODE AS useInnerCode,
             oi.SUPERVISORY_CODE AS supervisoryCode
         FROM
@@ -120,6 +121,7 @@
             ri.equ_type AS equType,
             ri.equ_price AS equPrice,
             ri.product_photo AS productPhoto,
+            ri.EQU_CODE,
             di.design_unit_credit_code AS designUnitCreditCode,
             di.design_unit_name AS designUnitName,
             di.design_license_num AS designLicenseNum,