From 65c9494de930a8b703a34c22ba1086836e038c7d Mon Sep 17 00:00:00 2001 From: mx <1289317512@qq.com> Date: Fri, 27 Dec 2024 13:46:52 +0800 Subject: [PATCH] 1 --- .../employee/EmployeeTaskController.java | 59 ++++++++++++++++--- .../merchant/MerchantUserController.java | 7 ++- .../framework/config/SecurityConfig.java | 2 +- .../service/impl/StTaskServiceImpl.java | 2 +- staffing-ui/README.md | 2 +- .../src/components/Breadcrumb/index.vue | 2 +- 6 files changed, 60 insertions(+), 14 deletions(-) diff --git a/staffing-admin/src/main/java/com/staffing/web/controller/employee/EmployeeTaskController.java b/staffing-admin/src/main/java/com/staffing/web/controller/employee/EmployeeTaskController.java index cf94405..aed9526 100644 --- a/staffing-admin/src/main/java/com/staffing/web/controller/employee/EmployeeTaskController.java +++ b/staffing-admin/src/main/java/com/staffing/web/controller/employee/EmployeeTaskController.java @@ -44,7 +44,7 @@ public class EmployeeTaskController extends BaseController * 查询任务列表 */ @GetMapping("/list") - public TableDataInfo list(StTask stTask, @RequestParam(required = false) boolean self, @RequestParam(required = false) boolean xinchou) + public TableDataInfo list(StTask stTask, @RequestParam(required = false) boolean xinchou) { if (!xinchou){ @@ -62,18 +62,59 @@ public class EmployeeTaskController extends BaseController if (stTask.getDateStatus() != 0){ stTask.setTaskDateCompare(dayZero); } - SysUser user = SecurityUtils.getLoginUser().getUser(); - long userId = user.getUserId(); + SysUser user = null; + try{ + user = SecurityUtils.getLoginUser().getUser(); + }catch (Exception e){ + } + + long userId = 0; + if (user != null){ + userId = user.getUserId(); + } List list; stTask.getParams().put("order", dayZero); - if (!self){ - list = stTaskService.selectStTaskList(stTask, userId); - }else{ - stTask.setDateStatus(0); - list = stTaskService.selectStTaskListByUserId(stTask, userId, xinchou); - } + list = stTaskService.selectStTaskList(stTask, userId); return getDataTable(list); } + /** + * 查询任务列表 + */ + @GetMapping("/selfList") + public TableDataInfo selfList(StTask stTask, @RequestParam(required = false) boolean xinchou) + { + if (!xinchou){ + stTask.setDateStatus(1); + }else{ + stTask.setDateStatus(0); + } + stTask.setStatus(1); + // 获取当前时间 + ZonedDateTime now = ZonedDateTime.now(); + // 今日0点 + ZonedDateTime nextDayStart = now.plusDays(0).truncatedTo(ChronoUnit.DAYS); + Date dayZero = Date.from(nextDayStart.toInstant()); + + if (stTask.getDateStatus() != 0){ + stTask.setTaskDateCompare(dayZero); + } + SysUser user = null; + try{ + user = SecurityUtils.getLoginUser().getUser(); + }catch (Exception e){ + } + + long userId = 0; + if (user != null){ + userId = user.getUserId(); + } + List list; + stTask.getParams().put("order", dayZero); + stTask.setDateStatus(0); + list = stTaskService.selectStTaskListByUserId(stTask, userId, xinchou); + return getDataTable(list); + } + diff --git a/staffing-admin/src/main/java/com/staffing/web/controller/merchant/MerchantUserController.java b/staffing-admin/src/main/java/com/staffing/web/controller/merchant/MerchantUserController.java index 040ec3b..526c7d9 100644 --- a/staffing-admin/src/main/java/com/staffing/web/controller/merchant/MerchantUserController.java +++ b/staffing-admin/src/main/java/com/staffing/web/controller/merchant/MerchantUserController.java @@ -207,5 +207,10 @@ public class MerchantUserController extends BaseController List menus = menuService.selectMenuTreeByUserId(userId); return AjaxResult.success(menuService.buildMenus(menus)); } - + @GetMapping("verifyToken") + public AjaxResult verifyToken() + { + AjaxResult ajax = AjaxResult.success(); + return ajax; + } } diff --git a/staffing-framework/src/main/java/com/staffing/framework/config/SecurityConfig.java b/staffing-framework/src/main/java/com/staffing/framework/config/SecurityConfig.java index 7e38209..d2ebd3f 100644 --- a/staffing-framework/src/main/java/com/staffing/framework/config/SecurityConfig.java +++ b/staffing-framework/src/main/java/com/staffing/framework/config/SecurityConfig.java @@ -112,7 +112,7 @@ public class SecurityConfig permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 , "/employee/**/**", "/employee/**", "/merchant/**/**", "/merchant/**" requests.antMatchers("/login", "/register", "/captchaImage" - , "/employee/task/getTask" + , "/employee/task/getTask" , "/employee/task/list" , "/employee/user/login", "/employee/user/wxlogin", "/employee/user/register", "/employee/user/captchaImage" , "/merchant/user/login", "/merchant/user/wxlogin", "/merchant/user/register", "/merchant/user/captchaImage" , "/merchant/fund/fxResult").permitAll() diff --git a/staffing-system/src/main/java/com/staffing/custom/service/impl/StTaskServiceImpl.java b/staffing-system/src/main/java/com/staffing/custom/service/impl/StTaskServiceImpl.java index caad977..f0e7006 100644 --- a/staffing-system/src/main/java/com/staffing/custom/service/impl/StTaskServiceImpl.java +++ b/staffing-system/src/main/java/com/staffing/custom/service/impl/StTaskServiceImpl.java @@ -132,7 +132,7 @@ public class StTaskServiceImpl implements IStTaskService for (StTask task : stTasks) { if (task.getCodePic() == null){ generatePrCode(task); - updateStTask(stTask); + updateStTask(task); } } diff --git a/staffing-ui/README.md b/staffing-ui/README.md index 6a1a632..dcf01de 100644 --- a/staffing-ui/README.md +++ b/staffing-ui/README.md @@ -24,7 +24,7 @@ npm run dev ```bash # 构建测试环境 npm run build:stage - +4 # 构建生产环境 npm run build:prod ``` \ No newline at end of file diff --git a/staffing-ui/src/components/Breadcrumb/index.vue b/staffing-ui/src/components/Breadcrumb/index.vue index 1696f54..ebf6565 100644 --- a/staffing-ui/src/components/Breadcrumb/index.vue +++ b/staffing-ui/src/components/Breadcrumb/index.vue @@ -35,7 +35,7 @@ export default { const first = matched[0] if (!this.isDashboard(first)) { - matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched) + matched = [{ path: '/index', meta: { title: '' }}].concat(matched) } this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)