销售帮助用户信息采集二次确认

fs-company/src/main/java/com/fs/hisStore/controller/FsUserInformationCollectionController.java

@@ -130,4 +130,11 @@ public class FsUserInformationCollectionController extends BaseController
         LoginUser loginUser = SecurityUtils.getLoginUser();
         return fsUserInformationCollectionService.stopCollection(param,loginUser.getUser().getUserId());
     }
+
+
+    @PutMapping("/salesHelpConfirm")
+    public R salesHelpConfirm(@RequestBody FsUserInformationCollectionSchedule param){
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        return fsUserInformationCollectionService.salesHelpConfirm(param.getCollectionId(),loginUser.getUser().getUserId());
+    }
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsUserInformationCollectionService.java

@@ -95,5 +95,5 @@ public interface IFsUserInformationCollectionService extends IService<FsUserInfo
     R stopCollection(FsUserInformationCollectionSchedule param, Long operateId);
 
     //销售帮助客户二次确认
-    R salesHelpConfirm(Long collectionId);
+    R salesHelpConfirm(Long collectionId, Long operateId);
 }

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

@@ -989,8 +989,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
     }
 
     @Override
-    @Transactional
-    public R salesHelpConfirm(Long collectionId) {
+    @Transactional public R salesHelpConfirm(Long collectionId, Long operateId) {
         if (collectionId == null) {
             return R.error("参数错误");
         }
@@ -1028,6 +1027,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         //"完成"任务状态
         editSchedule.setStatus(CollectionTaskStatusEnum.COMPLETED.getCode());
         editSchedule.setCompletedTime(DateUtils.getNowDate());
+        editSchedule.setTerminatedBy(operateId);
         log.info("同步用户信息采集进度节点为:{},信息采集表id:{}",PrescriptionTaskStepEnum.WAITING_COMPLETED.getDesc(),schedule.getCollectionId());
         if (fsUserInformationCollectionMapper.updateFsUserInformationCollection(editCollection) > 0 && scheduleMapper.updateFsUserInformationCollectionSchedule(editSchedule) > 0) {
             return R.ok();