Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/UserPatrolRecordServiceImpl.java

@@ -85,7 +85,7 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
             log.error("构建要插入的数据为空，param:{}", JSON.toJSONString(midPatrolFormDTO));
             return false;
         }
-        this.insertBatch(insertList, NumConstant.ONE_HUNDRED);
+        this.saveOrUpdateBatch(insertList, NumConstant.ONE_HUNDRED);
         return true;
     }
 
@@ -110,15 +110,9 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
         }
         data.forEach(o->{
             UserPatrolRecordEntity recordEntity = buildEntity(o);
-            //update
-            int effectRow = baseDao.updateById(recordEntity);
-            if (effectRow == NumConstant.ZERO) {
-                baseDao.insert(recordEntity);
-            }
+            this.saveOrUpdate(recordEntity);
             UserPatrolDetailEntity detailEntity = buildDetailEntity(o);
-            //先删除再新增
-            userPatrolDetailService.deleteByPatrolId(recordEntity.getId());
-            boolean insert = userPatrolDetailService.insert(detailEntity);
+            userPatrolDetailService.saveOrUpdate(detailEntity);
         });
 
         return true;