同步最新代码

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java

@@ -132,4 +132,8 @@ public class AppMenuDTO extends TreeNode<SysMenuDTO> implements Serializable {
      * 上级菜单名称
      */
     private String parentName;
+    /**
+     * 绑定菜单id
+     */
+    private Long bindingId;
 }

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptGridDTO.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto;
+
+import com.elink.esua.epdc.commons.tools.utils.TreeNode;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 部门管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Data
+public class DeptGridDTO  implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门id
+     */
+    private Long id;
+    /**
+     * 上级部门id
+     */
+    private Long pid;
+    /**
+     * 部门名称
+     */
+    private String name;
+
+
+    /**
+     * 上级部门名称
+     */
+    private String parentName;
+    /**
+     * 部门总名称
+     */
+    private String deptName;
+
+
+}

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java

@@ -137,5 +137,10 @@ public class SysAnalysisMenuDTO implements Serializable {
      */
 	private String modelname;
 
+    /**
+     * 绑定菜单id
+     */
+    private Long bindingId;
+
 
 }

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java

@@ -22,4 +22,9 @@ public class UserSysDeptInfoFormDTO implements Serializable {
 	 * 部门类型键值
 	 */
 	private List<String> typeKeyList;
+
+	/**
+	 * 部门名称
+	 */
+	private String deptName;
 }

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserSysDeptInfoResultDTO.java

@@ -57,4 +57,9 @@ public class UserSysDeptInfoResultDTO implements Serializable {
 	 * 网格
 	 */
 	private String grid;
+
+	/**
+	 * 部门类型键值
+	 */
+	private String typeKey;
 }

epdc-cloud-kpi-client/src/main/java/com/elink/esua/epdc/dto/ManualScoreDTO.java

@@ -0,0 +1,158 @@
+/**
+ * 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.elink.esua.epdc.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 手动打分表
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class ManualScoreDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 被打分的部门ID
+     */
+	private Long deptId;
+
+    /**
+     * 考核月度
+     */
+	private Date month;
+
+    /**
+     * 考核年度
+     */
+	private Date year;
+
+    /**
+     * 考核打分类型 0-月，1-年
+     */
+	private String scoreType;
+
+    /**
+     * 打分的部门ID
+     */
+	private Long creatorDeptId;
+
+    /**
+     * 打分的部门名称
+     */
+	private String creatorDeptName;
+
+    /**
+     * 得分
+     */
+	private BigDecimal score;
+
+    /**
+     * 所有父级部门ID
+     */
+	private String parentDeptIds;
+
+    /**
+     * 所有父级部门名称
+     */
+	private String parentDeptNames;
+
+    /**
+     * 完整部门ID
+     */
+	private String allDeptIds;
+
+    /**
+     * 完整部门名称
+     */
+	private String allDeptNames;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 删除标记
+     */
+	private String delFlag;
+
+	//虚拟字段--------------
+
+    /**
+     * 所属机构名称
+     */
+    private String deptName;
+
+    /**
+     * 被打分的机构类型
+     */
+    private String deptType;
+
+    /**
+     * 考核起始日
+     */
+    private Date scoreStartDate;
+
+    /**
+     * 得分 String类型
+     */
+    private String scoreString;
+
+    /**
+     * 考核月度 String类型
+     */
+    private String monthString;
+
+    /**
+     * 得分类型 String类型
+     */
+    private String manualScore;
+}

epdc-cloud-kpi-client/src/main/java/com/elink/esua/epdc/dto/StreetPersionGoalMonthDTO.java

@@ -0,0 +1,124 @@
+/**
+ * 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.elink.esua.epdc.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Data;
+
+
+/**
+ *  街道人员目标表
+ *
+ * @author zhangyong
+ * @since v1.0.0 2020-04-22
+ */
+@Data
+public class StreetPersionGoalMonthDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 街道
+     */
+	private String street;
+
+    /**
+     * 街道ID
+     */
+	private Long streetId;
+
+    /**
+     * 年月
+     */
+	private String monthYear;
+
+    /**
+     * 群众目标数
+     */
+	private Integer residentGoalNum;
+
+    /**
+     * 党员目标数
+     */
+	private Integer partyGoalNum;
+
+    /**
+     * 企业目标数
+     */
+	private Integer companyGoalNum;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 删除标记
+     */
+	private String delFlag;
+
+    // 虚字段
+
+    /**
+     * 街道id集合
+     */
+    private List<Long> streetIdList;
+
+    /**
+     * 本次要增加目标人数 的key，确定要为那个目标增加人数
+     */
+    private String personBasicNumberKey;
+
+    /**
+     * 本次要增加的目标人数
+     */
+    private int goalNumber;
+
+    /**
+     * isDisabled = 1 页面按钮：批量设置 不可使用，0可使用
+     */
+    private String isDisabled;
+}

epdc-cloud-kpi-client/src/main/java/com/elink/esua/epdc/dto/StreetPersonBaseDTO.java

@@ -0,0 +1,96 @@
+/**
+ * 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.elink.esua.epdc.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 街道人员底数表 
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-04-13
+ */
+@Data
+public class StreetPersonBaseDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 街道
+     */
+	private String street;
+
+    /**
+     * 街道ID
+     */
+	private Long streetId;
+
+    /**
+     * 群众底数
+     */
+	private Integer residentBaseNum;
+
+    /**
+     * 党员底数
+     */
+	private Integer partyBaseNum;
+
+    /**
+     * 企业底数
+     */
+	private Integer companyBaseNum;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 删除标记
+     */
+	private String delFlag;
+
+}