From b41a4636841ea3d104928433cfe47d84f02dd3e4 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 11 Jul 2024 13:31:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artificer/service/impl/OrdersServiceImpl.java | 15 +++++++-------- .../task/service/impl/AllTaskServiceImpl.java | 4 ++-- src/main/resources/application-prod.yml | 2 +- .../mapper/bl/massage/MassagePackageDao.xml | 3 --- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index c709276..83e3edf 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -1277,14 +1277,6 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setOldMassageNum(oldOrders.getMassageNum()); orders.setOldMassageDuration(oldOrders.getDuration()); - - ordersMassageService.removeByOrdersId(orders.getOrdersId()); - List ordersMassageList = orders.getOrdersMassageList(); - for (OrdersMassage ordersMassage : ordersMassageList) { - ordersMassage.setOrdersId(orders.getOrdersId()); - ordersMassageService.save(ordersMassage); - } - Orders ordersOld = new Orders(); ordersOld.setOrdersId(oldOrders.getOrdersId()); ordersOld.setStatus(11); @@ -1380,6 +1372,13 @@ public class OrdersServiceImpl extends ServiceImpl implements baseMapper.insert(orders); + ordersMassageService.removeByOrdersId(orders.getOrdersId()); + List ordersMassageList = orders.getOrdersMassageList(); + for (OrdersMassage ordersMassage : ordersMassageList) { + ordersMassage.setOrdersId(orders.getOrdersId()); + ordersMassageService.save(ordersMassage); + } + return Result.success().put("data", orders); } //进行中项目升级 diff --git a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java index fd4ca54..4418845 100644 --- a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java +++ b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java @@ -84,13 +84,13 @@ public class AllTaskServiceImpl implements AllTaskSercice { String lastMonth = format.format(calendar2.getTime()); startTime = lastMonth+"-21 00:00:00"; endTime = lastMonth+"-"+lastDayOfMonth+" 23:59:59"; - }else if(dayOfMonth == 11){ + }else if(dayOfMonth == 12){ Calendar calendar4 = Calendar.getInstance(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); String lastMonth = format.format(calendar4.getTime()); startTime = lastMonth+"-01 00:00:00"; endTime = lastMonth+"-10 23:59:59"; - }else if(dayOfMonth == 29){ + }else if(dayOfMonth == 21){ Calendar calendar4 = Calendar.getInstance(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); String lastMonth = format.format(calendar4.getTime()); diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 15c1a4a..7be1084 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -3,7 +3,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://123.60.46.33:3306/anmo?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT + url: jdbc:mysql://127.0.0.1:3307/anmo?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT username: root password: root initial-size: 10 diff --git a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml index 3deb05f..3eb6956 100644 --- a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml +++ b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml @@ -27,9 +27,6 @@ and m.title like concat('%',#{params.title},'%') - - and m.qy_type like concat('%',#{params.qyType},'%') - order by type asc,id desc