Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into develop

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

@@ -1029,9 +1029,8 @@
             LEFT JOIN staff_patrol_detail d ON m.ID = d.STAFF_PATROL_REC_ID
         WHERE
             1 =1
-
             <if test="patrolId != null and patrolId != ''">
-                AND  ID = #{patrolId}
+                AND  m.ID = #{patrolId}
             </if>
             and m.CUSTOMER_ID = #{customerId}
             AND m.DEL_FLAG = '0'

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

@@ -24,7 +24,6 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
-import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.opendata.dao.UserPatrolRecordDao;
@@ -114,12 +113,6 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
             if (effectRow == NumConstant.ZERO) {
                 baseDao.insert(recordEntity);
             }
-            //todo 过滤掉巡查结束时间之后的轨迹
-            Result<List<MidPatrolDetailResult>> detailResult = dataStatisticalOpenFeignClient.getPatrolDetailList(midPatrolFormDTO);
-            if (detailResult == null || !detailResult.success()) {
-                log.error("获取巡查记录明细失败，param:{}", JSON.toJSONString(midPatrolFormDTO));
-                return;
-            }
             UserPatrolDetailEntity detailEntity = buildDetailEntity(o);
             //先删除再新增
             userPatrolDetailService.deleteByPatrolId(recordEntity.getId());