添加是否改造列

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZArea.java

@@ -39,6 +39,8 @@ public class ZArea extends BaseEntity {
      * 是否释放
      */
     private String releaseIs;
+    private String source;
+    private String renovationColumn;
     /**
      * 释放人
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZBuilding.java

@@ -39,6 +39,7 @@ public class ZBuilding extends BaseEntity {
      * 备注
      */
     private String remark;
+    private String source;
     /**
      * 删除标识
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZHouse.java

@@ -35,6 +35,7 @@ public class ZHouse extends BaseEntity {
      * 
      */
     private String buildingId;
+    private String source;
     /**
      * 
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZUnit.java

@@ -35,6 +35,7 @@ public class ZUnit extends BaseEntity {
      * 
      */
     private String buildingId;
+    private String source;
     /**
      * 
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZAreaBo.java

@@ -48,6 +48,8 @@ public class ZAreaBo extends BaseEntity {
      */
 //    @NotNull(message = "是否释放不能为空", groups = { AddGroup.class, EditGroup.class })
     private String releaseIs;
+    private String source;
+    private String renovationColumn;
 
     /**
      * 释放人

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZBuildingBo.java

@@ -32,6 +32,7 @@ public class ZBuildingBo extends BaseEntity {
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String areaId;
+    private String source;
 
     /**
      * 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZHouseBo.java

@@ -35,6 +35,7 @@ public class ZHouseBo extends BaseEntity {
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String areaId;
+    private String source;
 
     /**
      *

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZUnitBo.java

@@ -32,6 +32,7 @@ public class ZUnitBo extends BaseEntity {
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String areaId;
+    private String source;
 
     /**
      * 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZAreaVo.java

@@ -44,6 +44,8 @@ public class ZAreaVo implements Serializable {
     @ExcelProperty(value = "是否释放", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "release_status")
     private String releaseIs;
+    private String source;
+    private String renovationColumn;
 
     /**
      * 释放人

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZBuildingVo.java

@@ -26,6 +26,7 @@ public class ZBuildingVo implements Serializable {
      */
     @ExcelProperty(value = "")
     private String id;
+    private String source;
 
     /**
      * 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZHouseVo.java

@@ -30,6 +30,7 @@ public class ZHouseVo implements Serializable {
      *
      */
     private String areaId;
+    private String source;
 
     /**
      *

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZUnitVo.java

@@ -33,6 +33,7 @@ public class ZUnitVo implements Serializable {
     @ExcelProperty(value = "")
     private String areaId;
     private String areaName;
+    private String source;
 
     /**
      * 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZAreaServiceImpl.java

@@ -80,7 +80,6 @@ public class ZAreaServiceImpl implements IZAreaService {
         StringBuilder successMsg = new StringBuilder();
         for (int i = n; i < list.size(); i++) {
             GImportVo vo = list.get(i);
-
             String districtValue = sysDictDataMapper.queryValueTextByKey("district", vo.getDistrict());
             if (StringUtils.isBlank(districtValue)) {
                 throw new ServiceException("" + "第" + (n + 1) + "行行政区填写错误,导入失败!");
@@ -91,12 +90,16 @@ public class ZAreaServiceImpl implements IZAreaService {
                 if (StringUtils.isNotEmpty(vo.getAreaName())) {
                     ZArea area = baseMapper.getByName(vo.getAreaName());
                     ZBuilding building = new ZBuilding();
+                    building.setSource("1");
                     ZUnit unit = new ZUnit();
+                    unit.setSource("1");
                     ZHouse house = new ZHouse();
+                    house.setSource("1");
                     if (ObjectUtils.isEmpty(area)) {
                         area = new ZArea();
                         //小区zDsZ1a2b3c4d%1234!
                         area.setName(vo.getAreaName());
+                        area.setSource("1");
                         area.setCreateBy(operName);
                         area.setCreateTime(new Date());
                         area.setDistrict(districtValue);
@@ -300,6 +303,7 @@ public class ZAreaServiceImpl implements IZAreaService {
         ZArea add = BeanUtil.toBean(bo, ZArea.class);
         validEntityBeforeSave(add);
         add.setReleaseIs("001");
+        add.setSource("0");
         if (!ObjectUtils.isEmpty(baseMapper.getByName(add.getName()))) {
             return false;
         }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZBuildingServiceImpl.java

@@ -95,6 +95,7 @@ public class ZBuildingServiceImpl implements IZBuildingService {
     public Boolean insertByBo(ZBuildingBo bo) {
         ZBuilding add = BeanUtil.toBean(bo, ZBuilding.class);
         validEntityBeforeSave(add);
+        add.setSource("0");
         if (!ObjectUtils.isEmpty(baseMapper.getByName(add.getName(), add.getAreaId()))){
             return false;
         }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZHouseServiceImpl.java

@@ -83,6 +83,7 @@ public class ZHouseServiceImpl implements IZHouseService {
     public Boolean insertByBo(ZHouseBo bo) {
         ZHouse add = BeanUtil.toBean(bo, ZHouse.class);
         validEntityBeforeSave(add);
+        add.setSource("0");
         ZHouse byName = baseMapper.getByName(add.getName(), add.getUnitId());
         if (!ObjectUtils.isEmpty(byName)){
             return false;

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZUnitServiceImpl.java

@@ -84,6 +84,7 @@ public class ZUnitServiceImpl implements IZUnitService {
     public Boolean insertByBo(ZUnitBo bo) {
         ZUnit add = BeanUtil.toBean(bo, ZUnit.class);
         validEntityBeforeSave(add);
+        add.setSource("0");
         if (!ObjectUtils.isEmpty(baseMapper.getByName(add.getName(), add.getBuildingId()))){
             return false;
         }