From d0bc110a563441b3a5013a113ab78e6693718bb9 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 May 2022 13:51:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/IcHouseDTO.java   |   5 +++++
 .../com/epmet/dto/form/IcHouseAddFormDTO.java |   3 +++
 .../dto/result/IcHouseListResultDTO.java      |   2 +-
 .../java/com/epmet/entity/IcHouseEntity.java  |   5 +++++
 .../java/com/epmet/model/HouseInfoModel.java  |   3 +++
 .../epmet/model/ImportHouseInfoListener.java  |  15 ++++++++++++++-
 .../V0.0.18__edit_building_and_house_sort.sql |   3 ++-
 .../main/resources/excel/house_template.xlsx  | Bin 9529 -> 9660 bytes
 .../src/main/resources/mapper/IcHouseDao.xml  |   3 ++-
 9 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
index 2b48157889..1037c31652 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
+++ b/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已删除
      */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java
index b05d70d8aa..4e732deeb2 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java
+++ b/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;
+
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
index 3d12115f05..93b9b9818e 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
+++ b/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;
 
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
index 4861c69271..0d49438a64 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
+++ b/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;
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java
index 740892f4cd..8ced28340f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java
+++ b/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;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
index 31471fb3ed..56a6fc8e5d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
+++ b/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);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.18__edit_building_and_house_sort.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.18__edit_building_and_house_sort.sql
index 60a2b872ce..801f0f0c54 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.18__edit_building_and_house_sort.sql
+++ b/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;
\ No newline at end of file
+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;
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx
index 31d9ea9120972eda2819859009fa0fdc195ddfac..9af88daba071450cde3fa85368d31e86d61e5696 100644
GIT binary patch
delta 4757
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

delta 4640
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
Bp0)r0

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index cb0bbd299d..fee7e0bfcc 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/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'