Browse Source

删除无用的

release
jianjun 3 years ago
parent
commit
2433ffe780
  1. 147
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java
  2. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

147
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java

@ -1,147 +0,0 @@
/**
* 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 cn.afterturn.easypoi.excel.annotation.Excel;
import com.epmet.util.ExcelVerifyInfo;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 房屋信息
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2021-10-27
*/
@Data
public class IcHouseExcel extends ExcelVerifyInfo implements Serializable {
/*@Excel(name = "房屋主键")
private String id;
@Excel(name = "客户id")
private String customerId;
@Excel(name = "小区id")
private String neighborHoodId;
@Excel(name = "片区id,neighbor_hood_part.id,可为空。")
private String partId;
@Excel(name = "所属楼栋id")
private String buildingId;
@Excel(name = "所属单元id")
private String buildingUnitId;
@Excel(name = "房屋名字后台插入时生成")
private String houseName;
@Excel(name = "门牌号")
private String doorName;
@Excel(name = "房屋类型,这里存储字典value就可以")
private String houseType;
@Excel(name = "存储字典value")
private String purpose;
@Excel(name = "1出租;0未出租")
private Integer rentFlag;
@Excel(name = "房主姓名")
private String ownerName;
@Excel(name = "房主电话")
private String ownerPhone;
@Excel(name = "房主身份证号")
private String ownerIdCard;
@Excel(name = "删除标识 0未删除、1已删除")
private String delFlag;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;*/
@Excel(name = "所属组织")
@NotBlank(message = "不能为空")
private String agencyName;
@Excel(name = "所属网格")
@NotBlank(message = "不能为空")
private String gridName;
@Excel(name = "所属小区")
@NotBlank(message = "不能为空")
@Length(max=50,message = "不能超过50个字")
private String neighborHoodName;
@Excel(name = "所属楼栋")
@NotBlank(message = "不能为空")
private String buildingName;
@Excel(name = "单元号")
@NotNull(message = "不能为空")
private Integer buildingUnit;
@Excel(name = "门牌号")
@NotBlank(message = "不能为空")
private String doorName;
@Excel(name = "房屋类型")
@NotBlank(message = "不能为空")
private String houseType;
@Excel(name = "房屋用途")
@NotBlank(message = "不能为空")
private String purpose;
@Excel(name = "出租")
@NotBlank(message = "不能为空")
private String rentFlag;
@Excel(name = "房主姓名")
@NotBlank(message = "不能为空")
private String ownerName;
@Excel(name = "房主电话")
@NotBlank(message = "不能为空")
private String ownerPhone;
@Excel(name = "房主身份证")
@NotBlank(message = "不能为空")
private String ownerIdCard;
}

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@ -31,10 +31,8 @@ import com.epmet.dto.result.HouseInfoDTO;
import com.epmet.dto.result.IcHouseListResultDTO;
import com.epmet.dto.result.ImportTaskCommonResultDTO;
import com.epmet.dto.result.NeighborHoodManageDelResultDTO;
import com.epmet.entity.IcHouseEntity;
import com.epmet.enums.HousePurposeEnums;
import com.epmet.enums.HouseTypeEnums;
import com.epmet.excel.IcHouseExcel;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.GovOrgOpenFeignClient;

Loading…
Cancel
Save