会员详情

fs-admin/src/main/java/com/fs/his/controller/FsUserOperationLogController.java

@@ -1,6 +1,7 @@
 package com.fs.his.controller;
 
 import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.his.domain.FsUserOperationLog;
 import com.fs.his.service.IFsUserOperationLogService;
@@ -36,4 +37,10 @@ public class FsUserOperationLogController extends BaseController {
 
         return getDataTable(list);
     }
+
+    @GetMapping("/getOperationType")
+    public R getOperationType()
+    {
+        return R.ok().put("data",fsUserOperationLogService.getOperationType());
+    }
 }

fs-company/src/main/java/com/fs/company/controller/course/FsUserOperationLogController.java

@@ -1,6 +1,7 @@
 package com.fs.company.controller.course;
 
 import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.his.domain.FsUserOperationLog;
 import com.fs.his.service.IFsUserOperationLogService;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 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;
@@ -32,4 +34,10 @@ public class FsUserOperationLogController extends BaseController {
 
         return getDataTable(list);
     }
+
+    @GetMapping("/getOperationType")
+    public R getOperationType()
+    {
+        return R.ok().put("data",fsUserOperationLogService.getOperationType());
+    }
 }

fs-company/src/main/java/com/fs/company/controller/store/FsInquiryOrderController.java

@@ -59,7 +59,7 @@ public class FsInquiryOrderController extends BaseController
     /**
      * 查询问诊订单列表
      */
-    @PreAuthorize("@ss.hasPermi('store:inquiryOrder:list')")
+//    @PreAuthorize("@ss.hasPermi('store:inquiryOrder:list')")
     @GetMapping("/list")
    public TableDataInfo list(FsInquiryOrderParam fsInquiryOrder)
     {

fs-service/src/main/java/com/fs/his/service/IFsUserOperationLogService.java

@@ -65,4 +65,6 @@ public interface IFsUserOperationLogService extends IService<FsUserOperationLog>
      * @return 结果
      */
     int deleteFsUserOperationLogByLogId(Long logId);
+
+    List<String> getOperationType();
 }

fs-service/src/main/java/com/fs/his/service/impl/FsUserOperationLogServiceImpl.java

@@ -1,7 +1,10 @@
 package com.fs.his.service.impl;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -11,6 +14,7 @@ import com.fs.common.utils.StringUtils;
 import com.fs.course.domain.FsCourseRedPacketLog;
 import com.fs.course.mapper.FsCourseRedPacketLogMapper;
 import com.fs.course.vo.FsUserCourseVO;
+import com.fs.his.enums.FsUserOperationEnum;
 import com.fs.his.param.FsUserOperationLogQueryParam;
 import com.fs.his.vo.FsUserOperationLogPageVo;
 import com.fs.his.vo.FsUserOperationLogParamVo;
@@ -145,6 +149,14 @@ public class FsUserOperationLogServiceImpl extends ServiceImpl<FsUserOperationLo
         return baseMapper.deleteFsUserOperationLogByLogId(logId);
     }
 
+    @Override
+    public List<String> getOperationType() {
+        List<String> labels = Stream.of(FsUserOperationEnum.values())
+                .map(FsUserOperationEnum::getLabel)
+                .collect(Collectors.toList());
+        return labels;
+    }
+
     @Override
     public List<FsUserOperationLogVo> selectFsUserOperationLogByList(FsUserOperationLog fsUserOperationLog) {
         List<FsUserOperationLogVo> list = baseMapper.selectFsUserOperationLogByList(fsUserOperationLog);

fs-service/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -301,7 +301,7 @@
         AND ccut.course_id = fcpd.course_id
         AND ccut.video_id = fcpd.video_id
         AND ccut.company_user_id = #{params.companyUserId}
-        where course.is_del = 0
+        where course.is_del = 0 AND fcpd.del_flag = 0
         <if test="params.companyId != null">
             and FIND_IN_SET(#{params.companyId}, fcp.company_id)
         </if>