yaozhixue 1 ano atrás
pai
commit
dac1c1223d

+ 17 - 6
src/main/java/com/zfire/jiasm/syncdata/service/impl/AddInstallBusinessImpl.java

@@ -244,7 +244,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 生成工单
         return createInstallOrder(item, orderProducts, oiolList, odfs, synReqIds,
                 synReqFkMxIds, synReqYfYyIds, faGreeSms, orderAppeal, its,
-                orderBase, orderWorker, fyqd, orderInstall, getpjSynReqId, flag,oids );
+                orderBase, orderWorker, fyqd, orderInstall, getpjSynReqId, flag,oids,
+                oa);
     }
 
     @NotNull
@@ -255,7 +256,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
                                        List<ItfGreeToFaDownloadTaskList> its, OrderBase orderBase, OrderWorker orderWorker,
                                        List<ItfTblAzAssignFeeDownload> fyqd,
                                        OrderInstall orderInstall, List<Long> getpjSynReqId, Boolean flag,
-                                       List<OrderInstallDetail> oids) throws Exception {
+                                       List<OrderInstallDetail> oids,
+                                       List<OrderReAppointment> oa) throws Exception {
         // 创建工单
         OrderAddBeanDTO createOrder = new OrderAddBeanDTO();
         // 工单机型
@@ -274,7 +276,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         if (respone.getCode()==200){
             // 安装工单数据落本地表
             addOrderDataApi(item.getSynReqId(), synReqIds, synReqFkMxIds, synReqYfYyIds, fyqd, getpjSynReqId,
-                    faGreeSms, orderAppeal, its, odfs, oiolList, oids);
+                    faGreeSms, orderAppeal, its, odfs, oiolList, oids, oa);
             return Boolean.TRUE;
         } else {
             String msg = publicService.getErrormessage(respone);
@@ -461,7 +463,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
             // 安装工单数据修改落本地表
             addOrUpdateOrderDataApi(item, mxsynreqids, synreqids,addoiolList,
                     fyqd, synReqYfYyIds, getpjSynReqId,
-                    addoalist, faGreeSms,orderAppeal, its,odfs);
+                    addoalist, faGreeSms,orderAppeal, its,odfs, addoalists);
         } else {
             String msg = publicService.getErrormessage(respone);
             log.info(msg);
@@ -482,7 +484,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
                                      List<ItfTblAzAssignFeeDownload> fyqd,List<Long> synReqYfYyIds,
                                      List<Long> getpjSynReqId, List<OrderAppraise> addoalist,
                                      List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,List<ItfGreeToFaDownloadTaskList> its,
-                                     List<OrderDetailFile> odfs) {
+                                     List<OrderDetailFile> odfs,List<OrderReAppointment> addoalists) {
         // 同步修改订单基础表
 
         // lc_ls同步状态改成1 同步成功
@@ -510,6 +512,10 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         }
 
         // 同步用户预约表
+        if (addoalists.size()>0){
+            orderReAppointmentService.saveBatch(addoalists);
+            addoalists.clear();
+        }
         if (synReqYfYyIds.size()>0){
             upItfTblAzAssignAppointment(synReqYfYyIds);
             synReqYfYyIds.clear();
@@ -556,7 +562,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
                                 List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,
                                 List<ItfGreeToFaDownloadTaskList> its,
                                 List<OrderDetailFile> odfs, List<OrderInstallOperatingLog> oiolList,
-                                List<OrderInstallDetail> oids) {
+                                List<OrderInstallDetail> oids,
+                                List<OrderReAppointment> oa) {
         // 工单基础表
         // 工单扩展信息
         // 工单师傅表
@@ -596,6 +603,10 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         }
 
         // 用户预约改约信息表
+        if (oa.size()>0){
+            orderReAppointmentService.saveBatch(oa);
+            oa.clear();
+        }
         if (synReqYfYyIds.size()>0){
             upItfTblAzAssignAppointment(synReqYfYyIds);
             synReqYfYyIds.clear();

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/utils/HttpUtil.java

@@ -634,7 +634,7 @@ public class HttpUtil {
 			inputStream.close();
 			httpUrlConn.disconnect();
 			result = buffer.toString();
-			// log.info("receive[" + result + "],url[" + url + "],send[" + outputStr + "]");
+			log.info("receive[" + result + "],url[" + url + "],send[" + outputStr + "]");
 		} catch (ConnectException ce) {
 			log.error("发生错误", ce);
 			throw ce;

+ 2 - 2
src/main/resources/bootstrap-dev.properties

@@ -391,7 +391,7 @@ tmscc=FALSE
 azuploadyscc=FALSE
 azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
-wxuploadyscc=TRUE
+wxuploadyscc=FALSE
 wxuploadscc=FALSE
 #以旧换新 鉴定单、生成条码、条码上传
 yjhxjddc=FALSE
@@ -403,7 +403,7 @@ hsgdcjtmc=FALSE
 #工单数据向上同步
 datauploadc=FALSE
 #安装、维修工单入本地表
-installinc=FALSE
+installinc=TRUE
 repairinc=FALSE
 #完工评价短信格力总部发送,自建工单联通发送,查看评价短信回复信息,自建完工评价短信联通发送,派服务人员格力发送
 wgmsgsendc=FALSE

+ 1 - 1
src/main/resources/bootstrap-test.properties

@@ -369,7 +369,7 @@ wxzjscxc=FALSE
 #网点维修工 证件照,服务类目,位置、新增同步到本地、修改、保险、总部下载的采集图
 zjzxxc=TRUE
 lmxxc=TRUE
-wxgwzc=TRUE
+wxgwzc=FALSE
 wxgxgc=TRUE
 wxgwztc=TRUE
 zjzbxc=TRUE