|
@@ -81,11 +81,23 @@ public class AppThreeController extends BaseController {
|
|
|
private IHsWelfareApplyRecordService welfareApplyRecordService;
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * 员工档案信息
|
|
|
+ *
|
|
|
+ * @param opfUserPhone
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/getOpfInfo")
|
|
|
public AjaxResult getOpfInfo(@RequestParam String opfUserPhone) {
|
|
|
return AjaxResult.success(opfService.appGetHsOrgPersonnelFilesByPhone(opfUserPhone));
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 抄送记录
|
|
|
+ *
|
|
|
+ * @param request
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/ccRecord")
|
|
|
public TableDataInfo getCcRecord(HttpServletRequest request) {
|
|
|
startPage();
|
|
@@ -97,16 +109,35 @@ public class AppThreeController extends BaseController {
|
|
|
// WebSocketUsers.sendMessageToUserByText(WebSocketUsers.getUsers().get("admin"), "user-name");
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 物资分类
|
|
|
+ *
|
|
|
+ * @param type
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/goodsType")
|
|
|
public AjaxResult getGoodsType(String type) {
|
|
|
return AjaxResult.success(goodsTypeService.appGetGoodsType(type));
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 物资库信息
|
|
|
+ *
|
|
|
+ * @param type
|
|
|
+ * @param name
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/goodses")
|
|
|
public AjaxResult goodses(String type, String name) {
|
|
|
return AjaxResult.success(goodsStorageService.appGetGoodsByType(type, name));
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 所有部门信息
|
|
|
+ *
|
|
|
+ * @param id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/deptInfo")
|
|
|
public AjaxResult deptInfo(String id) {
|
|
|
return AjaxResult.success(deptService.selectChildrenDeptByParentId(id));
|
|
@@ -115,16 +146,32 @@ public class AppThreeController extends BaseController {
|
|
|
@Resource
|
|
|
private ISysPostService postService;
|
|
|
|
|
|
+ /**
|
|
|
+ * 所有岗位
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/posts")
|
|
|
public AjaxResult getPosts() {
|
|
|
return AjaxResult.success(postService.selectPostAll());
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 社团(项目)列表
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/clubs")
|
|
|
public AjaxResult clubs() {
|
|
|
return AjaxResult.success(associationsInfoService.appGetClubs(getUsername()));
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 活动列表
|
|
|
+ *
|
|
|
+ * @param associationsInfoId
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/events")
|
|
|
public TableDataInfo events(String associationsInfoId) {
|
|
|
startPage();
|
|
@@ -132,6 +179,9 @@ public class AppThreeController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * 上传地址
|
|
|
+ */
|
|
|
@Value("${imgServer.url}")
|
|
|
public String baseUrl;
|
|
|
|
|
@@ -161,6 +211,12 @@ public class AppThreeController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 活动风采
|
|
|
+ *
|
|
|
+ * @param eventId
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/eventsImg")
|
|
|
public AjaxResult eventsImg(String eventId) {
|
|
|
if (StringUtils.isBlank(eventId)) {
|
|
@@ -171,6 +227,11 @@ public class AppThreeController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * 活动预约记录
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/eventOrders")
|
|
|
public TableDataInfo eventOrders() {
|
|
|
startPage();
|
|
@@ -182,6 +243,12 @@ public class AppThreeController extends BaseController {
|
|
|
return AjaxResult.success(eventService.appGetMoreById(eventId));
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 预约社团活动操作
|
|
|
+ *
|
|
|
+ * @param eventId
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@RequestMapping("/eventOrder")
|
|
|
public AjaxResult eventOrder(String eventId) {
|
|
@@ -231,6 +298,12 @@ public class AppThreeController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 社团预约 取消预约操作
|
|
|
+ *
|
|
|
+ * @param id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@RequestMapping("/backEventOrder")
|
|
|
public AjaxResult backEventOrder(String id) {
|
|
@@ -286,6 +359,12 @@ public class AppThreeController extends BaseController {
|
|
|
.groupBy("source")));
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 福利领取报名操作
|
|
|
+ *
|
|
|
+ * @param welfareApplyRecord
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@RequestMapping("/sumbitWelfare")
|
|
|
public AjaxResult submitWelfare(@RequestBody HsWelfareApplyRecord welfareApplyRecord) {
|
|
|
if (null == welfareApplyRecord) {
|
|
@@ -295,5 +374,23 @@ public class AppThreeController extends BaseController {
|
|
|
return toAjax(welfareApplyRecordService.updateById(welfareApplyRecord));
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 报名数据回显
|
|
|
+ *
|
|
|
+ * @param id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping("/getApplyData")
|
|
|
+ public AjaxResult getApplyData(String id) {
|
|
|
+ if (StringUtils.isBlank(id)) {
|
|
|
+ return AjaxResult.error();
|
|
|
+ }
|
|
|
+ HsWelfareApplyRecord welfareApplyRecord = welfareApplyRecordService.getById(id);
|
|
|
+ if (null == welfareApplyRecord) {
|
|
|
+ return AjaxResult.error();
|
|
|
+ }
|
|
|
+ return AjaxResult.success(welfareApplyRecord);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|