导购任务

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -365,6 +365,6 @@ public interface StaffApiService {
 
     void updateStaffHead(String wxEnterpriseId ,String staffId, String headUrl);
 
-    List<StaffDTO> listByParams(String enterpriseId , String params, String wxEnterpriseId) ;
+    Page<StaffDTO> listByParams(String enterpriseId , String params, String wxEnterpriseId, BasePageInfo pageInfo) ;
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -1450,10 +1450,14 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
-    public List<StaffDTO> listByParams(String enterpriseId, String params , String wxEnterpriseId) {
+    public Page<StaffDTO> listByParams(String enterpriseId, String params , String wxEnterpriseId , BasePageInfo pageInfo) {
+        PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
         List<TabHaobanWxEnterprise> list = this.wxEnterpriseRelatedService.listByEnterpriseId(enterpriseId) ;
         List<String> wxEnterpriseIdList = list.stream().map(o->o.getWxEnterpriseId()).collect(Collectors.toList());
-        params = "%"+params+"%" ;
-        return this.staffMapper.listByParams(wxEnterpriseIdList , params) ;
+        if(StringUtils.isNotBlank(params)) {
+            params = "%"+params+"%" ;
+        }
+        List<StaffDTO> pageList = this.staffMapper.listByParams(wxEnterpriseIdList , params) ;
+        return PageUtil.changePageHelperToCurrentPage(new PageInfo<>(pageList), StaffDTO.class);
     }
 }

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -688,7 +688,10 @@
         <foreach collection="list" item="item" separator=",">
             #{item}
         </foreach> )
-          and staff_name like #{params} and status_flag = 1 limit 100
+        <if test="null !-= params">
+            and staff_name like #{params}
+        </if>
+          and status_flag = 1
     </select>
 
 </mapper>
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/clerktask/ClerkRankVO.java

@@ -9,6 +9,8 @@ public class ClerkRankVO implements Serializable {
      */
     private int rank ;
 
+    private String clerkId ;
+
     /**
      * 导购名称
      */
@@ -24,6 +26,14 @@ public class ClerkRankVO implements Serializable {
      */
     private int contentNum ;
 
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
     public int getRank() {
         return rank;
     }