优化定时任务分发sop任务给销售和医生

fs-doctor-app/src/main/java/com/fs/app/controller/FsSopDoctorTaskController.java

@@ -13,10 +13,9 @@ import com.fs.his.domain.FsUserAddress;
 import com.fs.his.dto.SopDoctorTaskDto;
 import com.fs.his.param.FsStoreOrderParam;
 import com.fs.his.param.FsUserCouponParam;
-import com.fs.his.service.IFsPatientService;
-import com.fs.his.service.IFsUserCouponService;
-import com.fs.his.service.IFsUserService;
+import com.fs.his.service.*;
 import com.fs.his.vo.FsPatientVO;
+import com.fs.his.vo.FsStoreOrderListVO;
 import com.fs.his.vo.FsUserCouponListVO;
 import com.fs.his.vo.SopDoctorTaskVo;
 import io.jsonwebtoken.Claims;
@@ -37,7 +36,6 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.enums.BusinessType;
 import com.fs.his.domain.FsSopDoctorTask;
-import com.fs.his.service.IFsSopDoctorTaskService;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.common.core.page.TableDataInfo;
 
@@ -67,6 +65,9 @@ public class FsSopDoctorTaskController extends BaseController
     @Autowired
     private IFsUserCouponService fsUserCouponService;
 
+    @Autowired
+    private IFsStoreOrderService fsStoreOrderService;
+
     @Autowired
     JwtUtils jwtUtils;
 
@@ -256,12 +257,13 @@ public class FsSopDoctorTaskController extends BaseController
     public TableDataInfo userOrderList(FsStoreOrderParam fsStoreOrder)
     {
         startPage();
-//        LoginUser loginUser = SecurityUtils.getLoginUser();
-//        fsStoreOrder.setCompanyUserId(loginUser.getUser().getUserId());
-//        fsStoreOrder.setCompanyId(loginUser.getCompany().getCompanyId());
-//        List<FsStoreOrderListVO> list = fsStoreOrderService.selectFsStoreOrderListVO(fsStoreOrder);
-//        return getDataTable(list);
-        return getDataTable(Collections.emptyList());
+        fsStoreOrder.setCompanyUserId(fsStoreOrder.getCompanyUserId());
+        List<FsStoreOrderListVO> list = fsStoreOrderService.selectFsStoreOrderListVO(fsStoreOrder);
+        if (CollectionUtils.isEmpty(list)){
+            return getDataTable(Collections.emptyList());
+        }
+        return getDataTable(list);
+
     }
 
     /**