Browse Source
Conflicts: epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.javamaster
wangxianzhang
3 years ago
31 changed files with 634 additions and 69 deletions
@ -0,0 +1,6 @@ |
|||
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526493468551626753', 'self_org_category', '社区自组织类别', '社区自组织类别：文化队伍、楼委会、老友俱乐部、治安巡逻队、其他', 1, 0, 0, '1', '2022-05-17 17:22:58', '1', '2022-05-17 17:22:58'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526495882432299010', 1526493468551626753, '楼委会', 'lwh', '0', '楼委会', 2, 0, 0, '1', '2022-05-17 17:32:34', '1', '2022-05-17 17:32:34'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526495969778679810', 1526493468551626753, '老友俱乐部', 'lyjlb', '0', '老友俱乐部', 3, 0, 0, '1', '2022-05-17 17:32:55', '1', '2022-05-17 17:32:55'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526496168622243842', 1526493468551626753, '其他', 'other', '0', '其他', 5, 0, 0, '1', '2022-05-17 17:33:42', '1', '2022-05-17 17:33:51'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526495766724034562', 1526493468551626753, '文化队伍', 'whdw', '0', '文化队伍', 1, 0, 0, '1', '2022-05-17 17:32:06', '1', '2022-05-17 17:32:40'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526496054369402882', 1526493468551626753, '治安巡逻队', 'zaxld', '0', '治安巡逻队', 4, 0, 0, '1', '2022-05-17 17:33:15', '1', '2022-05-17 17:33:24'); |
|||
@ -0,0 +1,27 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/17 18:45 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class PartyUnitListFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 8059924463686783668L; |
|||
|
|||
/** |
|||
* 联建单位IDs |
|||
*/ |
|||
private List<String> partyUnitIds; |
|||
|
|||
/** |
|||
* 社区自组织IDs |
|||
*/ |
|||
private List<String> communitySelfIds; |
|||
} |
|||
@ -0,0 +1,27 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/17 18:45 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class PartyUnitListResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 8059924463686783008L; |
|||
|
|||
/** |
|||
* 协办单位ID |
|||
*/ |
|||
private String assistanceUnitId; |
|||
|
|||
/** |
|||
* 协办单位名字 |
|||
*/ |
|||
private String assistanceUnitName; |
|||
} |
|||
@ -0,0 +1,2 @@ |
|||
alter table ic_community_self_organization |
|||
add COLUMN CATEGORY_CODE VARCHAR(32) DEFAULT NULL COMMENT '分类，来源于字典表dictType=self_org_category;'; |
|||
@ -0,0 +1,43 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/17 14:14 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class ProjectManageListFormDTO extends PageFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -3317804468566708838L; |
|||
|
|||
public interface ProjectManageListForm{} |
|||
|
|||
/** |
|||
* 标题 |
|||
*/ |
|||
private String title; |
|||
|
|||
/** |
|||
* 转项目开始日期，eg：20220505 |
|||
*/ |
|||
private String startDate; |
|||
|
|||
/** |
|||
* 转项目结束日期，eg：20220505 |
|||
*/ |
|||
private String endDate; |
|||
|
|||
/** |
|||
* all：全部，closed：已关闭，pending：待处理 |
|||
*/ |
|||
@NotBlank(message = "status不能为空",groups = ProjectManageListForm.class) |
|||
private String status; |
|||
|
|||
private String userId; |
|||
} |
|||
@ -1,7 +1,120 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
|
|||
/** |
|||
* @Description 【迁入管理】列表--接口返参 |
|||
* @Author sun |
|||
*/ |
|||
@Data |
|||
public class IcEventListResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 迁入Id |
|||
*/ |
|||
private String eventId; |
|||
/** |
|||
* 网格ID |
|||
*/ |
|||
private String gridId; |
|||
/** |
|||
* 网格名称 |
|||
*/ |
|||
private String gridName; |
|||
/** |
|||
* 所属小区ID |
|||
*/ |
|||
private String eventContent; |
|||
/** |
|||
* 所属小区名称 |
|||
*/ |
|||
private List<String> imageList; |
|||
/** |
|||
* 所属小区名称 |
|||
*/ |
|||
private List<String> voiceList; |
|||
/** |
|||
* 所属楼宇Id |
|||
*/ |
|||
private String sourceTypeName; |
|||
/** |
|||
* 所属楼宇名称 |
|||
*/ |
|||
private String address; |
|||
/** |
|||
* 单元id |
|||
*/ |
|||
private String name; |
|||
/** |
|||
* 单元名称 |
|||
*/ |
|||
private String mobile; |
|||
/** |
|||
* 所属家庭Id |
|||
*/ |
|||
private String satisfaction; |
|||
/** |
|||
* 所属家庭名称 |
|||
*/ |
|||
private String isResiUser; |
|||
/** |
|||
* 所属家庭Id |
|||
*/ |
|||
private String status; |
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String createdUserId; |
|||
|
|||
/** |
|||
* 迁入时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") |
|||
private Date inTime; |
|||
|
|||
/** |
|||
* 迁入原因 |
|||
*/ |
|||
private String inReason; |
|||
|
|||
/** |
|||
* 来源地区编码 |
|||
*/ |
|||
private String sourceAddressCode; |
|||
/** |
|||
* 来源地区编码全路径 |
|||
*/ |
|||
private String sourceAddressPathCode; |
|||
/** |
|||
* 来源地区地址 |
|||
*/ |
|||
private String sourceAddress; |
|||
|
|||
/** |
|||
* 迁移证号码 |
|||
*/ |
|||
private String moveNumber; |
|||
|
|||
/** |
|||
* 户主姓名 |
|||
*/ |
|||
private String householderName; |
|||
|
|||
/** |
|||
* 与户主关系[字典表] |
|||
*/ |
|||
private String householderRelation; |
|||
|
|||
/** |
|||
* 与户主关系[字典表] |
|||
*/ |
|||
private String householderRelationName; |
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,82 @@ |
|||
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.Date; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/17 14:27 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class ProjectManageListResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 2374701362057175388L; |
|||
|
|||
/** |
|||
* 所顺网格 |
|||
*/ |
|||
private String gridName; |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 项目标题 |
|||
*/ |
|||
private String title; |
|||
|
|||
/** |
|||
* 转项目时间 |
|||
*/ |
|||
private String shiftProjectTime; |
|||
|
|||
/** |
|||
* 项目方案 |
|||
*/ |
|||
private String projectScheme; |
|||
|
|||
/** |
|||
* 内部备注 |
|||
*/ |
|||
private String internalRemark; |
|||
|
|||
/** |
|||
* 滞留天数 |
|||
*/ |
|||
private Integer detentionDays; |
|||
|
|||
/** |
|||
* 状态 |
|||
*/ |
|||
private String status; |
|||
private String statusValue; |
|||
|
|||
/** |
|||
* 处理部门 |
|||
*/ |
|||
private List<String> departmentNameList; |
|||
|
|||
private Date updatedTime; |
|||
private String isHandle; |
|||
|
|||
public ProjectManageListResultDTO() { |
|||
this.gridName = ""; |
|||
this.title = ""; |
|||
this.shiftProjectTime = ""; |
|||
this.projectScheme = ""; |
|||
this.internalRemark = ""; |
|||
this.detentionDays = NumConstant.ZERO; |
|||
this.status = ""; |
|||
this.departmentNameList = new ArrayList<>(); |
|||
this.projectId = ""; |
|||
} |
|||
} |
|||
@ -0,0 +1,6 @@ |
|||
|
|||
|
|||
ALTER TABLE `project_process` ADD COLUMN `ASSISTANCE_UNIT_ID` VARCHAR(32) COMMENT '协办单位ID' AFTER `staff_id`; |
|||
ALTER TABLE `project_process` ADD COLUMN `ASSISTANCE_UNIT_TYPE` VARCHAR(1) COMMENT '协办单位类型，1社区自组织，2联建单位' AFTER `ASSISTANCE_UNIT_ID`; |
|||
ALTER TABLE `project` ADD COLUMN `GRID_ID` VARCHAR(32) DEFAULT'' COMMENT '网格ID' AFTER `AGENCY_ID`; |
|||
|
|||
Loading…
Reference in new issue