Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 单位归属
+ *
+ * @author gaojianqiang
+ * @date 2021-08-19
+ */
+@Data
+@ApiModel(value = "UserDto", description = "用户信息")
+public class UserDto {
+
+    @ApiModelProperty(value = "人员类型1-维保公司；2-业主单位")
+    private String identityType;
+
+    @ApiModelProperty(value = "人员id")
+    private String personSeq;
+
+    @ApiModelProperty(value = "人员名称")
+    private String personName;
+
+    @ApiModelProperty(value = "公司id")
+    private String companyId;
+
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "字段名")
+    private String fieldCode;
+
+    @ApiModelProperty(value = "字段值")
+    private String fieldValue;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -74,6 +74,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<UserUnitDto>  getUserUnit(String id, String type, String code);
 
+    List<UserDto> getUserInfo(String id, String type, String code, String fieldCode);
+
     /**
      * 导出机场单位带过滤      bug2657 by kongfm
      * @param parentId

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

 package com.yeejoin.amos.boot.module.common.api.service;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
-import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 机构/部门/人员表 服务类
  *
@@ -159,13 +145,11 @@ public interface IOrgUsrService {
     /**
      * * @param null
      *
-	 * @return
-	 * 
-	 *         <PRE>
+     * @return <PRE>
      * author tw
      * date 2021/7/20
      * </PRE>
-	 * 
+     * <p>
      * 列表
      */
     List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
@@ -173,13 +157,11 @@ public interface IOrgUsrService {
     /**
      * * @param null
      *
-	 * @return
-	 * 
-	 *         <PRE>
+     * @return <PRE>
      * author tw
      * date 2021/7/20
      * </PRE>
-	 * 
+     * <p>
      * 统计
      */
     Integer listContractDtoCount(RequestData par);
@@ -187,9 +169,7 @@ public interface IOrgUsrService {
     /**
      * * @param null
      *
-	 * @return
-	 * 
-	 *         <PRE>
+     * @return <PRE>
      * author tw
      * date 2021/7/26
      * </PRE>
@@ -205,6 +185,8 @@ public interface IOrgUsrService {
 
     UserUnitDto getUserUnit(String userId);
 
+    List<UserDto> getUserInfo(String userId);
+
     /**
      * 根据登陆人获取公司部门人员树
      */
@@ -229,9 +211,9 @@ public interface IOrgUsrService {
 
     /**
      * 根据parentId 导出机场单位人员    bug2657 by kongfm
+     *
      * @param parentId
      * @return
      */
     List<OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -421,6 +421,34 @@ GROUP BY
         ORDER BY
             u.sequence_nbr DESC
     </select>
+    <select id="getUserInfo" resultType="com.yeejoin.amos.boot.module.common.api.dto.UserDto">
+        SELECT
+            u.sequence_nbr AS personSeq,
+            u.biz_org_name AS personName,
+            '2' AS identityType,
+            u.biz_org_code,
+            f.field_code,
+            f.field_value
+        FROM
+            `cb_org_usr` u
+            LEFT JOIN cb_dynamic_form_instance f ON f.instance_id = u.sequence_nbr
+        <where>
+            <if test="id != null and id != ''">
+                u.amos_org_id = #{id}
+            </if>
+            <if test="type != null and type != ''">
+                AND u.biz_org_type = #{type}
+            </if>
+            <if test="code != null and code != ''">
+                AND u.biz_org_code LIKE CONCAT(#{code}, '%')
+            </if>
+            <if test="fieldCode != null and fieldCode != ''">
+                AND f.field_code IN ( #{fieldCode})
+            </if>
+        </where>
+        ORDER BY
+            u.sequence_nbr DESC
+    </select>
     <!--BUG2655 导出机场人员存在已删除数据 bykongfm-->
     <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto">
          select

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -399,6 +399,19 @@ public class OrgUsrController extends BaseController {
     }
 
     /**
+     * 获取用户信息
+     *
+     * @param userId
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{userId}/userInfo", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取用户信息", notes = "获取用户信息")
+    public ResponseModel<List<UserDto>> getUserInfo(@PathVariable String userId) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getUserInfo(userId));
+    }
+
+    /**
      * 获取登陆人绑定的人员关系
      *
      * @param

amos-boot-system-jcs/src/main/resources/application.properties

@@ -74,7 +74,7 @@ jcs.company.topic.delete=jcs/company/topic/delete
 
 iot.fegin.name=AMOS-API-IOT
 
-equip.fegin.name=AMOS-EQUIPMANAGE-kfm
+equip.fegin.name=AMOS-EQUIPMANAGE
 
 ## 设备联动服务（车库门、广播、警铃）
 control.fegin.name=JCS-API-CONTROL