scrm sop批量功能

config/run/bootstrap.yml

@@ -1,9 +1,11 @@
 spring:
   profiles:
-    active: '@spring.profiles.active@'
+    active: dev
 ---
 spring:
-  profiles: dev
+  config:
+    activate:
+      on-profile: dev
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true
@@ -12,7 +14,7 @@ spring:
       # 配置中心
       config:
         # 命名空间id(此处不用public,因public初始化的空间, id为空)  4e237601-cea8-414d-b7b9-d7adc8cbcf95
-        namespace: ewscrm
+        namespace: 4e237601-cea8-414d-b7b9-d7adc8cbcf95
         # nacos的ip地址和端口 120.79.64.17:10848
         server-addr: 127.0.0.1:8848
         # 这个就表示 在我们nacos命名空间id为 dev中 有一个data-id 为 demo-service.yml 的配置文件 读取这个里面的配置

linkwe-api/pom.xml

@@ -127,6 +127,15 @@
                     </container>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

linkwe-api/src/main/java/com/linkwechat/controller/WeCommunityH5Controller.java

@@ -45,7 +45,8 @@ public class WeCommunityH5Controller extends BaseController {
     @GetMapping("/scope/{taskId}")
     public AjaxResult getTaskScopeList(@PathVariable("taskId") Long taskId, @RequestParam(value = "type") Integer type) {
         if (type.equals(MessageNoticeType.TAG.getType())) {
-            return AjaxResult.success(iWePresTagGroupTaskService.getScopeListByTaskId(taskId));
+//            return AjaxResult.success(iWePresTagGroupTaskService.getScopeListByTaskId(taskId));
+            return AjaxResult.success();
         } else {
             return AjaxResult.success(iWeGroupSopService.getScopeListByRuleId(taskId));
         }
@@ -64,8 +65,8 @@ public class WeCommunityH5Controller extends BaseController {
         WeEmplTaskVo weEmplTaskVo=new WeEmplTaskVo();
         if (type.equals(MessageNoticeType.TAG.getType())) {
             // 老客标签建群数据
-            weEmplTaskVo.setDone(iWePresTagGroupTaskService.getFollowerTaskList(emplId, 1));
-            weEmplTaskVo.setTodo(iWePresTagGroupTaskService.getFollowerTaskList(emplId, 0));
+//            weEmplTaskVo.setDone(iWePresTagGroupTaskService.getFollowerTaskList(emplId, 1));
+//            weEmplTaskVo.setTodo(iWePresTagGroupTaskService.getFollowerTaskList(emplId, 0));
         } else if (type.equals(MessageNoticeType.SOP.getType())) {
             // 群SOP数据
             weEmplTaskVo.setTodo(iWeGroupSopService.getEmplTaskList(emplId, false));
@@ -74,10 +75,10 @@ public class WeCommunityH5Controller extends BaseController {
             // 全部数据
             List todoList = new ArrayList();
             List doneList = new ArrayList();
-            todoList.addAll(iWePresTagGroupTaskService.getFollowerTaskList(emplId, 0));
+//            todoList.addAll(iWePresTagGroupTaskService.getFollowerTaskList(emplId, 0));
             todoList.addAll(iWeGroupSopService.getEmplTaskList(emplId, false));
             weEmplTaskVo.setTodo(todoList);
-            doneList.addAll(iWePresTagGroupTaskService.getFollowerTaskList(emplId, 1));
+//            doneList.addAll(iWePresTagGroupTaskService.getFollowerTaskList(emplId, 1));
             doneList.addAll(iWeGroupSopService.getEmplTaskList(emplId, true));
             weEmplTaskVo.setDone(doneList);
         }
@@ -97,8 +98,8 @@ public class WeCommunityH5Controller extends BaseController {
     @GetMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestParam("taskId") Long taskId, @RequestParam("emplId") String emplId, @RequestParam("type") Integer type) {
         if (type.equals(0)) {
-
-            return toAjax(iWePresTagGroupTaskService.updateFollowerTaskStatus(taskId, emplId));
+            return null;
+//            return toAjax(iWePresTagGroupTaskService.updateFollowerTaskStatus(taskId, emplId));
         } else {
             return toAjax(iWeGroupSopService.updateChatSopStatus(taskId, emplId));
         }
@@ -114,7 +115,8 @@ public class WeCommunityH5Controller extends BaseController {
     @GetMapping(path = "/filter")
     public TableDataInfo filter(@RequestParam("taskNameOrKeys") String word) {
         startPage();
-        List<WeKeywordGroupTask> taskList = keywordToGroupService.filterByNameOrKeyword(word);
+        List<WeKeywordGroupTask> taskList=new ArrayList<>();
+//        List<WeKeywordGroupTask> taskList = keywordToGroupService.filterByNameOrKeyword(word);
         return getDataTable(taskList);
     }
 

linkwe-api/src/main/java/com/linkwechat/controller/WeSopController.java

@@ -5,6 +5,8 @@ import com.linkwechat.common.core.domain.AjaxResult;
 import com.linkwechat.common.core.page.TableDataInfo;
 import com.linkwechat.common.utils.SecurityUtils;
 import com.linkwechat.domain.sop.WeSopBase;
+import com.linkwechat.domain.sop.dto.WeSopBaseDto;
+import com.linkwechat.domain.sop.dto.WeSopBaseUpdDto;
 import com.linkwechat.service.IWeSopBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -248,6 +250,16 @@ public class WeSopController extends BaseController {
         return AjaxResult.success();
     }
 
+    /**
+     * 批量启用/停止
+     *
+     * @return
+     */
+    @PostMapping("/updateSopStateBatch")
+    public AjaxResult updateSopStateBatch(@RequestBody WeSopBaseUpdDto dto) {
+        iWeSopBaseService.updateSopStateBatch(dto);
+        return AjaxResult.success();
+    }
 
     /**
      * 执行sop

linkwe-scheduler/src/main/java/com/linkwechat/scheduler/task/WeFormSurveySiteStatsTask.java

@@ -207,9 +207,9 @@ public class WeFormSurveySiteStatsTask {
             if (list != null && list.size() > 0) {
                 double sum = list.stream().flatMapToDouble(item -> DoubleStream.of(item.getTotalTime())).sum();
                 Double averageTime = sum / 1000 / list.size();
-                weFormSurveyStatistics.setAverageTime(averageTime.intValue());
+                weFormSurveyStatistics.setAverageTime(String.valueOf(averageTime.intValue()));
             } else {
-                weFormSurveyStatistics.setAverageTime(0);
+                weFormSurveyStatistics.setAverageTime("0");
             }
             weFormSurveyStatistics.setCreateTime(DateUtil.parseDate(dateStr));
             weFormSurveyStatistics.setDelFlag(Constants.COMMON_STATE);

linkwe-service/src/main/java/com/linkwechat/domain/sop/dto/WeSopBaseUpdDto.java

@@ -0,0 +1,32 @@
+package com.linkwechat.domain.sop.dto;
+
+import com.linkwechat.common.core.domain.model.LoginUser;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+public class WeSopBaseUpdDto implements Serializable {
+    //sop主键
+    private String sopBaseIds;
+    //状态
+    private String sopState;
+
+    public String getSopBaseIds() {
+        return sopBaseIds;
+    }
+
+    public void setSopBaseIds(String sopBaseIds) {
+        this.sopBaseIds = sopBaseIds;
+    }
+
+    public String getSopState() {
+        return sopState;
+    }
+
+    public void setSopState(String sopState) {
+        this.sopState = sopState;
+    }
+}

linkwe-service/src/main/java/com/linkwechat/mapper/WeSopBaseMapper.java

@@ -3,6 +3,7 @@ package com.linkwechat.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.linkwechat.domain.sop.WeSopBase;
+import com.linkwechat.domain.sop.dto.WeSopBaseUpdDto;
 import com.linkwechat.domain.sop.vo.WeSopDetailCustomerVo;
 import com.linkwechat.domain.sop.vo.WeSopDetailGroupVo;
 import com.linkwechat.domain.sop.vo.WeSopDetailTabVo;
@@ -108,6 +109,12 @@ public interface WeSopBaseMapper extends BaseMapper<WeSopBase> {
      */
     void  updateSopState(@Param("sopId") String sopId,@Param("sopState") Integer sopState);
 
+    /**
+     * 批量更新sop状态
+     *
+     * @param
+     */
+    void updateSopStateBatch(@Param("sopBaseIds") String sopBaseIds, @Param("sopState") String sopState);
 
 }
 

linkwe-service/src/main/java/com/linkwechat/service/IWeSopBaseService.java

@@ -1,14 +1,17 @@
 package com.linkwechat.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.linkwechat.common.core.domain.AjaxResult;
 import com.linkwechat.common.core.page.TableDataInfo;
 import com.linkwechat.domain.WeCustomer;
 import com.linkwechat.domain.customer.vo.WeCustomersVo;
 import com.linkwechat.domain.groupchat.vo.LinkGroupChatListVo;
 import com.linkwechat.domain.sop.WeSopBase;
+import com.linkwechat.domain.sop.dto.WeSopBaseUpdDto;
 import com.linkwechat.domain.sop.vo.*;
 import com.linkwechat.domain.sop.vo.content.*;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -206,5 +209,12 @@ public interface IWeSopBaseService extends IService<WeSopBase> {
      */
     void  updateSopState(String sopId,Integer sopState);
 
+    /**
+     * 批量更新sop状态
+     * @param dto
+     */
+    void updateSopStateBatch(WeSopBaseUpdDto dto);
+
+
 }
 

linkwe-service/src/main/java/com/linkwechat/service/impl/WeSopBaseServiceImpl.java

@@ -31,6 +31,7 @@ import com.linkwechat.domain.groupchat.vo.LinkGroupChatListVo;
 import com.linkwechat.domain.media.WeMessageTemplate;
 import com.linkwechat.domain.sop.*;
 import com.linkwechat.domain.sop.dto.WeSopBaseDto;
+import com.linkwechat.domain.sop.dto.WeSopBaseUpdDto;
 import com.linkwechat.domain.sop.dto.WeSopPushTimeDto;
 import com.linkwechat.domain.sop.vo.*;
 import com.linkwechat.domain.sop.vo.content.*;
@@ -1301,6 +1302,10 @@ public class WeSopBaseServiceImpl extends ServiceImpl<WeSopBaseMapper, WeSopBase
         this.baseMapper.updateSopState(sopId,sopState);
     }
 
+    @Override
+    public void updateSopStateBatch(WeSopBaseUpdDto dto) {
+        this.baseMapper.updateSopStateBatch(dto.getSopBaseIds(), dto.getSopState());
+    }
 
 
 }

linkwe-service/src/main/resources/mapper/wecom/WeSopBaseMapper.xml

@@ -299,7 +299,11 @@
 
     </update>
 
-
-
+    <update id="updateSopStateBatch">
+        update we_sop_base set sop_state = #{sopState} where id in
+        <foreach collection="sopBaseIds.split(',')" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
 
 </mapper>

pom.xml

@@ -608,6 +608,15 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
         </plugins>
 
     </build>