单位管理修改

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/CompanyInfoVO.java

@@ -52,6 +52,14 @@ public class CompanyInfoVO implements Serializable {
     private String remark;
     @ApiModelProperty(value = "用户id")
     private Integer userAccountId;
+    @ApiModelProperty(value = "纬度")
+    private Double lat;
+    @ApiModelProperty(value = "经度")
+    private Double lon;
+    @ApiModelProperty(value = "社会信用代码")
+    private String creditCode;
+    @ApiModelProperty(value = "营业执照")
+    private String licenseImg;
 
     @ApiModelProperty(value = "品牌名称", example = "科比特")
     private String brandName;

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserAccountVO.java

@@ -65,4 +65,6 @@ public class UserAccountVO implements Serializable {
     private List<CooperationTagVO> cooperationTagVOS;
     @ApiModelProperty(value = "上级推荐人")
     private UserRcdVO userRcdVO;
+    @ApiModelProperty(value = "是否是单位管理员")
+    private Integer leader;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CompanyController.java

@@ -4,6 +4,7 @@ import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
+import com.mmc.iuav.user.model.vo.UserAccountVO;
 import com.mmc.iuav.user.service.CompanyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -102,10 +103,10 @@ public class CompanyController extends BaseController {
     @ApiOperation(value = "成员-列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("listCompanyMembers")
-    public ResultBody listCompanyMembers(HttpServletRequest request,
-                                         @RequestParam Integer companyInfoId,
-                                         @RequestParam Integer pageNo,
-                                         @RequestParam Integer pageSize) {
+    public ResultBody<UserAccountVO> listCompanyMembers(HttpServletRequest request,
+                                                        @RequestParam Integer companyInfoId,
+                                                        @RequestParam Integer pageNo,
+                                                        @RequestParam Integer pageSize) {
         return companyService.listCompanyMembers(companyInfoId, this.getUserLoginInfoFromRedis(request), pageNo, pageSize);
     }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/CompanyInfoDO.java

@@ -48,6 +48,7 @@ public class CompanyInfoDO implements Serializable {
                 .brandName(brandName)
                 .brandLogo(brandLogo)
                 .userAccountId(userAccountId)
+                .lon(this.lon).lat(this.lat).creditCode(this.creditCode).licenseImg(this.licenseImg)
                 .city(city).district(district).address(address).companyUserName(companyUserName).phoneNum(phoneNum).remark(remark).build();
     }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserAccountDO.java

@@ -46,6 +46,7 @@ public class UserAccountDO implements Serializable {
 
     private Integer companyAuthStatus;
     private String companyName;
+    private Integer leader;
     /**
      * 邀请人数
      */
@@ -91,6 +92,7 @@ public class UserAccountDO implements Serializable {
                 .inviteCount(this.inviteCount)
                 .cooperationTagVOS(CollectionUtils.isEmpty(this.cooperationTagDOS) ? null : this.cooperationTagDOS.stream().map(CooperationTagDO::buildCooperationTagVO).collect(Collectors.toList()))
                 .userRcdVO(this.userRcdDO == null ? null : this.userRcdDO.buildUserRcdVO())
+                .leader(this.leader)
                 .build();
     }
 

csm-service/cms-service-user/src/main/resources/mapper/CompanyDao.xml

@@ -76,7 +76,8 @@
     </delete>
 
     <select id="getCompanyInfoById" resultType="com.mmc.iuav.user.entity.CompanyInfoDO">
-        select id, company_type, company_name, full_name, province, city, district, address, company_user_name, phone_num, remark, create_time
+        select id, company_type, company_name, full_name, province, city, district, address, company_user_name,
+         phone_num, remark, create_time, lon, lat, credit_code, license_img, brand_name, brand_logo
         from company_info
         where id = #{id} and is_deleted = 0
     </select>
@@ -96,7 +97,7 @@
     <select id="listCompanyPage" resultType="com.mmc.iuav.user.entity.CompanyInfoDO"
             parameterType="com.mmc.iuav.user.model.qo.CompanyInfoQO">
         select id, company_type, company_name, full_name, province, city, district, address, company_user_name,
-        phone_num, remark, create_time
+        phone_num, remark, create_time, lon, lat, credit_code, license_img, brand_name, brand_logo
         from company_info
         where is_deleted = 0
         <if test="companyName != null">
@@ -189,7 +190,8 @@
             ua.user_name,
             ua.nick_name,
             ua.phone_num,
-            ua.user_img
+            ua.user_img,
+            cm.is_leader as leader
         FROM
             company_member cm
             INNER JOIN company_info ci ON cm.company_info_id = ci.id