14 changed files with 507 additions and 9 deletions
			
			
		@ -0,0 +1,45 @@ | 
				
			|||
package com.epmet.dto.form; | 
				
			|||
 | 
				
			|||
import lombok.Data; | 
				
			|||
 | 
				
			|||
import javax.validation.constraints.NotBlank; | 
				
			|||
import javax.validation.constraints.NotNull; | 
				
			|||
import java.io.Serializable; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * @Author zxc | 
				
			|||
 * @DateTime 2022/1/4 2:00 下午 | 
				
			|||
 * @DESC | 
				
			|||
 */ | 
				
			|||
@Data | 
				
			|||
public class PcWorkListFormDTO implements Serializable { | 
				
			|||
 | 
				
			|||
    private static final long serialVersionUID = -3522636529743412120L; | 
				
			|||
 | 
				
			|||
    public interface PcWorkListForm{} | 
				
			|||
 | 
				
			|||
//    @NotBlank(message = "staffId不能为空",groups = PcWorkListForm.class)
 | 
				
			|||
    private String staffId; | 
				
			|||
 | 
				
			|||
    @NotBlank(message = "endTime不能为空",groups = PcWorkListForm.class) | 
				
			|||
    private String endTime; | 
				
			|||
 | 
				
			|||
    private String startTime; | 
				
			|||
 | 
				
			|||
    @NotBlank(message = "orgId不能为空",groups = PcWorkListForm.class) | 
				
			|||
    private String orgId; | 
				
			|||
 | 
				
			|||
    @NotBlank(message = "orgType不能为空",groups = PcWorkListForm.class) | 
				
			|||
    private String orgType; | 
				
			|||
 | 
				
			|||
    @NotNull(message = "pageSize不能为空",groups = PcWorkListForm.class) | 
				
			|||
    private Integer pageSize; | 
				
			|||
 | 
				
			|||
    @NotNull(message = "pageNo不能为空",groups = PcWorkListForm.class) | 
				
			|||
    private Integer pageNo; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 是否分页,默认分页 | 
				
			|||
     */ | 
				
			|||
    private Boolean isPage = true; | 
				
			|||
} | 
				
			|||
@ -0,0 +1,53 @@ | 
				
			|||
package com.epmet.dto.form.patrol; | 
				
			|||
 | 
				
			|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; | 
				
			|||
import lombok.Data; | 
				
			|||
 | 
				
			|||
import javax.validation.constraints.Min; | 
				
			|||
import javax.validation.constraints.NotBlank; | 
				
			|||
import java.io.Serializable; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * @Description 【网格员工作统计】巡查记录列表 | 
				
			|||
 * @Author sun | 
				
			|||
 */ | 
				
			|||
@Data | 
				
			|||
public class PcworkRecordListFormDTO implements Serializable { | 
				
			|||
	private static final long serialVersionUID = 9156247659994638103L; | 
				
			|||
 | 
				
			|||
	/** | 
				
			|||
	 * 组织或网格Id | 
				
			|||
	 */ | 
				
			|||
	@NotBlank(message = "组织Id不能为空", groups = Staff.class) | 
				
			|||
	private String orgId; | 
				
			|||
	/** | 
				
			|||
	 * 组织agency  网格grid | 
				
			|||
	 */ | 
				
			|||
	@NotBlank(message = "组织类型不能为空", groups = Staff.class) | 
				
			|||
	private String orgType; | 
				
			|||
	/** | 
				
			|||
	 * 工作人员Id | 
				
			|||
	 */ | 
				
			|||
	private String staffId; | 
				
			|||
	/** | 
				
			|||
	 * 开始时间【yyyymmdd】 | 
				
			|||
	 */ | 
				
			|||
	private String startTime; | 
				
			|||
	/** | 
				
			|||
	 * 结束时间【yyyymmdd】 | 
				
			|||
	 */ | 
				
			|||
	@NotBlank(message = "结束时间不能为空",groups = Staff.class) | 
				
			|||
	private String endTime; | 
				
			|||
	/** | 
				
			|||
	 * 页码 | 
				
			|||
	 * */ | 
				
			|||
	@Min(1) | 
				
			|||
	private Integer pageNo; | 
				
			|||
	/** | 
				
			|||
	 * 每页多少条 | 
				
			|||
	 * */ | 
				
			|||
	private Integer pageSize = 20; | 
				
			|||
	private Boolean isPage = true; | 
				
			|||
	public interface Staff extends CustomerClientShowGroup {} | 
				
			|||
 | 
				
			|||
} | 
				
			|||
@ -0,0 +1,107 @@ | 
				
			|||
package com.epmet.dto.result; | 
				
			|||
 | 
				
			|||
import com.epmet.commons.tools.constant.NumConstant; | 
				
			|||
import lombok.Data; | 
				
			|||
 | 
				
			|||
import java.io.Serializable; | 
				
			|||
import java.util.ArrayList; | 
				
			|||
