Merge branch 'yantai_zhengwu_master' into dev

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java

@@ -718,12 +718,13 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                     entity.setDealStatus(judgeDealStatus.dealStatus);
                 }
                 entity.setUpdatedTime(new Date());
-                list.add(entity);
+//                list.add(entity);
+                dataSyncRecordDeathService.saveOrUpdate(entity);
             }
             if (list.size() == NumConstant.ZERO) {
                 return;
             }
-            dataSyncRecordDeathService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED);
+//            dataSyncRecordDeathService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED);
         } catch (Exception e) {
             log.error("siwang exception", e);
         }
@@ -778,12 +779,13 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                     entity.setDealStatus(judgeDealStatus.dealStatus);
                 }
                 entity.setUpdatedTime(new Date());
-                list.add(entity);
+//                list.add(entity);
+                dataSyncRecordMaritalService.saveOrUpdate(entity);
             }
             if (list.size() == NumConstant.ZERO) {
                 return;
             }
-            dataSyncRecordMaritalService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED);
+//            dataSyncRecordMaritalService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED);
         } catch (Exception e) {
             log.error("hunyin exception", e);
         }