|
|
@@ -82,6 +82,8 @@ public class InstallBusiness {
|
|
|
FaGreeSmsService faGreeSmsService;
|
|
|
@Resource
|
|
|
OrderAppealService orderAppealService;
|
|
|
+ @Resource
|
|
|
+ ItfGreeToFaDownloadTaskListService itfGreeToFaDownloadTaskListService;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -178,6 +180,7 @@ public class InstallBusiness {
|
|
|
List<OrderAppraise> addoalist = new ArrayList<>();
|
|
|
List<FaGreeSms> faGreeSms = new ArrayList<>();
|
|
|
List<OrderAppeal> orderAppeal = new ArrayList<>();
|
|
|
+ List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
|
|
|
|
|
|
// 提取本地订单
|
|
|
OrderBase old = orderBaseService.lambdaQuery()
|
|
|
@@ -192,6 +195,10 @@ public class InstallBusiness {
|
|
|
// 获取工单主表要同步的数据
|
|
|
OrderBase upInfo = getOrderBaseUp(old, item, newLCLS);
|
|
|
|
|
|
+ // 以旧换新数据下载同步表
|
|
|
+ getOldForNewProductt(item, newLCLS,its,old);
|
|
|
+
|
|
|
+
|
|
|
// 获取工单师傅信息来自于工单主表数据只有修改的情况
|
|
|
OrderWorker own =getOrderWorkerUpdate(old.getId(), upInfo, newLCLS);
|
|
|
|
|
|
@@ -226,7 +233,8 @@ public class InstallBusiness {
|
|
|
|
|
|
// 安装工单数据修改落本地表
|
|
|
addOrUpdateOrderData(item, upInfo, own, mxsynreqids, orderProductsUpdate, synreqids,
|
|
|
- addoiolList, fyqd, orderInstall, synReqYfYyIds, addoalists, getpjSynReqId, addoalist, faGreeSms,orderAppeal);
|
|
|
+ addoiolList, fyqd, orderInstall, synReqYfYyIds, addoalists, getpjSynReqId,
|
|
|
+ addoalist, faGreeSms,orderAppeal, its);
|
|
|
}
|
|
|
|
|
|
public void addOrUpdateOrderData(ItfTblAzAssignLcLsDownload item, OrderBase upInfo, OrderWorker own,
|
|
|
@@ -234,7 +242,7 @@ public class InstallBusiness {
|
|
|
List<ItfTblAzAssignFkmxDownload> synreqids, List<OrderInstallOperatingLog> addoiolList,
|
|
|
List<ItfTblAzAssignFeeDownload> fyqd, OrderInstall orderInstall, List<Long> synReqYfYyIds,
|
|
|
List<OrderReAppointment> addoalists, List<Long> getpjSynReqId, List<OrderAppraise> addoalist,
|
|
|
- List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal) {
|
|
|
+ List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,List<ItfGreeToFaDownloadTaskList> its) {
|
|
|
// 同步修改订单基础表
|
|
|
if (upInfo !=null){
|
|
|
orderBaseService.updateById(upInfo);
|
|
|
@@ -301,6 +309,12 @@ public class InstallBusiness {
|
|
|
orderAppeal.clear();
|
|
|
}
|
|
|
|
|
|
+ // 以旧换新
|
|
|
+ if (its.size()>0){
|
|
|
+ itfGreeToFaDownloadTaskListService.saveBatch(its);
|
|
|
+ its.clear();
|
|
|
+ }
|
|
|
+
|
|
|
if (getpjSynReqId.size()>0){
|
|
|
upItfTblAzAssignSatisfactionDownload(getpjSynReqId);
|
|
|
getpjSynReqId.clear();
|
|
|
@@ -828,6 +842,7 @@ public class InstallBusiness {
|
|
|
List<Long> synReqYfYyIds = new ArrayList<>();
|
|
|
List<FaGreeSms> faGreeSms = new ArrayList<>();
|
|
|
List<OrderAppeal> orderAppeal = new ArrayList<>();
|
|
|
+ List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
|
|
|
|
|
|
List<ItfTblAzAssignMxDownload> orderMx = itfTblAzAssignMxDownloadService.lambdaQuery()
|
|
|
.eq(ItfTblAzAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
|
|
|
@@ -845,6 +860,9 @@ public class InstallBusiness {
|
|
|
|
|
|
// 获取安装工单主表
|
|
|
OrderBase orderBase = getAddOrderBase(item, brand);
|
|
|
+ // 以旧换新数据下载同步表
|
|
|
+ getOldForNewProduct(item, orderBase,its);
|
|
|
+
|
|
|
// 获取工单师傅信息
|
|
|
OrderWorker orderWorker = getOrderWorker(orderBase);
|
|
|
// 获取工单机型
|
|
|
@@ -874,7 +892,60 @@ public class InstallBusiness {
|
|
|
|
|
|
// 安装工单数据落本地表
|
|
|
addOrderData(orderBase, orderWorker, orderInstall, orderProducts, oiolList, oa, oanew,
|
|
|
- item.getSynReqId(), synReqIds, synReqFkMxIds, synReqYfYyIds, fyqd, getpjSynReqId,faGreeSms,orderAppeal);
|
|
|
+ item.getSynReqId(), synReqIds, synReqFkMxIds, synReqYfYyIds, fyqd, getpjSynReqId,
|
|
|
+ faGreeSms,orderAppeal, its);
|
|
|
+ }
|
|
|
+
|
|
|
+ private void getOldForNewProduct(ItfTblAzAssignLcLsDownload item, OrderBase orderBase,List<ItfGreeToFaDownloadTaskList> its) {
|
|
|
+ // 这里为新增是一定没下载的 无需判断状态值
|
|
|
+ if(orderBase.getSaleType().equals(OrderTypeEnum.ORDER_SALE_TYPE1.getCode()) ||
|
|
|
+ orderBase.getSaleType().equals(OrderTypeEnum.ORDER_SALE_TYPE2.getCode()) ||
|
|
|
+ orderBase.getSaleType().equals(OrderTypeEnum.ORDER_SALE_TYPE3.getCode())){
|
|
|
+
|
|
|
+ ItfGreeToFaDownloadTaskList tl = new ItfGreeToFaDownloadTaskList();
|
|
|
+ tl.setDownloadTaskNo(IdWorker.getIdStr());
|
|
|
+ tl.setDownloadKeyValue(item.getPgguid());
|
|
|
+ tl.setDownloadTaskType(2205);
|
|
|
+ tl.setDownloadStatus(0);
|
|
|
+ its.add(tl);
|
|
|
+
|
|
|
+ ItfGreeToFaDownloadTaskList tlt = new ItfGreeToFaDownloadTaskList();
|
|
|
+ tlt.setDownloadTaskNo(IdWorker.getIdStr());
|
|
|
+ tlt.setDownloadKeyValue(item.getPgguid());
|
|
|
+ tlt.setDownloadTaskType(2204);
|
|
|
+ tlt.setDownloadStatus(0);
|
|
|
+ its.add(tlt);
|
|
|
+
|
|
|
+ orderBase.setYjhxDownloadFlag(1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private void getOldForNewProductt(ItfTblAzAssignLcLsDownload item, OrderBase orderBase,
|
|
|
+ List<ItfGreeToFaDownloadTaskList> its, OrderBase old ) {
|
|
|
+ // 这里为新增是一定没下载的 无需判断状态值
|
|
|
+ if((orderBase.getSaleType().equals(OrderTypeEnum.ORDER_SALE_TYPE1.getCode()) ||
|
|
|
+ orderBase.getSaleType().equals(OrderTypeEnum.ORDER_SALE_TYPE2.getCode()) ||
|
|
|
+ orderBase.getSaleType().equals(OrderTypeEnum.ORDER_SALE_TYPE3.getCode())) &&
|
|
|
+ old.getYjhxDownloadFlag().equals(0)){
|
|
|
+ ItfGreeToFaDownloadTaskList tl = new ItfGreeToFaDownloadTaskList();
|
|
|
+ tl.setDownloadTaskNo(IdWorker.getIdStr());
|
|
|
+ tl.setDownloadKeyValue(item.getPgguid());
|
|
|
+ tl.setDownloadTaskType(2205);
|
|
|
+ tl.setDownloadStatus(0);
|
|
|
+ its.add(tl);
|
|
|
+ orderBase.setYjhxDownloadFlag(1);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(orderBase.getSaleType().equals(OrderTypeEnum.ORDER_SALE_TYPE1.getCode()) ||
|
|
|
+ orderBase.getSaleType().equals(OrderTypeEnum.ORDER_SALE_TYPE2.getCode()) ||
|
|
|
+ orderBase.getSaleType().equals(OrderTypeEnum.ORDER_SALE_TYPE3.getCode())){
|
|
|
+ ItfGreeToFaDownloadTaskList tlt = new ItfGreeToFaDownloadTaskList();
|
|
|
+ tlt.setDownloadTaskNo(IdWorker.getIdStr());
|
|
|
+ tlt.setDownloadKeyValue(item.getPgguid());
|
|
|
+ tlt.setDownloadTaskType(2204);
|
|
|
+ tlt.setDownloadStatus(0);
|
|
|
+ its.add(tlt);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -886,7 +957,8 @@ public class InstallBusiness {
|
|
|
List<OrderInstallOperatingLog> oiolList, List<OrderReAppointment> oa, List<OrderAppraise> oanew,
|
|
|
Long synReqId, List<Long> synReqIds, List<Long> synReqFkMxIds, List<Long> synReqYfYyIds,
|
|
|
List<ItfTblAzAssignFeeDownload> fyqd, List<Long> getpjSynReqId,
|
|
|
- List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal) {
|
|
|
+ List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,
|
|
|
+ List<ItfGreeToFaDownloadTaskList> its) {
|
|
|
// 工单基础表
|
|
|
if (orderBase != null) {
|
|
|
orderBaseService.save(orderBase);
|
|
|
@@ -954,6 +1026,12 @@ public class InstallBusiness {
|
|
|
orderAppeal.clear();
|
|
|
}
|
|
|
|
|
|
+ // 以旧换新
|
|
|
+ if (its.size()>0){
|
|
|
+ itfGreeToFaDownloadTaskListService.saveBatch(its);
|
|
|
+ its.clear();
|
|
|
+ }
|
|
|
+
|
|
|
// 修改同步状态
|
|
|
if (getpjSynReqId.size()>0){
|
|
|
upItfTblAzAssignSatisfactionDownload(getpjSynReqId);
|