Merge branch 'feature/xgh/导购任务' into 'developer'

导购任务

See merge request !2150

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/clerktask/ClerkTaskController.java

@@ -14,7 +14,6 @@ import com.gic.marketing.pro.api.qdto.clerktask.ClerkRankQDTO;
 import com.gic.marketing.pro.api.qdto.clerktask.ClerkTaskContentPageQDTO;
 import com.gic.marketing.pro.api.qdto.clerktask.ClerkTaskPageQDTO;
 import com.gic.marketing.pro.api.service.clerktask.ClerkTaskApiService;
-import com.gic.web.common.utils.SessionContextUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -49,7 +48,7 @@ public class ClerkTaskController {
         qdto.setEnterpriseId(enterpriseId);
         qdto.setPageNum(1);
         qdto.setPageSize(1);
-        ServiceResponse<Page<ClerkTaskPlanDTO>> resp =this.clerkTaskApiService.page(qdto) ;
+        ServiceResponse<Page<ClerkTaskPlanDTO>> resp =this.clerkTaskApiService.hbPage(qdto) ;
         if(null != resp.getResult()) {
             return RestResponse.successResult(resp.getResult().getTotalCount()) ;
         }
@@ -64,7 +63,7 @@ public class ClerkTaskController {
     @ResponseBody
     public RestResponse<Page<ClerkTaskListVO>> taskList(@RequestBody ClerkTaskListQO qo) {
         ClerkTaskPageQDTO qdto = EntityUtil.changeEntityByJSON(ClerkTaskPageQDTO.class,qo) ;
-        ServiceResponse<Page<ClerkTaskPlanDTO>> resp =this.clerkTaskApiService.page(qdto) ;
+        ServiceResponse<Page<ClerkTaskPlanDTO>> resp =this.clerkTaskApiService.hbPage(qdto) ;
         Page<ClerkTaskPlanDTO> page = resp.getResult();
         Page<ClerkTaskListVO> retPage = PageHelperUtils.changePageToCurrentPage(page, ClerkTaskListVO.class);
         if(CollectionUtils.isNotEmpty(retPage.getResult())) {
@@ -136,8 +135,9 @@ public class ClerkTaskController {
      */
     @RequestMapping("save-content")
     @ResponseBody
-    public RestResponse<String> saveContent(@RequestBody SaveContentQO qo) {
+    public RestResponse<String> saveContent(String enterpriseId , @RequestBody SaveContentQO qo) {
         ClerkTaskContentLogDTO dto = EntityUtil.changeEntityByJSON(ClerkTaskContentLogDTO.class,qo) ;
+        dto.setEnterpriseId(enterpriseId);
         ServiceResponse<Long> resp = this.clerkTaskApiService.saveContent(dto) ;
         return RestResponse.successResult(resp.getResult()+"") ;
     }
@@ -147,8 +147,9 @@ public class ClerkTaskController {
      */
     @RequestMapping("update-content")
     @ResponseBody
-    public RestResponse<String> updateContent(@RequestBody SaveContentQO qo) {
+    public RestResponse<String> updateContent(String enterpriseId , @RequestBody SaveContentQO qo) {
         ClerkTaskContentLogDTO dto = EntityUtil.changeEntityByJSON(ClerkTaskContentLogDTO.class,qo) ;
+        dto.setEnterpriseId(enterpriseId);
         ServiceResponse<Long> resp = this.clerkTaskApiService.saveContent(dto) ;
         return RestResponse.successResult(resp.getResult()+"") ;
     }