ApplyTagEditVO(add)

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

@@ -41,4 +41,14 @@ public class ApplyTagEditVO implements Serializable {
     private String remark;
     @ApiModelProperty(value = "附件")
     private List<AttachmentVO> attachmentList;
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+    @ApiModelProperty(value = "品牌名称")
+    private String brandName;
+    @ApiModelProperty(value = "品牌logo")
+    private String brandLogo;
+    @ApiModelProperty(value = "营业执照")
+    private String licenseImg;
+
+
 }

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

@@ -82,6 +82,16 @@ public class UserApplyTagDO implements Serializable {
                 .lon(this.companyInfoDO == null ? null : this.companyInfoDO.getLon())
                 .content(this.companyInfoDO == null ? null : this.companyInfoDO.getContent())
                 .score(this.companyInfoDO == null ? null : this.companyInfoDO.getScore())
+                .attachmentList(this.attachmentList)
+                .content(this.companyInfoDO == null ? null : this.companyInfoDO.getContent())
+                .score(this.companyInfoDO == null ? null : this.companyInfoDO.getScore())
+                .companyName(this.companyInfoDO == null ? null : this.companyInfoDO.getCompanyName())
+                .brandName(this.companyInfoDO == null ? null : this.companyInfoDO.getBrandName())
+                .brandLogo(this.companyInfoDO == null ? null : this.companyInfoDO.getBrandLogo())
+                .licenseImg(this.companyInfoDO == null ? null : this.companyInfoDO.getLicenseImg())
+                .address(this.companyInfoDO == null ? null : this.companyInfoDO.getAddress())
+                .lat(this.companyInfoDO == null ? null : this.companyInfoDO.getLat())
+                .lon(this.companyInfoDO == null ? null : this.companyInfoDO.getLon())
                 .build();
     }
 }

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

@@ -144,26 +144,30 @@
     </select>
 
     <select id="getUserApplyTag" resultMap="UserApplyTagResultMap">
-        SELECT
-            ua.id,
-            ua.cooperation_tag_id,
-            ua.user_account_id,
-            ua.apply_name,
-            ua.apply_phone,
-            ua.apply_status,
-            ua.remark,
-            ua.create_time,
-            ci.id as company_info_id,
-            ci.address,
-            ci.company_name AS `name`,
-            ci.lat,
-            ci.lon,
-            ci.content,
-            ci.score
-        FROM
-            user_apply_tag ua
-            INNER JOIN company_member cm ON cm.user_account_id = ua.user_account_id
-            INNER JOIN company_info ci ON cm.company_info_id = ci.id
+        SELECT ua.id,
+               ua.cooperation_tag_id,
+               ua.user_account_id,
+               ua.apply_name,
+               ua.apply_phone,
+               ua.apply_status,
+               ua.remark,
+               ua.create_time,
+               ct.tag_name,
+               ci.id AS company_info_id,
+               ci.company_name,
+               ci.brand_name,
+               ci.brand_logo,
+               ci.credit_code,
+               ci.license_img,
+               ci.address,
+               ci.lat,
+               ci.lon,
+               ci.content,
+               ci.score
+        FROM user_apply_tag ua
+                 INNER JOIN cooperation_tag ct ON ua.cooperation_tag_id = ct.id
+                 INNER JOIN company_member cm ON cm.user_account_id = ua.user_account_id
+                 INNER JOIN company_info ci ON cm.company_info_id = ci.id
         WHERE ua.id = #{id}
           AND ua.is_deleted = 0
     </select>
@@ -286,28 +290,27 @@
     </select>
     <select id="countServiceBitmapData" resultType="java.lang.Integer">
         SELECT count(*)
-        FROM
-            user_apply_tag uat
-            INNER JOIN cooperation_tag ct ON uat.cooperation_tag_id = ct.id
-        WHERE ct.id = #{type} and uat.is_deleted = 0
+        FROM user_apply_tag uat
+                 INNER JOIN cooperation_tag ct ON uat.cooperation_tag_id = ct.id
+        WHERE ct.id = #{type}
+          and uat.is_deleted = 0
     </select>
     <select id="listServiceBitmapData" resultType="com.mmc.iuav.user.entity.WebsiteInfoDO">
-        SELECT
-            uat.id,
-            ci.company_name AS `name`,
-            ci.address,
-            ci.lon,
-            ci.lat,
-            ct.id AS type,
-            ci.content,
-            ci.score,
-            st_distance_sphere(point(ci.lon,ci.lat), point(${lon}, ${lat})) AS distance
-        FROM
-            user_apply_tag uat
-            INNER JOIN cooperation_tag ct ON uat.cooperation_tag_id = ct.id
-            INNER JOIN company_member cm ON cm.user_account_id = uat.user_account_id
-            INNER JOIN company_info ci ON cm.company_info_id = ci.id
-        WHERE ct.id = #{type} and uat.is_deleted = 0
+        SELECT uat.id,
+               ci.company_name                                                  AS `name`,
+               ci.address,
+               ci.lon,
+               ci.lat,
+               ct.id                                                            AS type,
+               ci.content,
+               ci.score,
+               st_distance_sphere(point(ci.lon, ci.lat), point(${lon}, ${lat})) AS distance
+        FROM user_apply_tag uat
+                 INNER JOIN cooperation_tag ct ON uat.cooperation_tag_id = ct.id
+                 INNER JOIN company_member cm ON cm.user_account_id = uat.user_account_id
+                 INNER JOIN company_info ci ON cm.company_info_id = ci.id
+        WHERE ct.id = #{type}
+          and uat.is_deleted = 0
         ORDER BY distance ASC
             LIMIT #{pageNo}, #{pageSize}
     </select>
@@ -395,7 +398,8 @@
         select count(*)
         from user_apply_tag
         where user_account_id = #{userAccountId}
-          and is_deleted = 0 and apply_status = 1
+          and is_deleted = 0
+          and apply_status = 1
     </select>