jianjun
4 years ago
70 changed files with 2136 additions and 114 deletions
@ -1,29 +0,0 @@ |
|||
# Created by .ignore support plugin (hsz.mobi) |
|||
### Java template |
|||
# Compiled class file |
|||
*.class |
|||
|
|||
# Log file |
|||
*.log |
|||
|
|||
# BlueJ files |
|||
*.ctxt |
|||
|
|||
# Mobile Tools for Java (J2ME) |
|||
.mtj.tmp/ |
|||
|
|||
# Package Files # |
|||
*.jar |
|||
*.war |
|||
*.nar |
|||
*.ear |
|||
*.zip |
|||
*.tar.gz |
|||
*.rar |
|||
|
|||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml |
|||
hs_err_pid* |
|||
.idea/ |
|||
*.iml |
|||
target/ |
|||
|
|||
@ -0,0 +1,21 @@ |
|||
package com.epmet.dataaggre.dto.epmetuser.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @ClassName StaffPatrolRecordDailyResultDTO |
|||
* @Description 工作人员巡查记录按日统计，查询结果 |
|||
* @Author wangxianzhang |
|||
* @Date 2022/1/4 4:08 下午 |
|||
*/ |
|||
@Data |
|||
public class StaffPatrolRecordDailyResultDTO { |
|||
|
|||
private String staffId; |
|||
private String gridId; |
|||
|
|||
private int patrolTimes; |
|||
private int totalTime; |
|||
private int patrolRoutineWorkTimes; |
|||
|
|||
} |
|||
@ -0,0 +1,55 @@ |
|||
package com.epmet.dataaggre.beans; |
|||
|
|||
import com.alibaba.excel.annotation.ExcelProperty; |
|||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
import lombok.Getter; |
|||
import lombok.Setter; |
|||
|
|||
/** |
|||
* 网格员数据分析excel导出bean |
|||
*/ |
|||
@Getter |
|||
@Setter |
|||
@EqualsAndHashCode |
|||
@ColumnWidth(20) |
|||
public class GridMemberDataAnalysisExcelExportBean { |
|||
@ExcelProperty(value = {"姓名"}) |
|||
private String staffName; |
|||
|
|||
@ExcelProperty(value = {"手机号"}) |
|||
private String mobile; |
|||
|
|||
@ExcelProperty(value = {"所属网格"}) |
|||
private String orgName; |
|||
|
|||
// 项目议题等
|
|||
@ExcelProperty(value = {"项目数"}) |
|||
private Integer projectCount; |
|||
|
|||
@ExcelProperty(value = {"议题转项目数"}) |
|||
private Integer issueToProjectCount; |
|||
|
|||
@ExcelProperty(value = {"议题关闭数"}) |
|||
private Integer closedIssueCount; |
|||
|
|||
@ExcelProperty(value = {"项目事件响应数"}) |
|||
private Integer projectResponseCount; |
|||
|
|||
@ExcelProperty(value = {"项目事件吹哨数"}) |
|||
private Integer projectTransferCount; |
|||
|
|||
@ExcelProperty(value = {"项目事件结案数"}) |
|||
private Integer projectClosedCount; |
|||
|
|||
// 巡查
|
|||
@ExcelProperty(value = {"巡查次数"}) |
|||
private int patrolTimes; |
|||
|
|||
@ExcelProperty(value = {"巡查时长(小时)"}) |
|||
private double totalTime; |
|||
|
|||
@ExcelProperty(value = {"例行工作次数"}) |
|||
private int patrolRoutineWorkTimes; |
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/1/4 14:49 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class ApprovaledListFromDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 5700160700676332579L; |
|||
private String customerId; |
|||
@NotBlank(message = "组织id不能为空") |
|||
private String orgId; |
|||
private String orgType; |
|||
private String startTime; |
|||
private String endTime; |
|||
private String staffId; |
|||
private Integer pageSize = 1; |
|||
private Integer pageNo = 20; |
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/1/4 14:58 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class ApprovaledListResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 5118030421632653558L; |
|||
private String projectId; |
|||
private String title; |
|||
private String projectCategory; |
|||
private String locateAddress; |
|||
private String happenTime; |
|||
private String staffId; |
|||
private String staffName; |
|||
private String gridId; |
|||
private String gridName; |
|||
private String createdTime; |
|||
} |
|||
@ -0,0 +1,31 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import com.alibaba.excel.annotation.ExcelProperty; |
|||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
|||
import lombok.EqualsAndHashCode; |
|||
import lombok.Getter; |
|||
import lombok.Setter; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/1/5 15:00 |
|||
*/ |
|||
@Getter |
|||
@Setter |
|||
@EqualsAndHashCode |
|||
@ColumnWidth(20) |
|||
public class ApprovaledListExcel { |
|||
@ExcelProperty("项目事件标题") |
|||
private String title; |
|||
@ExcelProperty("项目事件类别") |
|||
private String projectCategory; |
|||
@ExcelProperty("发生地点") |
|||
private String locateAddress; |
|||
@ExcelProperty("发生日期") |
|||
private String happenTime; |
|||
@ExcelProperty("网格员") |
|||
private String staffName; |
|||
@ExcelProperty("提交日期") |
|||
private String createdTime; |
|||
} |
|||
@ -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,109 @@ |
|||
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 String workTypeName; |
|||
|
|||
/** |
|||
* 有无异常 |
|||
*/ |
|||
private String isNormal; |
|||
|
|||
private String workTypeNames; |
|||
|
|||
/** |
|||
* 发生地点 |
|||
*/ |
|||
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 = ""; |
|||
this.isNormal = ""; |
|||
this.happenAddress = ""; |
|||
this.happenTime = ""; |
|||
this.staffId = ""; |
|||
this.staffName = ""; |
|||
this.gridId = ""; |
|||
this.gridName = ""; |
|||
this.createdTime = ""; |
|||
this.workContent = ""; |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.ArrayList; |
|||
import java.util.Date; |
|||
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
|
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date patrolStartTime; |
|||
//巡查结束时间 返回返回格式化字符串,yyyy-MM-dd HH:mm:ss
|
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date patrolEndTime; |
|||
//巡查时长 xx小时xx分钟
|
|||
private String totalTime; |
|||
@JsonIgnore |
|||
private Integer totalTimeNum; |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,71 @@ |
|||
package com.epmet.excel; |
|||
|
|||
import cn.afterturn.easypoi.excel.annotation.Excel; |
|||
import com.alibaba.excel.annotation.ExcelIgnore; |
|||
import com.alibaba.excel.annotation.ExcelProperty; |
|||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
import lombok.Getter; |
|||
import lombok.Setter; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/1/5 10:00 上午 |
|||
* @DESC |
|||
*/ |
|||
@Getter |
|||
@Setter |
|||
@EqualsAndHashCode |
|||
public class PcWorkListExport { |
|||
|
|||
@ExcelProperty("事项名称") |
|||
@ColumnWidth(20) |
|||
private String title; |
|||
|
|||
@ExcelProperty("事项类型码") |
|||
@ColumnWidth(20) |
|||
@ExcelIgnore |
|||
private String workTypeCode; |
|||
|
|||
@ExcelProperty("事项类型名称") |
|||
@ColumnWidth(40) |
|||
private String workTypeName; |
|||
|
|||
@ExcelProperty("有无异常") |
|||
private String isNormal; |
|||
|
|||
@ExcelProperty("发生地点") |
|||
@ColumnWidth(20) |
|||
private String happenAddress; |
|||
|
|||
@ExcelProperty("发生时间") |
|||
@ColumnWidth(20) |
|||
private String happenTime; |
|||
|
|||
@ExcelProperty("人员ID") |
|||
@ExcelIgnore |
|||
private String staffId; |
|||
|
|||
@ExcelProperty("人员姓名") |
|||
@ColumnWidth(20) |
|||
private String staffName; |
|||
|
|||
@ExcelProperty("网格ID") |
|||
@ExcelIgnore |
|||
private String gridId; |
|||
|
|||
@ExcelProperty("网格名字") |
|||
@ColumnWidth(20) |
|||
private String gridName; |
|||
|
|||
@ExcelProperty("提交日期") |
|||
@ColumnWidth(30) |
|||
private String createdTime; |
|||
|
|||
@ExcelProperty("工作内容") |
|||
@ColumnWidth(60) |
|||
private String workContent; |
|||
} |
|||
@ -0,0 +1,83 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.excel; |
|||
|
|||
import com.alibaba.excel.annotation.ExcelIgnore; |
|||
import com.alibaba.excel.annotation.ExcelProperty; |
|||
import com.alibaba.excel.annotation.format.DateTimeFormat; |
|||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
|||
import lombok.EqualsAndHashCode; |
|||
import lombok.Getter; |
|||
import lombok.Setter; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @Description 【网格员工作统计】巡查记录列表导出 |
|||
* @Author sun |
|||
*/ |
|||
@Getter |
|||
@Setter |
|||
@EqualsAndHashCode |
|||
public class StaffPatrolRecordExcel { |
|||
|
|||
@ExcelProperty("人员ID") |
|||
@ExcelIgnore |
|||
private String staffId; |
|||
|
|||
@ExcelProperty("人员名称") |
|||
@ColumnWidth(15) |
|||
private String staffName; |
|||
|
|||
@ExcelProperty("网格ID") |
|||
@ExcelIgnore |
|||
private String gridId; |
|||
|
|||
@ExcelProperty("网格名称") |
|||
@ColumnWidth(20) |
|||
private String gridName; |
|||
|
|||
@ExcelProperty("状态（英文key）") |
|||
@ExcelIgnore |
|||
private String status; |
|||
|
|||
@ExcelProperty("状态") |
|||
@ColumnWidth(18) |
|||
private String statusName; |
|||
|
|||
@DateTimeFormat("yyyy年MM月dd日") |
|||
@ExcelProperty("巡查开始时间") |
|||
@ColumnWidth(20) |
|||
private Date patrolStartTime; |
|||
|
|||
@DateTimeFormat("yyyy年MM月dd日") |
|||
@ExcelProperty("巡查结束时间") |
|||
@ColumnWidth(20) |
|||
private Date patrolEndTime; |
|||
|
|||
@ExcelProperty("巡查时长") |
|||
@ColumnWidth(20) |
|||
private String totalTime; |
|||
|
|||
@ExcelIgnore |
|||
private Integer totalTimeNum;; |
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,2 @@ |
|||
ALTER TABLE `epmet_user`.`stats_staff_patrol_record_daily` |
|||
ADD COLUMN `ROUTINE_WORK_COUNT` int(11) NULL DEFAULT 0 COMMENT '例行工作次数 来自例行工作表' AFTER `LATEST_PATROL_STATUS`; |
|||
Loading…
Reference in new issue