Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

coolstore-partner-dao/src/main/java/com/cool/store/dao/LineAuditInfoDAO.java

@@ -37,4 +37,8 @@ public class LineAuditInfoDAO {
         return lineAuditInfoMapper.getLineAuditInfoList(auditIds);
     }
 
+
+    public LineAuditInfoDO getAuditInfoByLineId(Long lineId){
+        return lineAuditInfoMapper.getLineAuditInfo(lineId);
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineAuditInfoMapper.java

@@ -16,5 +16,12 @@ public interface LineAuditInfoMapper extends Mapper<LineAuditInfoDO> {
      */
     List<LineAuditInfoDO> getLineAuditInfoList(@Param("ids") List<Long> ids);
 
+    /**
+     * 结束跟进记录
+     * @param lineId
+     * @return
+     */
+    LineAuditInfoDO getLineAuditInfo(@Param("lineId") Long lineId);
+
 
 }

coolstore-partner-dao/src/main/resources/mapper/LineAuditInfoMapper.xml

@@ -28,4 +28,10 @@
       </if>
     </where>
   </select>
+
+  <select id="getLineAuditInfo" resultMap="BaseResultMap">
+    select * from
+    xfsg_line_audit_info
+    where line_id = #{lineId} and result_type = 2 order by id desc limit 1
+  </select>
 </mapper>

coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

@@ -403,6 +403,9 @@
     <if test="userId != null and userId != ''">
       and a.investment_manager = #{userId}
     </if>
+    <if test="request.joinStatus != null">
+      and a.join_status = #{request.joinStatus}
+    </if>
     <if test="request.keyword != null and request.keyword!=''">
       and (a.username like #{request.keyword} or a.mobile like #{request.keyword})
     </if>