|
|
@@ -7,11 +7,12 @@ import com.fs.common.core.page.TableDataInfo;
|
|
|
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.his.domain.FsUser;
|
|
|
import com.fs.his.domain.FsUserInformationCollectionSchedule;
|
|
|
import com.fs.his.enums.PrescriptionTaskStepEnum;
|
|
|
+import com.fs.his.service.IFsPackageService;
|
|
|
import com.fs.his.service.IFsUserService;
|
|
|
+import com.fs.his.vo.OptionsVO;
|
|
|
import com.fs.hisStore.domain.FsUserInformationCollection;
|
|
|
import com.fs.hisStore.param.FsUserInformationCollectionParam;
|
|
|
import com.fs.hisStore.service.IFsUserInformationCollectionService;
|
|
|
@@ -32,6 +33,9 @@ import java.util.stream.Collectors;
|
|
|
@RequestMapping(value="/app/collection")
|
|
|
public class UserInfoCollectionController extends AppBaseController {
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IFsPackageService fsPackageService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private IFsUserService userService;
|
|
|
|
|
|
@@ -143,4 +147,14 @@ public class UserInfoCollectionController extends AppBaseController {
|
|
|
.collect(Collectors.toList());
|
|
|
return AjaxResult.success(steps);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 查询私有套餐包列表
|
|
|
+ */
|
|
|
+ @GetMapping("/schedule/privatePackageList")
|
|
|
+ public TableDataInfo selectAllPrivatePackageList()
|
|
|
+ {
|
|
|
+ List<OptionsVO> list = fsPackageService.selectAllPrivatePackageList();
|
|
|
+ return getDataTable(list);
|
|
|
+ }
|
|
|
}
|