Merge remote-tracking branch 'origin/master'

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

@@ -128,7 +128,7 @@ public class QwSopTempController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         qwSopTemp.setCreateBy(loginUser.getUser().getUserId().toString());
         int i = qwSopTempService.addNew(qwSopTemp);
-        if(qwSopTemp.getSendType() == 5){
+        if(qwSopTemp.getSendType() == 11){
             qwSopTempService.createSopTempRules(qwSopTemp);
         }
         return toAjax(i);

fs-company-app/src/main/java/com/fs/app/controller/QwWorkTaskController.java

@@ -36,7 +36,7 @@ public class QwWorkTaskController extends AppBaseController {
     @Login
     @ApiOperation("企微任务看板列表")
     @GetMapping("/list")
-    public R list (@Valid QwWorkTaskQueryParam param) {
+    public R list(@Valid QwWorkTaskQueryParam param) {
         log.debug("企微任务看板列表:{}", JSON.toJSONString(param));
 
         Map<String, Object> params = new HashMap<>();
@@ -67,11 +67,23 @@ public class QwWorkTaskController extends AppBaseController {
     @ApiOperation("催课看板会员列表")
     @GetMapping("/getUserList")
     public R getUserList(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
-                      @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+                         @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
         Long userId = Long.parseLong(getUserId());
         PageHelper.startPage(pageNum, pageSize);
         List<UserVOs> list = qwUserService.getUserList(userId);
         return R.ok().put("data", new PageInfo<>(list));
     }
 
+    @Login
+    @ApiOperation("催课看板企微会员列表")
+    @GetMapping("/getQwUserList")
+    public R getQwUserList(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
+                           @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+                           @RequestParam(required = false, defaultValue = "10") String qwUserId) {
+        Long userId = Long.parseLong(getUserId());
+        PageHelper.startPage(pageNum, pageSize);
+        List<UserVOs> list = qwUserService.getQwUserList(userId, qwUserId);
+        return R.ok().put("data", new PageInfo<>(list));
+    }
+
 }

fs-company/src/main/java/com/fs/qw/QwSopTempController.java

@@ -136,7 +136,7 @@ public class QwSopTempController extends BaseController
         qwSopTemp.setCompanyId(loginUser.getCompany().getCompanyId());
         qwSopTemp.setCreateBy(loginUser.getUser().getUserId().toString());
         int i = qwSopTempService.addNew(qwSopTemp);
-        if(qwSopTemp.getSendType() == 5){
+        if(qwSopTemp.getSendType() == 11){
             qwSopTempService.createSopTempRules(qwSopTemp);
         }
         return toAjax(i);

fs-service-system/src/main/java/com/fs/qw/mapper/QwWorkTaskMapper.java

@@ -130,4 +130,6 @@ public interface QwWorkTaskMapper extends BaseMapper<QwWorkTask>{
     List<UserVOs> getUserList(@Param("userId") Long userId);
 
     List<QwWorkTask> selectQwWorkTaskByExtIdAndQwUserId(QwUserVoiceLog qwUserVoiceLog);
+
+    List<UserVOs> getQwUserList(@Param("userId") Long userId, @Param("qwUserId") String qwUserId);
 }

fs-service-system/src/main/java/com/fs/qw/service/IQwUserService.java

@@ -175,4 +175,6 @@ public interface IQwUserService
     R delQwIpad(QwLoginHookParam loginParam);
 
     R allocateRemoteHost(QwLoginHookParam loginParam);
+
+    List<UserVOs> getQwUserList(Long userId, String qwUserId);
 }

fs-service-system/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -45,10 +45,7 @@ import java.net.URL;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Base64;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -1293,6 +1290,11 @@ public class QwUserServiceImpl implements IQwUserService
         return R.ok();
     }
 
+    @Override
+    public List<UserVOs> getQwUserList(Long userId, String qwUserId) {
+        return qwWorkTaskMapper.getQwUserList(userId, qwUserId);
+    }
+
     public R GetIPAdminAndPassWord(String ipAddress ) throws Exception {
 
         String bodyKey = HttpRequest.get("http://watch.ylrzcloud.com/prod-api/server/getKey?serverIp="+ipAddress)

fs-service-system/src/main/java/com/fs/wx/mp/config/WxMpConfiguration.java

@@ -53,10 +53,6 @@ public class WxMpConfiguration {
         if (configs == null) {
             throw new RuntimeException("大哥，拜托先看下项目首页的说明（readme文件），添加下相关配置，注意别配错了！");
         }
-        configs.forEach(e -> {
-            log.info("微信公众号APPID:{}", e.getAppId());
-        });
-
         WxMpService service = new WxMpServiceImpl();
         service.setMultiConfigStorages(configs
             .stream().map(a -> {

fs-service-system/src/main/resources/mapper/qw/QwWorkTaskMapper.xml

@@ -186,9 +186,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="getUserList" resultType="com.fs.qw.vo.UserVOs">
-        select b.name,b.avatar,a.title,a.score,a.create_time,a.type from
-        qw_work_task a
-        inner join qw_external_contact b on a.ext_id = b.id
+        select b.nickname as name,b.avatar,a.title,a.score,a.create_time,a.type from
+            hy_work_task a
+                inner join fs_user b on a.user_id = b.user_id
         where a.company_user_id = #{userId}
     </select>
 
@@ -199,4 +199,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="qwUserId != null">and qw_user_id = #{qwUserId}</if>
         <if test="createTime != null">and date_format(create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')</if>
     </select>
+    <select id="getQwUserList" resultType="com.fs.qw.vo.UserVOs">
+        select b.name, b.avatar, a.title, a.score, a.create_time, a.type
+        from qw_work_task a
+                 inner join qw_external_contact b on a.ext_id = b.id
+        where a.company_user_id = #{userId}
+    </select>
 </mapper>