add

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddInstallBusinessImpl.java

@@ -220,6 +220,9 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 获取工单机型 + 生成采集明细数据+附件数据
         getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, orderMx,oids,odfs);
 
+        // 获取工单操作明细- 操作日志表
+        List<OrderInstallOperatingLog> oiolList = getOrderInstallOperatingLogs(fkmxs, orderBase,item);
+
         // 获取安装费用清单 - 对应扩展表
         List<ItfTblAzAssignFeeDownload> fyqd = itfTblAzAssignFeeDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignFeeDownload::getDownloadTaskNo, item.getDownloadTaskNo())
@@ -242,13 +245,14 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         getOrderAppraise(orderBase, sysDictRefDLMap, oanew, item.getDownloadTaskNo(), getpjSynReqId,faGreeSms,orderAppeal);
 
         // 生成工单
-        return createInstallOrder(item, orderProducts, odfs, synReqIds,
+        return createInstallOrder(item, orderProducts, oiolList, odfs, synReqIds,
                 synReqFkMxIds, synReqYfYyIds, faGreeSms, orderAppeal, its,
                 oads, orderBase, orderWorker, fyqd, orderInstall, getpjSynReqId, flag);
     }
 
     @NotNull
     private Boolean createInstallOrder(ItfTblAzAssignLcLsDownload item, List<OrderProduct> orderProducts,
+                                       List<OrderInstallOperatingLog> oiolList,
                                        List<OrderDetailFile> odfs, List<Long> synReqIds, List<Long> synReqFkMxIds,
                                        List<Long> synReqYfYyIds, List<FaGreeSms> faGreeSms, List<OrderAppeal> orderAppeal,
                                        List<ItfGreeToFaDownloadTaskList> its, List<OrderApplyDispatch> oads,
@@ -272,7 +276,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         if (respone.getCode()==200){
             // 安装工单数据落本地表
             addOrderDataApi(item.getSynReqId(), synReqIds, synReqFkMxIds, synReqYfYyIds, fyqd, getpjSynReqId,
-                    faGreeSms, orderAppeal, its, oads, odfs);
+                    faGreeSms, orderAppeal, its, oads, odfs, oiolList);
             return Boolean.TRUE;
         } else {
             String msg = publicService.getErrormessage(respone);
@@ -452,7 +456,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         log.info("接口创建工单 respone:{}", JSONObject.toJSONString(respone));
         if (respone.getCode()==200){
             // 安装工单数据修改落本地表
-            addOrUpdateOrderDataApi(item, mxsynreqids, synreqids,
+            addOrUpdateOrderDataApi(item, mxsynreqids, synreqids,addoiolList,
                     fyqd, synReqYfYyIds, getpjSynReqId,
                     addoalist, faGreeSms,orderAppeal, its,oads,odfs);
         } else {
@@ -471,7 +475,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
     public void addOrUpdateOrderDataApi(ItfTblAzAssignLcLsDownload item,
                                      List<ItfTblAzAssignMxDownload> mxsynreqids,
-                                     List<ItfTblAzAssignFkmxDownload> synreqids,
+                                     List<ItfTblAzAssignFkmxDownload> synreqids,List<OrderInstallOperatingLog> addoiolList,
                                      List<ItfTblAzAssignFeeDownload> fyqd,List<Long> synReqYfYyIds,
                                      List<Long> getpjSynReqId, List<OrderAppraise> addoalist,
                                      List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,List<ItfGreeToFaDownloadTaskList> its,
@@ -488,6 +492,11 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
             mxsynreqids.clear();
         }
         // 同步新增操作日志表
+        if (addoiolList.size()>0){
+            orderInstallOperatingLogService.saveBatch(addoiolList);
+            addoiolList.clear();
+        }
+        // 同步新增操作日志表
         if (synreqids.size()>0){
             itfTblAzAssignFkmxDownloadService.updateBatchById(synreqids);
             synreqids.clear();
@@ -548,7 +557,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
                                 List<ItfTblAzAssignFeeDownload> fyqd, List<Long> getpjSynReqId,
                                 List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,
                                 List<ItfGreeToFaDownloadTaskList> its, List<OrderApplyDispatch> oads,
-                                List<OrderDetailFile> odfs) {
+                                List<OrderDetailFile> odfs, List<OrderInstallOperatingLog> oiolList) {
         // 工单基础表
         // 工单扩展信息
         // 工单师傅表
@@ -564,6 +573,12 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
             upItfTblAzAssignMxDownload(synReqIds);
             synReqIds.clear();
         }
+
+        // 同步新增操作日志表
+        if (oiolList.size()>0){
+            orderInstallOperatingLogService.saveBatch(oiolList);
+            oiolList.clear();
+        }
         // 操作明细表
         if (synReqFkMxIds.size()>0){
             upItfTblAzAssignFkmxDownload(synReqFkMxIds);

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddRepairBusinessServiceImpl.java

@@ -180,6 +180,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         List<ItfTblAssignXzydDownload> ydups = new ArrayList<>();
         List<ItfTblAssignFkmxDownload> fkmxups = new ArrayList<>();
         List<ItfTblAssignAppointmentDownload> us = new ArrayList<>();
+        List<OrderRepairOperatingLog> orols = new ArrayList<>();
 
         List<ItfTblAssignXzydDownload> yds = itfTblAssignXzydDownloadService.lambdaQuery()
                 .eq(ItfTblAssignXzydDownload::getDownloadTaskNo,item.getDownloadTaskNo()).list();
@@ -195,7 +196,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         // 处理维修单明细表 TL_SynDataFrom_tbl_assign_mx
         generateMxApi(brand, item, order, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, addmx, ups);
         // 处理维修单过程反馈表 放入操作日志表 TL_SynDataFrom_tbl_assign_fkmx
-        generateFkmxApi(item, fkmxups);
+        generateFkmxApi(item, fkmxups, orols, order);
         // 处理用户评价数据 TL_SynDataFrom_tbl_assign_satisfaction
         generateSstisfactionApi(item, sysDictRefDLMap, order);
         // 阅读要求数据处理 TL_SynDataFrom_tbl_assign_xzyd
@@ -205,7 +206,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         // 生成工单
         return createRepairOrder(item, orderWorker, or, addmx, ups, pjups, orderAppeal, oanew,
-                faGreeSms, oilist, ydups, fkmxups, us, order,flag);
+                faGreeSms, oilist, ydups, fkmxups, orols , us, order,flag);
 
     }
 
@@ -314,7 +315,10 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
     }
 
 
-    private void updateSynStatus(List<OrderProduct> addmx, List<ItfTblAssignMxDownload> upMxd, List<OrderRepairOperatingLog> orols, List<ItfTblAssignFkmxDownload> fkmxd, List<ItfTblAssignSatisfactionDownload> pjups, List<OrderAppeal> orderAppeal, List<OrderAppraise> oanew, List<FaGreeSms> faGreeSms, List<OrderInformation> oilist, List<OrderInformation> oilistUp, List<ItfTblAssignAppointmentDownload> upappointds) {
+    private void updateSynStatus(List<OrderProduct> addmx, List<ItfTblAssignMxDownload> upMxd, List<OrderRepairOperatingLog> orols,
+                                 List<ItfTblAssignFkmxDownload> fkmxd, List<ItfTblAssignSatisfactionDownload> pjups,
+                                 List<OrderAppeal> orderAppeal, List<OrderAppraise> oanew, List<FaGreeSms> faGreeSms,
+                                 List<OrderInformation> oilist, List<OrderInformation> oilistUp, List<ItfTblAssignAppointmentDownload> upappointds) {
         if (addmx.size()>0){
             orderProductService.saveBatch(addmx);
             addmx.clear();
@@ -376,7 +380,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
                                       List<ItfTblAssignMxDownload> ups, List<ItfTblAssignSatisfactionDownload> pjups,
                                       List<OrderAppeal> orderAppeal, List<OrderAppraise> oanew, List<FaGreeSms> faGreeSms,
                                       List<OrderInformation> oilist, List<ItfTblAssignXzydDownload> ydups, List<ItfTblAssignFkmxDownload> fkmxups,
-                                      List<ItfTblAssignAppointmentDownload> us, OrderBase order,Boolean flag) throws Exception {
+                                      List<OrderRepairOperatingLog> orols,List<ItfTblAssignAppointmentDownload> us, OrderBase order,Boolean flag) throws Exception {
         // 创建工单
         OrderAddBeanDTO orderApi = new OrderAddBeanDTO();
         // 工单机型
@@ -393,7 +397,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         // log.info("respone:{}", JSONObject.toJSONString(respone));
         if (respone.getCode()==200){
             // 同步更新状态
-            synStatus(item, addmx, ups, pjups, orderAppeal, oanew, faGreeSms, oilist, ydups, fkmxups, us, order);
+            synStatus(item, addmx, ups, pjups, orderAppeal, oanew, faGreeSms, oilist, ydups, fkmxups, orols, us, order);
             return Boolean.TRUE;
         } else {
             String msg = publicService.getErrormessage(respone);
@@ -415,7 +419,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
     private void synStatus(ItfTblAssignDownload item, List<OrderProduct> addmx, List<ItfTblAssignMxDownload> ups,
                            List<ItfTblAssignSatisfactionDownload> pjups, List<OrderAppeal> orderAppeal,
                            List<OrderAppraise> oanew, List<FaGreeSms> faGreeSms, List<OrderInformation> oilist,
-                           List<ItfTblAssignXzydDownload> ydups, List<ItfTblAssignFkmxDownload> fkmxups,
+                           List<ItfTblAssignXzydDownload> ydups, List<ItfTblAssignFkmxDownload> fkmxups,List<OrderRepairOperatingLog> orols,
                            List<ItfTblAssignAppointmentDownload> us, OrderBase order) {
         // 修改同步状态
         upItfTblAssignDownloadStatus(item, order);
@@ -428,6 +432,11 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
             ups.clear();
         }
 
+        if (orols.size()>0){
+            orderRepairOperatingLogService.saveBatch(orols);
+            orols.clear();
+        }
+
         // 过程反馈
         if (fkmxups.size()>0){
             itfTblAssignFkmxDownloadService.updateBatchById(fkmxups);
@@ -2068,7 +2077,8 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         }
     }
 
-    private void generateFkmxApi(ItfTblAssignDownload item, List<ItfTblAssignFkmxDownload> fkmxups) {
+    private void generateFkmxApi(ItfTblAssignDownload item, List<ItfTblAssignFkmxDownload> fkmxups,
+                                 List<OrderRepairOperatingLog> orols, OrderBase order) {
         List<ItfTblAssignFkmxDownload> fkmxRec = new ArrayList<>();
         List<ItfTblAssignFkmxDownload> ups = new ArrayList<>();
 
@@ -2079,7 +2089,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
                 .list();
         for (ItfTblAssignFkmxDownload fkmx :fkmxRec){
             // 获取操作明细数据
-            // getoroldata(order, orols, fkmx);
+            getoroldata(order, orols, fkmx);
             ItfTblAssignFkmxDownload u = new ItfTblAssignFkmxDownload();
             u.setSynReqId(fkmx.getSynReqId());
             u.setSynStatus(1);