change

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -630,9 +630,11 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
                 return R.error("用户已确认");
             }
         }
+        logger.info("采集信息id:{},采集信息用户id{}，当前登录用户id{}",param.getId(),collection.getUserId(),param.getUserId());
         if (!Objects.equals(collection.getUserId(), param.getUserId())) {
             return R.error("用户信息不匹配,无法确认");
         }
+
         FsUserInformationCollection map = new FsUserInformationCollection();
         map.setId(param.getId());
         map.setUserConfirm(1);
@@ -640,18 +642,20 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         //用户信息采集表id
         Long collectionId = collection.getId();
         FsUserInformationCollectionSchedule schedule = scheduleMapper.selectCollectionScheduleByCollectionId(collectionId);
-        if (collection.getStatus() == 1 && collection.getIsPackage() == 0) {
-            //用户第一次确认添加医生消息
-            DoctorMsg msg = new DoctorMsg();
-            String name = collection.getUserName() != null ? collection.getUserName() : "-";
-            //没套餐包的添加医生信息采集建议消息
-            msg.setTitle("用户采集信息建议");
-            msg.setType(3);
-            msg.setContent("患者:" + name + "的信息采集，前往建议");
-            msg.setDoctorId(collection.getDoctorId());
-            msg.setCreateTime(DateUtils.getNowDate());
-            //插入医生消息
-            doctorMsgMapper.insertDoctorMsg(msg);
+        if (collection.getStatus() == 1) {
+            if (collection.getIsPackage() == 0) {
+                //用户第一次确认添加医生消息
+                DoctorMsg msg = new DoctorMsg();
+                String name = collection.getUserName() != null ? collection.getUserName() : "-";
+                //没套餐包的添加医生信息采集建议消息
+                msg.setTitle("用户采集信息建议");
+                msg.setType(3);
+                msg.setContent("患者:" + name + "的信息采集，前往建议");
+                msg.setDoctorId(collection.getDoctorId());
+                msg.setCreateTime(DateUtils.getNowDate());
+                //插入医生消息
+                doctorMsgMapper.insertDoctorMsg(msg);
+            }
             //第一次确认
             map.setStatus(2);
             //设置用户信息采集进度节点

fs-service/src/main/java/com/fs/qw/param/QwExternalContactParam.java

@@ -2,6 +2,7 @@ package com.fs.qw.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -131,4 +132,8 @@ public class QwExternalContactParam {
 
     private Long wayId;
 
+    @ApiModelProperty(value = "页码,默认为1")
+    private Integer pageNum =1;
+    @ApiModelProperty(value = "页大小,默认为10")
+    private Integer pageSize = 10;
 }

fs-user-app/src/main/java/com/fs/app/controller/QuestionAndAnswerController.java

@@ -4,6 +4,7 @@ import com.fs.app.annotation.Login;
 import com.fs.common.core.domain.R;
 import com.fs.his.service.IFsQuestionAndAnswerService;
 import com.fs.his.vo.FsQuestionAndAnswerVO;
+import com.fs.his.vo.OptionsVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @Api("问答")
 @RestController
 @RequestMapping(value="/app/answer")
@@ -27,4 +30,15 @@ public class QuestionAndAnswerController {
         FsQuestionAndAnswerVO vo = questionAndAnswerService.selectFsQuestionAndAnswerById(questionId);
         return R.ok().put("data", vo);
     }
+
+    /**
+     * 查询问答列表
+     */
+    @ApiOperation("问答列表")
+    @GetMapping("/allList")
+    public R answerList()
+    {
+        List<OptionsVO> list = questionAndAnswerService.selectAllQuestionOptions();
+        return R.ok().put("data",list);
+    }
 }

fs-user-app/src/main/java/com/fs/app/controller/UserInfoCollectionController.java

@@ -1,12 +1,19 @@
 package com.fs.app.controller;
 
+import com.fs.common.annotation.Log;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.enums.BusinessType;
 import com.fs.course.param.CollectionInfoConfirmParam;
 import com.fs.course.vo.FsUserInfoCollectionUVO;
+import com.fs.framework.security.SecurityUtils;
+import com.fs.hisStore.domain.FsUserInformationCollection;
+import com.fs.hisStore.param.FsUserInformationCollectionParam;
 import com.fs.hisStore.service.IFsUserInformationCollectionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @Api("用户信息采集接口")
@@ -32,4 +39,50 @@ public class UserInfoCollectionController extends AppBaseController {
         param.setUserId(Long.parseLong(getUserId()));
         return userInformationCollectionService.userConfirm(param);
     }
+
+
+    /**
+     * 获取用户信息采集详细信息
+     */
+    @ApiOperation("获取用户信息采集详细信息")
+    @GetMapping(value = "/detail")
+    public R detail(FsUserInformationCollection param)
+    {
+        return R.ok().put("data", userInformationCollectionService.getInfo(param));
+    }
+
+    /**
+     * 新增用户信息采集
+     */
+    @ApiOperation("新增用户信息采集")
+    @Log(title = "用户信息采集", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public R add(@RequestBody FsUserInformationCollectionParam fsUserInformationCollection)
+    {
+        Long l = userInformationCollectionService.insertFsUserInformationCollection(fsUserInformationCollection);
+        if (l > 0) {
+            return R.ok();
+
+        } else {
+            return R.error();
+        }
+    }
+
+    /**
+     * 修改用户信息采集
+     */
+    @ApiOperation("修改用户信息采集")
+    @Log(title = "用户信息采集", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public R edit(@RequestBody FsUserInformationCollectionParam fsUserInformationCollection)
+    {
+
+        Long l = userInformationCollectionService.updateFsUserInformationCollection(fsUserInformationCollection);
+        if (l > 0) {
+            return R.ok();
+
+        } else {
+            return R.error();
+        }
+    }
 }

fs-user-app/src/main/java/com/fs/app/controller/qw/QwExternalContactController.java

@@ -0,0 +1,44 @@
+package com.fs.app.controller.qw;
+
+import com.fs.app.controller.AppBaseController;
+import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.qw.param.QwExternalContactParam;
+import com.fs.qw.service.IQwExternalContactService;
+import com.fs.qw.vo.QwExternalContactVO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping(value="/app/externalContact")
+public class QwExternalContactController extends AppBaseController {
+
+    @Autowired
+    private IQwExternalContactService qwExternalContactService;
+
+    @ApiOperation("我的企微客户")
+    @GetMapping("/myList")
+    public R myList(QwExternalContactParam qwExternalContact)
+    {
+        if(qwExternalContact.getQwUserId()==null && qwExternalContact.getCompanyId() == null){
+            return null;
+        }
+        //PageHelper.startPage(qwExternalContact.getPageNum(), qwExternalContact.getPageSize());
+        startPage();
+        List<QwExternalContactVO> list = qwExternalContactService.selectQwExternalContactListVO(qwExternalContact);
+        if (!CollectionUtils.isEmpty(list)) {
+            list = list.stream().filter(s -> s.getFsUserId() != null).collect(Collectors.toList());
+        }
+        PageInfo<QwExternalContactVO> pageInfo = new PageInfo<>(list);
+        return R.ok().put("data", pageInfo);
+    }
+}

fs-user-app/src/main/java/com/fs/app/controller/qw/QwUserController.java

@@ -0,0 +1,31 @@
+package com.fs.app.controller.qw;
+
+import com.fs.app.controller.AppBaseController;
+import com.fs.common.core.domain.R;
+import com.fs.common.utils.ServletUtils;
+import com.fs.qw.service.IQwUserService;
+import com.fs.qw.vo.QwOptionsVO;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value="/app/qwUser")
+public class QwUserController extends AppBaseController {
+
+    @Autowired
+    private IQwUserService qwUserService;
+
+    @ApiOperation("我的企业信息")
+    @GetMapping("/getMyQwUserList")
+    public R getMyQwUserList(@Param("companyUserId") Long companyUserId)
+    {
+        List<QwOptionsVO> list = qwUserService.selectQwUserListOptionsVOByCompanyUserId(companyUserId);
+        return  R.ok().put("data",list);
+    }
+}