diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java index ff85334a8b..b72e68c723 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java +++ b/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; /** * 总单元数 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 1037c31652..f25311b2db 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 @@ -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已删除 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index b0d0257526..7b5bd482dd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/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; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateSortFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/UpdateSortFormDTO.java new file mode 100644 index 0000000000..b34d8a7176 --- /dev/null +++ b/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; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index e1cb16c102..3e625e88c2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/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>().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(); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java index e52936bbd5..1b0535f803 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java +++ b/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; /** * 总单元数 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 0d49438a64..817c783f47 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 @@ -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; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java index ed1afb786a..dbd7f8239b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java +++ b/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; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java index 1b5a6e0678..2339587a1f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java +++ b/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; 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 8ced28340f..0e5edb21f3 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 @@ -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; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index 5764e997e4..b374e0ff9f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/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 subUserHouseList(HouseChartFormDTO formDTO); + + /** + * Desc: 根据类型更新排序 + * @param formDTO + * @author zxc + * @date 2022/5/6 08:50 + */ + void updateSort(UpdateSortFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index cfdfdb10f4..44beeaafe3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/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 【人房】房屋、居民统计列表数据 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 14ebc08038..ac0b1dfdab 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/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'