Merge remote-tracking branch 'origin/dev'

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java

@@ -62,4 +62,7 @@ public class GridManagerUserListResultDTO implements Serializable {
     @JsonIgnore
     private Boolean llStatus;
 
+    @JsonIgnore
+    private String recordId;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java

@@ -44,6 +44,16 @@ public interface StaffPatrolRecordDao extends BaseDao<StaffPatrolRecordEntity> {
      */
     List<GridManagerUserListResultDTO> selectLL(@Param("userIds")List<String> userIds);
 
+    List<GridManagerUserListResultDTO> selectPatrolRecord(@Param("userIds")List<String> userIds);
+
+    /**
+     * @Description  按照巡查记录查询经纬度
+     * @Param recordIds
+     * @author zxc
+     * @date 2021/8/18 5:16 下午
+     */
+    List<GridManagerUserListResultDTO> selectPatrolLL(@Param("recordIds")List<String> recordIds);
+
     /**
      * @Description  巡查记录查询
      * @Param formDTO

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

@@ -411,10 +411,21 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		if (CollectionUtils.isEmpty(userIds)){
 			return result;
 		}
-		// 经纬度查询
+		// 查询记录
-		List<GridManagerUserListResultDTO> llResult = baseDao.selectLL(userIds);
+//		List<GridManagerUserListResultDTO> llResult = baseDao.selectLL(userIds);
-		if (!CollectionUtils.isEmpty(llResult)){
+		List<GridManagerUserListResultDTO> recordList = baseDao.selectPatrolRecord(userIds);
-			result.setLl(llResult);
+		if (!CollectionUtils.isEmpty(recordList)){
+			// 查询经纬度
+			List<GridManagerUserListResultDTO> llList = baseDao.selectPatrolLL(recordList.stream().map(m -> m.getRecordId()).collect(Collectors.toList()));
+			recordList.forEach(r -> {
+				llList.forEach(l -> {
+					if (r.getRecordId().equals(l.getRecordId())){
+						r.setLatitude(l.getLatitude());
+						r.setLongitude(l.getLongitude());
+					}
+				});
+			});
+			result.setLl(recordList);
 		}
 		// 姓名查询
 		List<UserNameResultDTO> nameResult = customerStaffDao.selectUserName(userIds);

epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml

@@ -46,4 +46,33 @@
         ORDER BY CREATED_TIME DESC
     </select>
 
+    <select id="selectPatrolRecord" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
+        SELECT t.* FROM (SELECT
+            pr.ID AS recordId,
+            pr.GRID AS gridId,
+            pr.STAFF_ID,
+            pr.`STATUS`
+        FROM staff_patrol_record pr
+        WHERE pr.DEL_FLAG = 0
+            AND pr.staff_id IN (
+                <foreach collection="userIds" item="userId" separator=",">
+                    #{userId}
+                </foreach>
+            )
+        ORDER BY pr.CREATED_TIME DESC)t GROUP BY STAFF_ID
+    </select>
+
+    <!-- 按照巡查记录查询经纬度 -->
+    <select id="selectPatrolLL" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
+        SELECT
+            t.*
+        FROM
+            ( SELECT DISTINCT ID, SERIAL_NUM, LATITUDE, LONGITUDE, STAFF_PATROL_REC_ID AS recordId FROM staff_patrol_detail WHERE DEL_FLAG = 0 AND STAFF_PATROL_REC_ID IN (
+                <foreach collection="recordIds" item="recordId" separator=",">
+                    #{recordId}
+                </foreach>
+                ) ORDER BY SERIAL_NUM DESC ) t
+        GROUP BY recordId
+    </select>
+
 </mapper>