yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2024-07-11 13:31:54 +08:00
parent 5ab936a700
commit b41a463684
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

@ -1277,14 +1277,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders.setOldMassageNum(oldOrders.getMassageNum());
orders.setOldMassageDuration(oldOrders.getDuration());
ordersMassageService.removeByOrdersId(orders.getOrdersId());
List<OrdersMassage> 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<OrdersDao, Orders> implements
baseMapper.insert(orders);
ordersMassageService.removeByOrdersId(orders.getOrdersId());
List<OrdersMassage> ordersMassageList = orders.getOrdersMassageList();
for (OrdersMassage ordersMassage : ordersMassageList) {
ordersMassage.setOrdersId(orders.getOrdersId());
ordersMassageService.save(ordersMassage);
}
return Result.success().put("data", orders);
}
//进行中项目升级

4
src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java
View File

@ -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());

2
src/main/resources/application-prod.yml
View File

@ -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

3
src/main/resources/mapper/bl/massage/MassagePackageDao.xml
View File

@ -27,9 +27,6 @@
<if test="params.title!=null and params.title!=''">
and m.title like concat('%',#{params.title},'%')
</if>
<if test="params.qyType!=null and params.qyType!=''">
and m.qy_type like concat('%',#{params.qyType},'%')
</if>
order by type asc,id desc
</select>