From ae32c3a7d77e2ed114555623c70e3fbd1d6aba59 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 10 三月 2022 08:47:45 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
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 683ddf3..154a2db 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
@@ -36,9 +36,6 @@
private ICustomerService iCustomerService;
@Autowired
- private ICarService iCarService;
-
- @Autowired
private ICustomerReceiveService iCustomerReceiveService;
@Scheduled(cron="0 30 23 * * ?")//姣忔櫄鍑屾櫒1鐐规墽琛�
@@ -52,7 +49,9 @@
for(OrderTaskOriginal original:list){
OrderTask orderTask = new OrderTask();
orderTask.setCode(original.getCode());
- orderTask.setAreaId(getArea(original.getAreaName()));
+ Area area = getArea(original.getAreaName());
+ orderTask.setAreaId(area.getId());
+ orderTask.setCarId(area.getCarId());
orderTask.setAreaSectionId(getAreaSection(orderTask.getAreaId(),original.getAreaSection()));
orderTask.setCustomerId(getCustomer(original.getCustomerCode(),original.getCustomerName(),original.getCustomerPhone(),original.getLinker(),orderTask.getAreaId(),orderTask.getAreaSectionId()));
orderTask.setEndDate(original.getPacketDate());
@@ -65,7 +64,7 @@
}
orderTask.setNum(original.getNum());
- orderTask.setCarId(getCarId(orderTask.getAreaId()));
+
iOrderTaskService.saveOrUpdate(orderTask);
updateCustomerRecive(orderTask.getCustomerId(),original.getLinker(),original.getCustomerPhone());
@@ -125,7 +124,7 @@
return one.getId();
}
- public String getArea(String name){
+ public Area getArea(String name){
QueryWrapper<Area> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("name",name);
Area one = iAreaService.getOne(queryWrapper);
@@ -133,9 +132,9 @@
Area area = new Area();
area.setName(name);
iAreaService.saveOrUpdate(area);
- return area.getId();
+ return area;
}
- return one.getId();
+ return one;
}
public String getAreaSection(String areaId,String name){
@@ -154,7 +153,8 @@
}
public String getCarId(String areaId){
-// Area area = iAreaService.getById(areaId);
+ Area area = iAreaService.getById(areaId);
+ return area.getCarId();
// String userId = area.getUserId();
// if(StrUtil.isNotEmpty(userId)){
// QueryWrapper<Car> queryWrapper = new QueryWrapper<>();
@@ -164,7 +164,7 @@
// }else{
// return null;
// }
- return iAreaService.getCarId(areaId);
+ //return iAreaService.getCarId(areaId);
}
public String dateStringFormat(Date strDate) {
--
Gitblit v1.9.1