Duan_xu преди 3 години
родител
ревизия
51563306ee
променени са 2 файла, в които са добавени 10 реда и са изтрити 5 реда
  1. 9 4
      src/main/java/com/caimei365/user/controller/ClubApi.java
  2. 1 1
      src/main/resources/mapper/ClubMapper.xml

+ 9 - 4
src/main/java/com/caimei365/user/controller/ClubApi.java

@@ -153,10 +153,10 @@ public class ClubApi {
             @ApiImplicitParam(required = false, name = "leaderId", value = "管理员协销id"),
             @ApiImplicitParam(required = false, name = "groupId", value = "组员协销id"),
             @ApiImplicitParam(required = false, name = "manager", value = "是否是协销总管理员标记 1是,2否"),
-            @ApiImplicitParam(required = true, name = "clubType", value = "机构类型"),
-            @ApiImplicitParam(required = false, name = "pinceSensitve", value = "价格敏感度"),
-            @ApiImplicitParam(required = false, name = "satisfied", value = "意向程度"),
-            @ApiImplicitParam(required = false, name = "followup", value = "跟进状态"),
+            @ApiImplicitParam(required = false, name = "clubType", value = "机构类型"),
+            @ApiImplicitParam(required = false, name = "pinceSensitve", value = "价格敏感度  1敏感,2适中,3不敏感,4不明确"),
+            @ApiImplicitParam(required = false, name = "satisfied", value = "意向程度   1意向强烈,2意向一般,3意向平淡,4随便看看"),
+            @ApiImplicitParam(required = false, name = "followup", value = "跟进状态   1跟进中,2跟进完成,3已放弃"),
             @ApiImplicitParam(required = false, name = "extra", value = "额外说明"),
             @ApiImplicitParam(required = false, name = "pageNum", value = "页码"),
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
@@ -334,6 +334,11 @@ public class ClubApi {
     @ApiImplicitParams({
             @ApiImplicitParam(required = true, name = "questionManId", value = "咨询人id"),
             @ApiImplicitParam(required = false, name = "keyWord", value = "模糊搜索关键词"),
+            @ApiImplicitParam(required = false, name = "clubType", value = "机构类型"),
+            @ApiImplicitParam(required = false, name = "pinceSensitve", value = "价格敏感度  1敏感,2适中,3不敏感,4不明确"),
+            @ApiImplicitParam(required = false, name = "satisfied", value = "意向程度   1意向强烈,2意向一般,3意向平淡,4随便看看"),
+            @ApiImplicitParam(required = false, name = "followup", value = "跟进状态   1跟进中,2跟进完成,3已放弃"),
+            @ApiImplicitParam(required = false, name = "extra", value = "额外说明"),
             @ApiImplicitParam(required = false, name = "pageNum", value = "页码"),
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
     })

+ 1 - 1
src/main/resources/mapper/ClubMapper.xml

@@ -653,7 +653,7 @@
                 </foreach>
             </if>
         </where>
-        ORDER BY ccr.ADDTIME DESC
+        ORDER BY ccr.addtime DESC
     </select>
     <select id="findLeaderId" resultType="java.lang.Integer">
         SELECT leaderId FROM cm_serviceteam_role csr