From 83e111cb2c6d9ed755bca23df293e412bfa49ebb Mon Sep 17 00:00:00 2001 From: wang-hao-jie <1550036656@qq.com> Date: 星期四, 06 一月 2022 09:08:08 +0800 Subject: [PATCH] 违章记录 --- xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 7 ++++++- xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java | 5 +++-- xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java index 09fc5c3..13ff276 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java +++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java @@ -252,16 +252,21 @@ @RequestMapping(value = "/signFor", method = RequestMethod.POST) @ApiOperation(value = "绛炬敹") - public Object signFor(String orderId,int status,String content,String customerReceiveId,int time) { + public Object signFor(String orderId,int status,String content,String customerReceiveId,int time,String carId) { if(status==1){ if(StrUtil.isEmpty(customerReceiveId)){ return ResultUtil.error("姝e父绛炬敹锛屾帴璐т汉id蹇呭~"); } } + + if(StrUtil.isEmpty(carId)){ + return ResultUtil.error("杞﹁締id涓嶈兘涓虹┖"); + } OrderTask orderTask = iOrderTaskService.getById(orderId); orderTask.setStatus(status); orderTask.setUserId(securityUtil.getCurrUser().getId()); orderTask.setTime(time); + orderTask.setCarId(carId); if(StrUtil.isNotEmpty(customerReceiveId)){ orderTask.setCustomerReceiveId(customerReceiveId); } diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java index 14af0b1..b925a92 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java +++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java @@ -43,10 +43,11 @@ private ICustomerReceiveService iCustomerReceiveService; @Scheduled(cron="0 30 23 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛� + //@Scheduled(cron="0 22 17 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛� public void execute(){ QueryWrapper<OrderTaskOriginal> queryWrapper = new QueryWrapper<>(); queryWrapper.between("create_time",dateStringFormat(new Date()),dateStringFormat2(new Date())); - List<OrderTaskOriginal> list = iOrderTaskOriginalService.list(); + List<OrderTaskOriginal> list = iOrderTaskOriginalService.list(queryWrapper); for(OrderTaskOriginal original:list){ OrderTask orderTask = new OrderTask(); @@ -59,7 +60,7 @@ orderTask.setOrderDate(original.getOrderDate()); orderTask.setSeq(original.getSeq()); orderTask.setNum(original.getNum()); - orderTask.setCarId(orderTask.getAreaId()); + //orderTask.setCarId(orderTask.getAreaId()); iOrderTaskService.saveOrUpdate(orderTask); updateCustomerRecive(orderTask.getCustomerId(),original.getLinker(),original.getCustomerPhone()); diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java index 040a25a..a2c27d9 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java +++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java @@ -53,7 +53,7 @@ public static final String HEAD = "statistic1::"; - @Scheduled(cron="0 0 * * * ?")//姣忓皬鏃� + @Scheduled(cron="0 15 * * * ?")//姣忓皬鏃�15鍒嗛挓鏃舵墽琛� public void execute(){ redisTemplate.set(HEAD+"car",iCarService.count()+"");//杞﹁締 redisTemplate.set(HEAD+"user",userService.countByType(0)+"");//鍙告満 -- Gitblit v1.9.1