企业微信会员管理-转移

fs-admin/src/main/java/com/fs/his/task/FsCourseTask.java

@@ -1,6 +1,7 @@
 package com.fs.his.task;
 
 import com.fs.course.service.IFsCourseWatchLogService;
+import com.fs.qw.service.ICustomerTransferApprovalQwService;
 import com.fs.qw.service.ICustomerTransferApprovalService;
 import com.fs.qw.service.IHyWorkTaskService;
 import com.fs.statis.service.FsStatisSalerWatchService;
@@ -21,8 +22,12 @@ public class FsCourseTask {
 
     @Autowired
     private FsStatisSalerWatchService fsStatisSalerWatchService;
+
     @Autowired
     private ICustomerTransferApprovalService customerTransferApprovalService;
+
+    @Autowired
+    private ICustomerTransferApprovalQwService customerTransferApprovalQwService;
     /**
      * 添加会员观看日志
      * @throws Exception
@@ -58,4 +63,11 @@ public class FsCourseTask {
         customerTransferApprovalService.autoApprovePass();
     }
 
+    /**
+     * 企微客户转移审批自动通过
+     */
+    public void fsUserTransferAutoPassQw(){
+        customerTransferApprovalQwService.autoApprovePassQw();
+    }
+
 }

fs-admin/src/main/java/com/fs/qw/controller/FsUserAdminByQwController.java

@@ -71,7 +71,7 @@ public class FsUserAdminByQwController extends BaseController {
         if(param.getCompanyUserId() == null) {
             throw new IllegalArgumentException("当前销售不存在！");
         }
-        return fsUserService.selectFsUserPageListNew(param);
+        return fsUserService.selectFsUserPageListNewQw(param);
     }
 
     /**

fs-company/src/main/java/com/fs/company/controller/qw/FsUserAdminByQwController.java

@@ -92,7 +92,7 @@ public class FsUserAdminByQwController extends BaseController {
         if(param.getCompanyUserId() == null) {
             throw new IllegalArgumentException("当前销售不存在！");
         }
-        return fsUserService.selectFsUserPageListNew(param);
+        return fsUserService.selectFsUserPageListNewQw(param);
     }
 
     /**
@@ -100,7 +100,7 @@ public class FsUserAdminByQwController extends BaseController {
      * @param param
      */
     @PostMapping("/transfer")
-    @PreAuthorize("@ss.hasPermi('user:fsUserQw:transfer')")
+    @PreAuthorize("@ss.hasPermi('user:fsUserQw:transfer') || @ss.hasPermi('user:fsUserQw:myTransfer') ")
     public R transfer(@RequestBody FsUserTransferParamDTO param){
         log.info("客户转移: {}",param);
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());

fs-company/src/main/java/com/fs/transfer/CustomerTransferApprovalQwController.java

@@ -45,6 +45,20 @@ public class CustomerTransferApprovalQwController extends BaseController
     @PreAuthorize("@ss.hasPermi('qw:approval:list')")
     @GetMapping("/list")
     public TableDataInfo list(CustomerTransferApprovalQw customerTransferApprovalQw)
+    {
+        startPage();
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        customerTransferApprovalQw.setCorpId(String.valueOf(loginUser.getCompany().getCompanyId()));
+        List<CustomerTransferApprovalQw> list = customerTransferApprovalQwService.selectCustomerTransferApprovalQwList(customerTransferApprovalQw);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询我的客户转移审批-企微的列表
+     */
+    @PreAuthorize("@ss.hasPermi('qw:approval:myList')")
+    @GetMapping("/myList")
+    public TableDataInfo myList(CustomerTransferApprovalQw customerTransferApprovalQw)
     {
         startPage();
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());

fs-service/src/main/java/com/fs/qw/mapper/CustomerTransferApprovalQwMapper.java

@@ -2,6 +2,7 @@ package com.fs.qw.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.qw.domain.CustomerTransferApproval;
 import com.fs.qw.domain.CustomerTransferApprovalQw;
 
 import java.util.List;
@@ -60,4 +61,6 @@ public interface CustomerTransferApprovalQwMapper extends BaseMapper<CustomerTra
      * @return 结果
      */
     int deleteCustomerTransferApprovalQwByIds(Long[] ids);
+
+    List<CustomerTransferApprovalQw> queryPendingData();
 }

fs-service/src/main/java/com/fs/qw/service/ICustomerTransferApprovalQwService.java

@@ -60,4 +60,9 @@ public interface ICustomerTransferApprovalQwService extends IService<CustomerTra
      * @return 结果
      */
     int deleteCustomerTransferApprovalQwById(Long id);
+
+    /**
+     * 自动审批通过
+     */
+    public void autoApprovePassQw();
 }

fs-service/src/main/java/com/fs/qw/service/impl/CustomerTransferApprovalQwServiceImpl.java

@@ -12,6 +12,8 @@ import com.fs.qw.domain.CustomerTransferApproval;
 import com.fs.qw.domain.CustomerTransferApprovalQw;
 import com.fs.qw.mapper.CustomerTransferApprovalQwMapper;
 import com.fs.qw.service.ICustomerTransferApprovalQwService;
+import com.fs.qw.service.ICustomerTransferApprovalService;
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,6 +38,7 @@ public class CustomerTransferApprovalQwServiceImpl extends ServiceImpl<CustomerT
     @Autowired
     private ICompanyUserCacheService companyUserCacheService;
 
+
     /**
      * 查询客户转移审批-企微的
      *
@@ -149,4 +152,16 @@ public class CustomerTransferApprovalQwServiceImpl extends ServiceImpl<CustomerT
     {
         return baseMapper.deleteCustomerTransferApprovalQwById(id);
     }
+
+    @Override
+    public void autoApprovePassQw() {
+        List<CustomerTransferApprovalQw> customerTransferApprovalQws = transferApprovalQwMapper.queryPendingData();
+        for (CustomerTransferApprovalQw approval : customerTransferApprovalQws) {
+            approval.setApprovalStatus(1);
+            approval.setApprovalRemark("自动审批");
+            approval.setApproverUserId(1L);
+            ICustomerTransferApprovalQwService service = (ICustomerTransferApprovalQwService) AopContext.currentProxy();
+            service.updateCustomerTransferApprovalQw(approval);
+        }
+    }
 }

fs-service/src/main/resources/mapper/qw/CustomerTransferApprovalQwMapper.xml

@@ -51,6 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="queryPendingData" resultType="com.fs.qw.domain.CustomerTransferApprovalQw">
+        select * from customer_transfer_approval_qw where approval_status=0
+    </select>
+
     <insert id="insertCustomerTransferApprovalQw" parameterType="CustomerTransferApprovalQw" useGeneratedKeys="true" keyProperty="id">
         insert into customer_transfer_approval_qw
         <trim prefix="(" suffix=")" suffixOverrides=",">