房屋排序

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java

@@ -105,6 +105,11 @@ public class IcHouseDTO implements Serializable {
      */
 	private String ownerIdCard;
 
+    /**
+     * 排序
+     */
+	private Double sort;
+
     /**
      * 删除标识 0未删除、1已删除
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java

@@ -99,4 +99,7 @@ public class IcHouseAddFormDTO implements Serializable {
      */
     private String ownerIdCard;
 
+    @NotNull(message = "排序不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
+    private Double sort;
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java

@@ -79,7 +79,7 @@ public class IcHouseListResultDTO implements Serializable {
      */
     private String ownerIdCard;
 
-
+    private Double sort;
 
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java

@@ -103,4 +103,9 @@ public class IcHouseEntity extends BaseEpmetEntity {
      */
 	private String ownerIdCard;
 
+	/**
+	 * 排序
+	 */
+	private Double sort;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java

@@ -50,6 +50,9 @@ public class HouseInfoModel {
     @ExcelProperty(value = "房主身份证")
     private String ownerIdCard;
 
+    @ExcelProperty(value = "排序")
+    private Double sort;
+
     @ExcelIgnore
     private Integer num;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -172,7 +173,11 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             }
         }
         dto.setHouseType(HouseTypeEnums.getKeyByValue(dto.getHouseType()));
-
+        if (null == data.getSort()){
+            data.setSort(NumConstant.ZERO_DOT_ZERO);
+        }else {
+            data.setSort(getDouble(data.getSort()));
+        }
         if (StringUtils.isNotBlank(dto.getPurpose()) && (!dto.getPurpose().equals("住宅") &&
                 !dto.getPurpose().equals("商业") &&
                 !dto.getPurpose().equals("办公") &&
@@ -207,6 +212,14 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }
     }
 
+    public Double getDouble(Double d){
+        if (null == d){
+            return NumConstant.ZERO_DOT_ZERO;
+        }
+        DecimalFormat df = new DecimalFormat("#.##");
+        return Double.parseDouble(df.format(d));
+    }
+
     public void disposeErrorMsg(HouseInfoModel data,String msg){
         HouseErrorInfoModel err = ConvertUtils.sourceToTarget(data, HouseErrorInfoModel.class);
         err.setErrorMsg(msg);

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.18__edit_building_and_house_sort.sql

@@ -1,2 +1,3 @@
 ALTER TABLE ic_building DROP SORT;
-alter table ic_building add COLUMN SORT DECIMAL(6,2) comment '排序' DEFAULT 0.00 AFTER BUILDING_LEADER_NAME;
+alter table ic_building add COLUMN SORT DECIMAL(6,2) comment '排序' DEFAULT 0.00 AFTER BUILDING_LEADER_NAME;
+alter table ic_house add COLUMN SORT DECIMAL(6,2) comment '排序' DEFAULT 0.00 AFTER OWNER_ID_CARD;

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -106,7 +106,8 @@
         c.AGENCY_ID as agencyId,
         ag.ORGANIZATION_NAME agencyName,
         c.GRID_ID as gridId,
-        gr.GRID_NAME
+        gr.GRID_NAME,
+        a.sort
         from ic_house a
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'