import java.util.List; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * @Author zxc | 
				
			|||
 * @DateTime 2022/1/4 2:06 下午 | 
				
			|||
 * @DESC | 
				
			|||
 */ | 
				
			|||
@Data | 
				
			|||
public class PcWorkListResultDTO implements Serializable { | 
				
			|||
 | 
				
			|||
    private static final long serialVersionUID = -2072009617522409407L; | 
				
			|||
 | 
				
			|||
    private Integer total; | 
				
			|||
 | 
				
			|||
    private List<PcWorkListResult> list; | 
				
			|||
 | 
				
			|||
    public PcWorkListResultDTO() { | 
				
			|||
        this.total = NumConstant.ZERO; | 
				
			|||
        this.list = new ArrayList<>(); | 
				
			|||
    } | 
				
			|||
 | 
				
			|||
    @Data | 
				
			|||
    public static class PcWorkListResult{ | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 事项名称 | 
				
			|||
         */ | 
				
			|||
        private String title; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 事项类型码 | 
				
			|||
         */ | 
				
			|||
        private List<String> workTypeCode; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 事项类型名称 | 
				
			|||
         */ | 
				
			|||
        private List<String> workTypeName; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 有无异常 | 
				
			|||
         */ | 
				
			|||
        private String isNormal; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 发生地点 | 
				
			|||
         */ | 
				
			|||
        private String happenAddress; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 发生时间  返回返回格式化字符串,yyyy-MM-dd | 
				
			|||
         */ | 
				
			|||
        private String happenTime; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 人员ID | 
				
			|||
         */ | 
				
			|||
        private String staffId; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 人员姓名 | 
				
			|||
         */ | 
				
			|||
        private String staffName; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 网格id | 
				
			|||
         */ | 
				
			|||
        private String gridId; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 网格名字 | 
				
			|||
         */ | 
				
			|||
        private String gridName; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 提交日期  返回返回格式化字符串,yyyy-MM-dd HH:mm:ss | 
				
			|||
         */ | 
				
			|||
        private String createdTime; | 
				
			|||
 | 
				
			|||
        /** | 
				
			|||
         * 工作内容 | 
				
			|||
         */ | 
				
			|||
        private String workContent; | 
				
			|||
 | 
				
			|||
        public PcWorkListResult() { | 
				
			|||
            this.title = ""; | 
				
			|||
            this.workTypeCode = new ArrayList<>(); | 
				
			|||
            this.workTypeName = new ArrayList<>(); | 
				
			|||
            this.isNormal = ""; | 
				
			|||
            this.happenAddress = ""; | 
				
			|||
            this.happenTime = ""; | 
				
			|||
            this.staffId = ""; | 
				
			|||
            this.staffName = ""; | 
				
			|||
            this.gridId = ""; | 
				
			|||
            this.gridName = ""; | 
				
			|||
            this.createdTime = ""; | 
				
			|||
            this.workContent = ""; | 
				
			|||
        } | 
				
			|||
    } | 
				
			|||
} | 
				
			|||
@ -0,0 +1,43 @@ | 
				
			|||
package com.epmet.dto.result; | 
				
			|||
 | 
				
			|||
import lombok.Data; | 
				
			|||
 | 
				
			|||
import java.io.Serializable; | 
				
			|||
import java.util.ArrayList; | 
				
			|||
import java.util.List; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * @Description 【网格员工作统计】巡查记录列表 | 
				
			|||
 * @Author sun | 
				
			|||
 */ | 
				
			|||
@Data | 
				
			|||
public class PcworkRecordListResultDTO implements Serializable { | 
				
			|||
 | 
				
			|||
    private static final long serialVersionUID = -1L; | 
				
			|||
 | 
				
			|||
    List<StaffPatrol> list = new ArrayList<>(); | 
				
			|||
    private Integer total; | 
				
			|||
 | 
				
			|||
    @Data | 
				
			|||
    public static class StaffPatrol { | 
				
			|||
        //人员ID
 | 
				
			|||
        private String staffId; | 
				
			|||
        //人员名称
 | 
				
			|||
        private String staffName; | 
				
			|||
        //网格ID
 | 
				
			|||
        private String gridId; | 
				
			|||
        //网格名称
 | 
				
			|||
        private String gridName; | 
				
			|||
        //状态(英文key)
 | 
				
			|||
        private String status; | 
				
			|||
        //状态(中文)
 | 
				
			|||
        private String statusName; | 
				
			|||
        //巡查开始时间  返回返回格式化字符串,yyyy-MM-dd HH:mm:ss
 | 
				
			|||
        private String patrolStartTime; | 
				
			|||
        //巡查结束时间  返回返回格式化字符串,yyyy-MM-dd HH:mm:ss
 | 
				
			|||
        private String patrolEndTime; | 
				
			|||
        //巡查时长 xx小时xx分钟
 | 
				
			|||
        private String totalTime; | 
				
			|||
    } | 
				
			|||
 | 
				
			|||
} | 
				
			|||
					Loading…
					
					
				
		Reference in new issue