Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolUploadFormDTO.java

@@ -3,8 +3,8 @@ package com.epmet.dto.form;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @author zhaoqifeng
@@ -16,9 +16,11 @@ import java.math.BigDecimal;
 public class PatrolUploadFormDTO implements Serializable {
 
 	private static final long serialVersionUID = 4665110896043941317L;
+	public interface PatrolUploadForm{}
 	/**
 	 * 巡查主记录id, 开始巡查反参
 	 */
+	@NotBlank(message = "巡查记录ID不能为空",groups = PatrolUploadForm.class)
 	private String staffPatrolRecId;
 	/**
 	 * 纬度

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java

@@ -112,6 +112,7 @@ public class StaffPatrolController {
 	 */
 	@PostMapping("uploaddetail")
 	public Result<PatrolUploadResultDTO> uploadDetail(@LoginUser TokenDto tokenDto, @RequestBody PatrolUploadFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, PatrolUploadFormDTO.PatrolUploadForm.class);
 		PatrolUploadResultDTO result = staffPatrolRecordService.uploadDetail(tokenDto, formDTO);
 		return new Result<PatrolUploadResultDTO>().ok(result);
 

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

@@ -7,6 +7,7 @@
     <select id="selectLL" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
         SELECT t.* FROM
             (SELECT
+                DISTINCT pd.id AS id,
                 pr.GRID AS gridId,
                 pr.STAFF_ID,
                 pr.`STATUS`,
@@ -14,7 +15,12 @@
                 pd.LONGITUDE,
                 pd.SERIAL_NUM
             FROM staff_patrol_record pr
-            INNER JOIN (SELECT MAX(pd.CREATED_TIME) , pd.STAFF_PATROL_REC_ID, pd.LATITUDE, pd.LONGITUDE,pd.SERIAL_NUM FROM staff_patrol_detail pd WHERE pd.DEL_FLAG = '0' GROUP BY pd.STAFF_PATROL_REC_ID) pd ON(pd.STAFF_PATROL_REC_ID = pr.ID)
+            INNER JOIN (
+        SELECT t.* FROM (SELECT DISTINCT pd.ID AS id, pd.STAFF_PATROL_REC_ID, pd.LATITUDE, pd.LONGITUDE, pd.SERIAL_NUM
+        FROM staff_patrol_detail pd
+        WHERE pd.DEL_FLAG = '0' ORDER BY pd.CREATED_TIME DESC) t
+        GROUP BY t.STAFF_PATROL_REC_ID
+        ) pd ON(pd.STAFF_PATROL_REC_ID = pr.ID)
             WHERE pr.DEL_FLAG = 0
                 AND (
                 <foreach collection="userIds" item="userId" separator=" OR ">