zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增消息列表及其它细节修改

Browse Source
This commit is contained in:
罗成
2025-02-25 14:01:25 +08:00
parent 4f60577e78
commit 89a92e0b8a
13 changed files with 226 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java
View File

@ -112,25 +112,25 @@ public class WgzAppController {
* 【首页】【首页界面】招工列表
*/
@ApiOperation("【首页】【首页界面】招工列表")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userJobListing')")
// //@PreAuthorize("@ss.hasPermi('wgzApp:user:userJobListing')")
@GetMapping("/WgzUserJobListing")
public AjaxResult<WgzAppJobListingRes> userJobListing(@Validated WgzAppJobListingReq req) {
public TableDataInfo<WgzAppJobListingRes> userJobListing(@Validated WgzAppJobListingReq req) {
TableDataInfo<WgzAppJobListingRes> wgzAppJobListingRes = new TableDataInfo<>();
//1、请求转换
BgtProjectRecruitQueryDTO dto = new BgtProjectRecruitQueryDTO();
BeanUtils.copyProperties(req,dto);
//2、查询招工列表信息
TableDataInfo<BgtProjectRecruitVO> info = iBgtProjectRecruitService.appQueryPageList(dto);
//3、将招工信息转换
WgzAppJobListingRes wgzAppJobListingRes = new WgzAppJobListingRes();
BeanUtils.copyProperties(info,wgzAppJobListingRes);
return AjaxResult.success(wgzAppJobListingRes);
return wgzAppJobListingRes;
}
/**
* 【我的】修改用户头像
*/
@ApiOperation("【我的】修改用户头像")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userModifyingUserProfilePicture')")
// //@PreAuthorize("@ss.hasPermi('wgzApp:user:userModifyingUserProfilePicture')")
@PutMapping("/wgzUserModifyingUserProfilePicture")
public AjaxResult<Boolean> userModifyingUserProfilePicture(@Validated @RequestBody WgzAppModifyingUserProfilePictureReq req) {
return AjaxResult.success(iWgzUserService.userModifyingUserProfilePicture(req));
@ -140,7 +140,7 @@ public class WgzAppController {
* 【我的】【个人基本信息】查询基础用户信息（还未带附件信息）
*/
@ApiOperation("【我的】个人基本信息（还未带附件信息）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userPersonalBasicInformation')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userPersonalBasicInformation')")
@GetMapping("/wgzUserPersonalBasicInformation")
public AjaxResult<WgzAppPersonalBasicInformationRes> userPersonalBasicInformation(@Validated WgzAppPersonalBasicInformationReq req) {
return AjaxResult.success(iWgzUserService.userPersonalBasicInformation(req));
@ -150,7 +150,7 @@ public class WgzAppController {
* 【我的】【实名认证】实名认证
*/
@ApiOperation("【我的】实名认证")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userRealNameAuthentication')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userRealNameAuthentication')")
@PutMapping("/wgzUserRealNameAuthentication")
public AjaxResult<Boolean> userRealNameAuthentication(@Validated @RequestBody WgzAppRealNameAuthenticationReq req) {
return AjaxResult.success(iWgzUserService.userRealNameAuthentication(req));
@ -160,7 +160,7 @@ public class WgzAppController {
* 【我的】【岗前培训】获取安全教育考试试卷（随机获取）
*/
@ApiOperation("【我的】【岗前培训】岗前培训·获取随机试卷")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userGetTestPaper')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userGetTestPaper')")
@GetMapping("/WgzUserGetTestPaper")
public AjaxResult<WgzAppGetTestPaperRes> userGetTestPaper() {
//1、获取配置信息
@ -189,7 +189,7 @@ public class WgzAppController {
* 【我的】【岗前培训】提交用户的试卷（只保存最高分的试卷信息）
*/
@ApiOperation("【我的】【岗前培训】岗前培训·提交试卷")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitATestPaper')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitATestPaper')")
@PostMapping("/WgzUserSubmitATestPaper")
public AjaxResult<WgzAppSubmitATestPaperRes> userSubmitATestPaper(@Validated @RequestBody WgzAppSubmitATestPaperReq req) {
return AjaxResult.success(iWgzQuestionSaveService.userSubmitATestPaper(req));
@ -199,7 +199,7 @@ public class WgzAppController {
* 【我的】【请假】 历史请假列表
*/
@ApiOperation("【我的】【请假】请假·历史请假列表")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userLeaveHistoryList')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userLeaveHistoryList')")
@GetMapping("/WgzAppUserLeaveHistoryListPage")//PageReq
public TableDataInfo<WgzAppLeaveHistoryListPageRes> userLeaveHistoryListPage(@Validated WgzAppLeaveHistoryListPageReq req) {
return iWgzLeaveService.userLeaveHistoryListPage(req);
@ -209,7 +209,7 @@ public class WgzAppController {
* 【我的】【请假】 提交请假（上下班的时间需要等待zt创建好mysql字段）
*/
@ApiOperation("【我的】【请假】请假·提交请假（上下班的时间需要等待zt创建好mysql字段）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitLeave')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitLeave')")
@PostMapping("/WgzAppSubmitLeave")
public AjaxResult<Boolean> userSubmitLeave(@Validated @RequestBody WgzAppSubmitLeaveReq req) {
return AjaxResult.success(iWgzLeaveService.userSubmitLeave(req));
@ -219,7 +219,7 @@ public class WgzAppController {
* 【我的】【请假】 取消请假
*/
@ApiOperation("【我的】【请假】请假·取消请假")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userCancelLeave')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userCancelLeave')")
@PutMapping("/WgzAppUserCancelLeave")
public AjaxResult<Boolean> userCancelLeave(@Validated @RequestBody WgzAppCancelLeaveReq req) {
return AjaxResult.success(iWgzLeaveService.userCancelLeave(req));
@ -229,7 +229,7 @@ public class WgzAppController {
* 【日报】日报日历
*/
@ApiOperation("【日报】日报日历")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyCalendar')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyCalendar')")
@GetMapping("/WgzUserDailyCalendar")
public AjaxResult<WgzUserDailyCalendarRes> userDailyCalendar(@Validated WgzAppDailyCalendarReq req) {
WgzUserDailyCalendarRes wfzUserDailyCalendarRes = iWgzDailyClockService.userDailyCalendar(req);
@ -240,7 +240,7 @@ public class WgzAppController {
* 【日报】日报日历·日报记录
*/
@ApiOperation("【日报】【日报日历】日报日历·日报记录")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyRecord')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyRecord')")
@GetMapping("/WgzUserDailyRecord")
public TableDataInfo<WgzAppUserDailyRecordRes> userDailyRecord(@Validated WgzAppDailyRecordReq req) {
return iWgzDailyClockService.userDailyRecord(req);
@ -250,7 +250,7 @@ public class WgzAppController {
* 【日报】日报日历·查看日报
*/
@ApiOperation("【日报】【日报日历】日报日历·查看日报")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userCheckDailyNewspaper')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userCheckDailyNewspaper')")
@GetMapping("/WgzUserCheckDailyNewspaper/{id}")
public AjaxResult<WgzDailyClock> userCheckDailyNewspaper(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
return AjaxResult.success(iWgzDailyClockService.userCheckDailyNewspaper(id));
@ -260,7 +260,7 @@ public class WgzAppController {
* 【考勤打卡】【打卡】 提交上下班打卡·查看当前用户的打卡状态（0上班 1下班 2请假）
*/
@ApiOperation("【考勤打卡】【打卡】 提交上下班打卡·用户今日打卡状态（0上班 1下班 2请假）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userClockingCondition')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userClockingCondition')")
@GetMapping("/WgzAppUserClockingCondition")
public AjaxResult<WgzAppUserClockingConditionRes> userClockingCondition() {
return AjaxResult.success(iWgzAttendanceService.userClockingCondition());
@ -270,7 +270,7 @@ public class WgzAppController {
* 【考勤打卡】【打卡】 提交上下班打卡
*/
@ApiOperation("【考勤打卡】【打卡】 提交上下班打卡）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitTheClock')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitTheClock')")
@PostMapping("/WgzAppUserSubmitTheClock")
public AjaxResult<Boolean> userSubmitTheClock(@Validated @RequestBody WgzAppSubmitTheClockReq req) {
return AjaxResult.success(iWgzAttendanceService.userSubmitTheClock(req));
@ -280,7 +280,7 @@ public class WgzAppController {
* 【考勤打卡】【打卡日历】 打卡日历记录
*/
@ApiOperation("【考勤打卡】【打卡日历】 打卡日历记录）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userPunchTheCalendarRecord')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userPunchTheCalendarRecord')")
@GetMapping("/WgzAppUserPunchTheCalendarRecord")
public AjaxResult<WgzAppPunchTheCalendarRecordRes> userPunchTheCalendarRecord() {
return AjaxResult.success(iWgzAttendanceService.userPunchTheCalendarRecord());
@ -290,7 +290,7 @@ public class WgzAppController {
* 【考勤打卡】【打卡日历】 补卡申请列表
*/
@ApiOperation("【考勤打卡】【打卡日历】 补卡申请列表")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userCardReplacementApplicationList')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userCardReplacementApplicationList')")
@GetMapping("/WgzAppUserCardReplacementApplicationList")
public AjaxResult<WgzAppCardReplacementApplicationRes> userCardReplacementApplication() {
return AjaxResult.success(iWgzAttendanceService.userCardReplacementApplication());
@ -300,7 +300,7 @@ public class WgzAppController {
* 【考勤打卡】【打卡日历】 补卡申请
*/
@ApiOperation("【考勤打卡】【打卡日历】 补卡申请）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userCardReplacementApplication')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userCardReplacementApplication')")
@PostMapping("/WgzAppUserCardReplacementApplication")
public AjaxResult<Boolean> userCardReplacementApplication(@Validated @RequestBody WgzAppCardReplacementApplicationReq req) {
return AjaxResult.success(iWgzReissueacardService.userCardReplacementApplication(req));
@ -310,7 +310,7 @@ public class WgzAppController {
* 【考勤打卡】【打卡日历】 补卡记录
*/
@ApiOperation("【考勤打卡】【打卡日历】 补卡记录）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userReplacementCardRecord')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userReplacementCardRecord')")
@GetMapping("/WgzAppUserReplacementCardRecord")
public TableDataInfo<WgzReplacementCardRecordRes> userReplacementCardRecord(@Validated WgzAppReplacementCardRecordReq req) {
return iWgzReissueacardService.userReplacementCardRecord(req);
@ -320,7 +320,7 @@ public class WgzAppController {
* 【首页】【项目详情】 项目详情
*/
@ApiOperation("【首页】【项目详情】 项目详情）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userProjectDetails')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userProjectDetails')")
@GetMapping("/WgzAppUserProjectDetails/{id}")
public AjaxResult<WgzAppProjectDetailsRes> userProjectDetails(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
return AjaxResult.success(iBgtProjectRecruitService.userProjectDetails(id));
@ -330,7 +330,7 @@ public class WgzAppController {
* 【首页】【项目详情】 项目详情·申请报名（还未校验工种是否匹配工地岗位）
*/
@ApiOperation("【首页】【项目详情】 项目详情·申请报名）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForRegistration')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForRegistration')")
@GetMapping("/WgzAppUserApplyForRegistration/{id}")
public AjaxResult<Boolean> userApplyForRegistration(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
return AjaxResult.success(iBgtProjectRecruitApplyService.userApplyForRegistration(id));
@ -340,7 +340,7 @@ public class WgzAppController {
* 【首页】【已报名项目】 已报名项目
*/
@ApiOperation("【首页】【已报名项目】 已报名项目）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userRegisteredProject')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userRegisteredProject')")
@GetMapping("/WgzAppUserRegisteredProject")
public TableDataInfo<WgzAppRegisteredProjectRes> userRegisteredProject(@Validated WgzAppRegisteredProjectReq req) {
return iBgtProjectRecruitService.userRegisteredProject(req);
@ -350,7 +350,7 @@ public class WgzAppController {
* 【首页】【已报名项目】 已报名项目·取消报名
*/
@ApiOperation("【首页】【已报名项目】 已报名项目·取消报名）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userCancelRegistration')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userCancelRegistration')")
@DeleteMapping("/WgzAppUserCancelRegistration/{recruitId}")
public AjaxResult<Boolean> userCancelRegistration(@NotEmpty(message = "招工主键不能为空") @PathVariable Long recruitId) {
return AjaxResult.success(iBgtProjectRecruitApplyService.userCancelRegistration(recruitId));
@ -360,7 +360,7 @@ public class WgzAppController {
* 【首页】【已报名项目】 已报名项目·项目详情
*/
@ApiOperation("【首页】【已报名项目】 已报名项目·项目详情")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userCancelRegistrationProjectDetails')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userCancelRegistrationProjectDetails')")
@GetMapping("/WgzAppUserCancelRegistrationProjectDetails/{recruitId}")
public AjaxResult<WgzAppCancelRegistrationProjectDetailsRes> userCancelRegistrationProjectDetails(@NotEmpty(message = "招工主键不能为空") @PathVariable Long recruitId) {
return AjaxResult.success(iBgtProjectRecruitService.userCancelRegistrationProjectDetails(recruitId));
@ -371,7 +371,7 @@ public class WgzAppController {
* 【首页】【已完成项目】 已完成项目
*/
@ApiOperation("【首页】【项目进行中|已完成项目】 项目进行中")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userUnderway')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userUnderway')")
@GetMapping("/WgzAppUserUnderway")
public TableDataInfo<WgzAppUnderwayRes> userUnderway(@Validated WgzAppUnderwayReq req) {
return iBgtProjectRecruitApplyService.userUnderway(req);
@ -382,7 +382,7 @@ public class WgzAppController {
* 【首页】【已完成项目】 已完成项目·详情
*/
@ApiOperation("【首页】【项目进行中|已完成项目】 详情")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userProjectInProgressDetails')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userProjectInProgressDetails')")
@GetMapping("/WgzAppUserProjectInProgressDetails/{id}")
public AjaxResult<WgzApplyForPayrollSettlementAddRes> userProjectInProgressDetails(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
WgzApplyForPayrollSettlementAddRes res = new WgzApplyForPayrollSettlementAddRes();
@ -427,7 +427,7 @@ public class WgzAppController {
* 【首页】【已完成项目】 已完成项目·申请工资结算（新增）
*/
@ApiOperation("【首页】【项目进行中|已完成项目】 申请工资结算（新增）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForPayrollSettlementAdd')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForPayrollSettlementAdd')")
@PostMapping("/WgzAppUserApplyForPayrollSettlementAdd")
public AjaxResult<Boolean> userApplyForPayrollSettlementAdd(@Validated @RequestBody WgzApplyForPayrollSettlementAddReq req) {
return AjaxResult.success(iWgzPayCalculationService.userApplyForPayrollSettlementAdd(req));
@ -437,7 +437,7 @@ public class WgzAppController {
* 【首页】【项目进行中】 项目进行中·申请工资结算（列表）
*/
@ApiOperation("【首页】【项目进行中】 项目进行中·申请工资结算（列表）")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForPayrollSettlementList')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForPayrollSettlementList')")
@GetMapping("/WgzAppUserApplyForPayrollSettlementList")
public TableDataInfo<WgzAppApplyForPayrollSettlementListRes> userApplyForPayrollSettlementList(@Validated WgzAppApplyForPayrollSettlementListReq req) {
return iWgzPayCalculationService.userApplyForPayrollSettlementList(req);
@ -447,7 +447,7 @@ public class WgzAppController {
* 【消息】消息类型统计
*/
@ApiOperation("【消息】消息类型统计")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userMessageTypeStatistics')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userMessageTypeStatistics')")
@GetMapping("/WgzAppUserMessageTypeStatistics")
public AjaxResult<WgzAppMessageTypeStatisticsRes> userMessageTypeStatistics() {
Long appUserId = SecurityUtils.getAppUserId();
@ -459,11 +459,10 @@ public class WgzAppController {
* 【消息】获取消息列表-0全部 1报名 2工资 3其他 （打卡、系统）
*/
@ApiOperation("【消息】获取消息列表")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userGetMessageList')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userGetMessageList')")
@GetMapping("/WgzAppUserGetMessageList")
public AjaxResult<WgzAppGetMessageListRes> userGetMessageList() {
Long appUserId = SecurityUtils.getAppUserId();
return null;
public TableDataInfo<WgzAppGetMessageListRes> userGetMessageList(@Validated WgzAppGetMessageListReq req) {
return iWgzMessageService.userGetMessageList(req);
}
@ -485,7 +484,7 @@ public class WgzAppController {
1-劳动合同
*/
@ApiOperation("通用·附件获取(仅限和务工者直接关联的)")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userAttachmentAcquisition')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userAttachmentAcquisition')")
@GetMapping("/wgzUserAttachmentAcquisition")
public AjaxResult<WgzAppAttachmentAcquisitionRes> userAttachmentAcquisition(@Validated WgzAppAttachmentAcquisitionReq req) {
//返回对象
@ -526,7 +525,7 @@ public class WgzAppController {
* 【考勤打卡】【打卡】 获取上下班时间
*/
@ApiOperation("通用·获取上下班时间")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userGetCommutingTime')")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userGetCommutingTime')")
@GetMapping("/WgzAppUserGetCommutingTime")//PageReq
public AjaxResult<Map<String, LocalTime>> userGetCommutingTime() {
//1、获取当前人、当前工的上下班时间范围
@ -570,7 +569,7 @@ public class WgzAppController {
* 【我的】【实名认证】实名认证·删除附件
*/
// @ApiOperation("APP务工者-实名认证·删除附件")
// @PreAuthorize("@ss.hasPermi('wgzApp:user:userDeleteAttachment')")
// //@PreAuthorize("@ss.hasPermi('wgzApp:user:userDeleteAttachment')")
// @DeleteMapping("/WgzUserDeleteAttachment/{attachmentId}")
// public AjaxResult<Boolean> userDeleteAttachment(@NotEmpty(message = "主键不能为空") @PathVariable Long attachmentId) {
// return AjaxResult.success(iAnnexService.deleteByIds(attachmentId));
@ -581,7 +580,7 @@ public class WgzAppController {
* 【首页】【项目进行中】 项目进行中·申请工资结算（查询）
*/
// @ApiOperation("【首页】【项目进行中】 项目进行中·申请工资结算（查询）")
// @PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForPayrollSettlementFind')")
// //@PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForPayrollSettlementFind')")
// @GetMapping("/WgzAppUserApplyForPayrollSettlementFind")
// public AjaxResult<WgzApplyForPayrollSettlementFindRes> userApplyForPayrollSettlementFind(@Validated WgzApplyForPayrollSettlementFindReq req) {
// Long appUserId = SecurityUtils.getAppUserId();