diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/MidBaseFormDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/MidBaseFormDTO.java new file mode 100644 index 0000000000..13e6459066 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/MidBaseFormDTO.java @@ -0,0 +1,28 @@ +package com.epmet.commons.tools.dto.form; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * desc:查询巡查 参数 + * + * @author zhaoqifeng + * @dscription + * @date 2021/6/7 16:23 + */ +@NoArgsConstructor +@Data +public class MidBaseFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = 7585836892408288392L; + /** + * 客户Id + */ + private String customerId; + /** + * 对象id 没有则查询全部 + */ + private String objectId; + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java index 4820f4d50b..9922a2fb6e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/PageFormDTO.java @@ -30,6 +30,8 @@ public class PageFormDTO { */ private Integer offset; + private boolean isPage = true; + public Integer getOffset() { return (pageNo-1)*pageSize; } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/param/MidPatrolFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/param/MidPatrolFormDTO.java index b0810e54cc..57a5a1d0c0 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/param/MidPatrolFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/param/MidPatrolFormDTO.java @@ -22,8 +22,8 @@ public class MidPatrolFormDTO extends PageFormDTO implements Serializable { */ private String customerId; /** - * 巡查记录id 没有则查询全部 + * 对象id 没有则查询全部 */ - private String patrolId; + private String objectId; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml index 6542440fb8..fa8b19cd6b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml @@ -1029,8 +1029,8 @@ LEFT JOIN staff_patrol_detail d ON m.ID = d.STAFF_PATROL_REC_ID WHERE 1 =1 - - AND m.ID = #{patrolId} + + AND m.ID = #{objectId} and m.CUSTOMER_ID = #{customerId} AND m.DEL_FLAG = '0' @@ -1044,22 +1044,22 @@ from staff_patrol_detail WHERE 1=1 - - AND staff_patrol_rec_id = #{patrolId} + + AND staff_patrol_rec_id = #{objectId} and CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0' order by created_time LIMIT #{offset},#{pageSize} - + + SELECT + id, customer_id, grid_id, pids, user_id, title, happen_time, is_normal, work_content, + is_key_people_locate, key_people_status, address, longitude, latitude, del_flag, + revision, created_by, created_time, updated_by, updated_time + FROM epmet_user.patrol_routine_work + WHERE CUSTOMER_ID = #{customerId} + + AND ID = #{id} + + - \ No newline at end of file +