楼栋导出添加 楼长信息，新增修改sort接口

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

@@ -20,6 +20,7 @@ package com.epmet.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -68,7 +69,7 @@ public class IcBuildingDTO implements Serializable {
     /**
      * 排序
      */
-	private Double sort;
+	private BigDecimal sort;
 
     /**
      * 总单元数

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

@@ -20,6 +20,7 @@ package com.epmet.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -108,7 +109,7 @@ public class IcHouseDTO implements Serializable {
     /**
      * 排序
      */
-	private Double sort;
+	private BigDecimal sort;
 
     /**
      * 删除标识 0未删除、1已删除

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

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @Author zxc
@@ -166,5 +167,5 @@ public class ImportGeneralDTO implements Serializable {
     /**
      * 排序
      */
-    private Double sort;
+    private BigDecimal sort;
 }

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

@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/5/5 17:40
+ * @DESC
+ */
+@Data
+public class UpdateSortFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2348273552712227952L;
+    public interface UpdateSortForm{}
+
+    @NotBlank(message = "id不能为空",groups = UpdateSortForm.class)
+    private String id;
+
+    @NotNull(message = "sort不能为空",groups = UpdateSortForm.class)
+    private BigDecimal sort;
+
+    /**
+     * house：房屋，building：楼栋
+     */
+    @NotBlank(message = "type不能为空",groups = UpdateSortForm.class)
+    private String type;
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -294,4 +294,16 @@ public class HouseController implements ResultDataResolver {
         return new Result<List<SubUserHouseListResultDTO>>().ok(houseService.subUserHouseList(formDTO));
     }
 
+    /**
+     * Desc: 根据类型更新排序
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/6 08:50
+     */
+    @PostMapping("update-sort")
+    public Result updateSort(@RequestBody UpdateSortFormDTO formDTO){
+        houseService.updateSort(formDTO);
+        return new Result();
+    }
+
 }

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

@@ -22,6 +22,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * 楼栋信息
  *
@@ -63,7 +65,7 @@ public class IcBuildingEntity extends BaseEpmetEntity {
     /**
      * 排序
      */
-	private Double sort;
+	private BigDecimal sort;
 
     /**
      * 总单元数

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

@@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -106,6 +107,6 @@ public class IcHouseEntity extends BaseEpmetEntity {
 	/**
 	 * 排序
 	 */
-	private Double sort;
+	private BigDecimal sort;
 
 }

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

@@ -124,4 +124,10 @@ public class IcBuildingExcel  extends ExcelVerifyInfo implements Serializable {
     @Excel(name = "户数")
     @NotNull(message = "不能为空")
     private Integer totalHouseNum;
+
+    @Excel(name = "楼长姓名")
+    private String buildingLeaderName;
+
+    @Excel(name = "楼长电话")
+    private String buildingLeaderMobile;
 }

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

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @Author zxc
  * @DateTime 2022/2/15 10:07 上午
@@ -43,7 +45,7 @@ public class BuildingInfoModel {
     private String buildingLeaderMobile;
 
     @ExcelProperty(value = "排序")
-    private Double sort;
+    private BigDecimal sort;
 
     @ExcelIgnore
     private Integer num;

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

@@ -5,6 +5,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
+import java.math.BigDecimal;
+
 /**
  * @Author zxc
  * @DateTime 2022/2/13 1:26 下午
@@ -51,7 +53,7 @@ public class HouseInfoModel {
     private String ownerIdCard;
 
     @ExcelProperty(value = "排序")
-    private Double sort;
+    private BigDecimal sort;
 
     @ExcelIgnore
     private Integer num;

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

@@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -119,9 +120,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             return;
         }
         if (null == data.getSort()){
-            data.setSort(NumConstant.ZERO_DOT_ZERO);
+            data.setSort(NumConstant.ZERO_DECIMAL);
         }else {
-            data.setSort(getDouble(data.getSort()));
+            data.setSort(getBigDecimal(data.getSort()));
         }
         // 应产品要求添加
         if (StringUtils.isNotBlank(dto.getType()) && (!dto.getType().equals("商品房") && !dto.getType().equals("自建房")) && !dto.getType().equals("别墅")){
@@ -143,12 +144,11 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         }
     }
 
-    public Double getDouble(Double d){
+    public BigDecimal getBigDecimal(BigDecimal d){
         if (null == d){
-            return NumConstant.ZERO_DOT_ZERO;
+            return NumConstant.ZERO_DECIMAL;
         }
-        DecimalFormat df = new DecimalFormat("#.##");
-        return Double.parseDouble(df.format(d));
+        return d.setScale(NumConstant.TWO,BigDecimal.ROUND_HALF_UP);
     }
 
     public void finalDispose(){

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.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -174,9 +175,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }
         dto.setHouseType(HouseTypeEnums.getKeyByValue(dto.getHouseType()));
         if (null == data.getSort()){
-            data.setSort(NumConstant.ZERO_DOT_ZERO);
+            data.setSort(NumConstant.ZERO_DECIMAL);
         }else {
-            data.setSort(getDouble(data.getSort()));
+            data.setSort(getBigDecimal(data.getSort()));
         }
         if (StringUtils.isNotBlank(dto.getPurpose()) && (!dto.getPurpose().equals("住宅") &&
                 !dto.getPurpose().equals("商业") &&
@@ -212,12 +213,11 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }
     }
 
-    public Double getDouble(Double d){
+    public BigDecimal getBigDecimal(BigDecimal d){
         if (null == d){
-            return NumConstant.ZERO_DOT_ZERO;
+            return NumConstant.ZERO_DECIMAL;
         }
-        DecimalFormat df = new DecimalFormat("#.##");
-        return Double.parseDouble(df.format(d));
+        return d.setScale(NumConstant.TWO,BigDecimal.ROUND_HALF_UP);
     }
 
     public void disposeErrorMsg(HouseInfoModel data,String msg){

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -85,4 +85,12 @@ public interface HouseService {
      * @Description 【人房】下级人房概览列表
      **/
     List<SubUserHouseListResultDTO> subUserHouseList(HouseChartFormDTO formDTO);
+
+    /**
+     * Desc: 根据类型更新排序
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/6 08:50
+     */
+    void updateSort(UpdateSortFormDTO formDTO);
 }

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

@@ -456,6 +456,24 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         return resultList;
     }
 
+    /**
+     * Desc: 根据类型更新排序
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/6 08:50
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSort(UpdateSortFormDTO formDTO) {
+        if (formDTO.getType().equals(CustomerGridConstant.HOUSE)){
+            IcHouseDTO icHouseDTO = ConvertUtils.sourceToTarget(formDTO, IcHouseDTO.class);
+            icHouseService.update(icHouseDTO);
+        }else if(formDTO.getType().equals(CustomerGridConstant.BUILDING)){
+            IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
+            icBuildingService.update(icBuildingDTO);
+        }
+    }
+
     /**
      * @Author sun
      * @Description 【人房】房屋、居民统计列表数据

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

@@ -122,7 +122,9 @@
         a.TYPE as type,
         b.NEIGHBOR_HOOD_NAME as neighborHoodName,
         c.ORGANIZATION_NAME as agencyName,
-        d.GRID_NAME as gridName
+        d.GRID_NAME as gridName,
+        a.BUILDING_LEADER_NAME AS buildingLeaderName,
+        a.BUILDING_LEADER_MOBILE AS buildingLeaderMobile
         from ic_building a
 
         LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID  and b.DEL_FLAG='0'