企业账号注册审核待审核已审核列表显示错误

sql/20191230.sql

@@ -1 +1,4 @@
-ALTER TABLE ac_activity_registration ADD sign_time datetime DEFAULT NULL COMMENT '签到时间' AFTER review_state
+ALTER TABLE ac_activity_registration ADD sign_time datetime DEFAULT NULL COMMENT '签到时间' AFTER review_state
+ALTER TABLE ac_activity_detail ADD lat_lng varchar(255) DEFAULT NULL COMMENT '活动地址坐标' AFTER activity_location
+ALTER TABLE ac_activity_registration ADD company_name  varchar(255) DEFAULT NULL COMMENT '公司名称' AFTER company_id
+ALTER TABLE ac_activity_registration ADD industry_name varchar(255) DEFAULT NULL COMMENT '行业名称' AFTER company_id

src/main/java/platform/modules/build/dao/CompanyDao.java

@@ -65,11 +65,17 @@ public interface CompanyDao extends BaseMapper<Company> {
 
     List<Company> selectCompanyByCondition(@Param("street_id") Integer street_id, @Param("build_id") Integer build_id, @Param("param") String param);
 
-    List<Company> findCompanyByCondition(@Param("currentStreet_id") Integer currentStreet_id, @Param("currentUserId") Integer currentUserId,
-                                         @Param("type") String type, @Param("keyword") String keyword, @Param("searchCondition") Company searchCondition);
-
-    List<Company> findListByContidion(@Param("currentUserId") Integer userId, @Param("currentStreet_id") Integer currentStreet_id,
-                                      @Param("companyRegister") String companyRegister, @Param("keyword") String keyword, @Param("searchCondition") Company searchCondition);
+    List<Company> findCompanyByCondition(@Param("currentStreet_id") Integer currentStreet_id,
+                                         @Param("currentUserId") Integer currentUserId,
+                                         @Param("type") String type,
+                                         @Param("keyword") String keyword,
+                                         @Param("searchCondition") Company searchCondition);
+
+    List<Company> findListByContidion(@Param("currentUserId") Integer userId,
+                                      @Param("currentStreet_id") Integer currentStreet_id,
+                                      @Param("companyRegister") String companyRegister,
+                                      @Param("keyword") String keyword,
+                                      @Param("searchCondition") Company searchCondition);
 
     Integer isCompanyExist(@Param("company_name") String company_name, @Param("organization_code") String organization_code);
 

src/main/resources/mapper/build/CompanyDao.xml

@@ -139,6 +139,7 @@
 
 
 
+
         ]]>
     </select>
 
@@ -339,7 +340,10 @@
         u.phone as phone
         FROM
         y_company a
-        LEFT JOIN z_approval b ON a.id = b.APPLY_ID
+        LEFT JOIN (
+            <include refid="query_last_approval"/>
+        )
+        b ON a.id = b.APPLY_ID
         LEFT JOIN z_user u ON a.create_by = u.id
         WHERE
         b.TYPE = #{type}
@@ -367,6 +371,13 @@
         ORDER BY c.create_time DESC
     </select>
 
+    <sql id="query_last_approval">
+        select approval.* from z_approval approval, (
+        select APPLY_ID, max(id) as id from z_approval
+        GROUP BY APPLY_ID ) approval_b
+        where approval.id = approval_b.id
+    </sql>
+
     <!-- 企业注册待审批列表 -->
     <select id="findListByContidion" resultType="platform.modules.build.entity.Company">
         SELECT
@@ -378,14 +389,13 @@
 
         FROM
         y_company a
-        LEFT JOIN z_approval b ON a.id = b.APPLY_ID
+        LEFT JOIN (
+            <include refid="query_last_approval" />
+        ) b ON a.id = b.APPLY_ID
         LEFT JOIN z_user u ON a.create_by = u.id
         WHERE
         b.TYPE = #{companyRegister}
-        AND b.create_time IN ( SELECT max( CREATE_TIME ) FROM z_approval where TYPE = #{companyRegister} GROUP BY
-        APPLY_ID )
         and a.street_id=#{currentStreet_id}
-
         <if test="currentUserId !=null">
             and b.NEXTCHECKER LIKE CONCAT(CONCAT('%',#{currentUserId}), '%')
         </if>