建筑修改

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/BuildingTreeVo.java

@@ -76,5 +76,8 @@ public class BuildingTreeVo {
 
     @ApiModelProperty("机构编码")
     private String bizOrgCode;
+
+    @ApiModelProperty("机构名称")
+    private String bizOrgName;
     
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1142,6 +1142,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             vo.setParentId(orgUsrDto.getParentId());
             vo.setName(orgUsrDto.getBizOrgName());
             vo.setId(orgUsrDto.getSequenceNbr());
+            vo.setBizOrgName(orgUsrDto.getBizOrgName());
             if ("".equals(orgUsrDto.getParentId()) || "-1".equals(orgUsrDto.getParentId()) || null == orgUsrDto.getParentId()) {
                 flag.set(true);
             }

amos-boot-system-equip/src/main/resources/mapper/FormInstanceMapper.xml

@@ -88,7 +88,8 @@
         MAX( CASE WHEN a.field_name = 'code' THEN a.field_value END ) AS code,
         MAX( CASE WHEN a.field_name = 'isRisk' THEN a.field_value END ) AS isRisk,
         MAX( CASE WHEN a.field_name = 'address' THEN a.field_value END ) AS address,
-        MAX( CASE WHEN a.field_name = 'bizOrgCode' THEN a.field_value END ) AS bizOrgCode
+        MAX( CASE WHEN a.field_name = 'bizOrgCode' THEN a.field_value END ) AS bizOrgCode,
+        MAX( CASE WHEN a.field_name = 'bizOrgName' THEN a.field_value END ) AS bizOrgName
         FROM
         `wl_form_instance` a
         LEFT JOIN wl_source_scene wlss ON wlss.source_id = a.instance_id
@@ -353,6 +354,8 @@
              parent_id,
              warehouse_id,
              create_date,
+             biz_org_name,
+             biz_org_code,
              source_id)
              VALUES(
              #{instanceId},
@@ -362,7 +365,9 @@
              #{parentId},
              0,
              now(),
-              #{instanceId})
+             #{bizOrgCode},
+             #{bizOrgName},
+             #{instanceId})
     </insert>
     <select id="getStuctureName" resultType="String">
         select full_name from wl_warehouse_structure