diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java index 47fd7777b4..169fe63da3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java @@ -69,5 +69,10 @@ public class IcExportItemListFormDTO implements Serializable { */ private String optionSourceType; + /** + * 是否支持添加（即多对一，eg：需求列表） + */ + private boolean supportAdd; + } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java index 739d44fc00..fa96252e3b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java @@ -33,7 +33,7 @@ public class OptionResultDTO implements Serializable { */ public void getCurrenNodeAllChild(OptionResultDTO option, Map resultMap) { resultMap.put(option.getValue(), option); - if (CollectionUtils.isNotEmpty(option.getChildren())) { + if (CollectionUtils.isEmpty(option.getChildren())) { return; } option.getChildren().forEach(o -> { diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java index b1a5606c2e..5ddff4ba71 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java @@ -50,7 +50,7 @@ public class EasyPoiExcelExportStylerImpl extends AbstractExcelExportStyler titleStyle.setFont(font); titleStyle.setAlignment(HorizontalAlignment.CENTER); titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); - return null; + return titleStyle; } /** diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java new file mode 100644 index 0000000000..7e577e7c22 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java @@ -0,0 +1,96 @@ +package com.epmet.commons.tools.utils.poi.excel.handler; + +/** + * desc:设置columnWith宽度 + * + * @author: LiuJanJun + * @date: 2022/4/28 5:05 下午 + * @version: 1.0 + */ + +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.util.MapUtils; +import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; +import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.poi.ss.usermodel.Cell; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * Take the width of the longest column as the width. + *

+ * This is not very useful at the moment, for example if you have Numbers it will cause a newline.And the length is not + * exactly the same as the actual length. + * + * @author Jiaju Zhuang + */ +public class ColumnWidthStyleStrategy extends AbstractColumnWidthStyleStrategy { + + private static final int MAX_COLUMN_WIDTH = 255; + /** + * 是否 根据内容设置宽度 + */ + private boolean isSetContentWidth = false; + + private final Map> cache = MapUtils.newHashMapWithExpectedSize(8); + + + + @Override + protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List> cellDataList, Cell cell, + Head head, + Integer relativeRowIndex, Boolean isHead) { + boolean needSetWidth = (isHead || isSetContentWidth) && CollectionUtils.isNotEmpty(cellDataList); + if (!needSetWidth) { + return; + } + Map maxColumnWidthMap = cache.computeIfAbsent(writeSheetHolder.getSheetNo(), k -> new HashMap<>(16)); + Integer columnWidth = dataLength(cellDataList, cell, isHead); + if (columnWidth < 0) { + return; + } + if (columnWidth > MAX_COLUMN_WIDTH) { + columnWidth = MAX_COLUMN_WIDTH; + } + Integer maxColumnWidth = maxColumnWidthMap.get(cell.getColumnIndex()); + if (maxColumnWidth == null || columnWidth > maxColumnWidth) { + maxColumnWidthMap.put(cell.getColumnIndex(), columnWidth); + writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 256); + } + } + + private Integer dataLength(List> cellDataList, Cell cell, Boolean isHead) { + if (isHead) { + return cell.getStringCellValue().getBytes().length+3; + } + WriteCellData cellData = cellDataList.get(0); + CellDataTypeEnum type = cellData.getType(); + if (type == null) { + return -1; + } + switch (type) { + case STRING: + return cellData.getStringValue().getBytes().length; + case BOOLEAN: + return cellData.getBooleanValue().toString().getBytes().length; + case NUMBER: + return cellData.getNumberValue().toString().getBytes().length; + default: + return -1; + } + } + + public ColumnWidthStyleStrategy() { + + } + + public ColumnWidthStyleStrategy(boolean isSetContentWidth) { + this.isSetContentWidth = isSetContentWidth; + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java index bff1f1a999..54f395bbc9 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java @@ -23,7 +23,7 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { /** * 需要合并的列 下标 */ - private int[] mergeColumnIndex; + private int[] mergeColumnIndexArr; /** * 从下标n行开始合并 */ @@ -32,9 +32,9 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { public ExcelFillCellMergeStrategy() { } - public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndex) { + public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndexArr) { this.mergeRowIndex = mergeRowIndex; - this.mergeColumnIndex = mergeColumnIndex; + this.mergeColumnIndexArr = mergeColumnIndexArr; } @Override @@ -56,14 +56,13 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { return; } //如果不指定 合并的列则全部列进行 合并判断 - if (mergeColumnIndex == null) { + if (mergeColumnIndexArr == null) { mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex); } else { //合并指定的列号 - for (int columnIndex : mergeColumnIndex) { + for (int columnIndex : mergeColumnIndexArr) { if (curColIndex == columnIndex) { mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex); - break; } } } 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 2bb91a53ec..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 Integer 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 2b48157889..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; @@ -105,6 +106,11 @@ public class IcHouseDTO implements Serializable { */ private String ownerIdCard; + /** + * 排序 + */ + 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 82f276ebaf..e91bf8e3a3 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 @@ -171,5 +172,5 @@ public class ImportGeneralDTO implements Serializable { /** * 排序 */ - private Integer sort; + private BigDecimal sort; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java index 249a7d4c42..18aa756a8c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java @@ -26,4 +26,9 @@ public class IcBuildingListFormDTO extends PageFormDTO { * 房主电话 */ private String ownerPhone; + + /** + * asc：正序，desc：倒序 + */ + private String sortType; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java index 0039390e15..58655da002 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java @@ -17,6 +17,7 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -24,6 +25,7 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.math.BigDecimal; @Data @@ -85,7 +87,7 @@ public class IcBulidingAddFormDTO implements Serializable { * 排序 */ @NotNull(message = "排序不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) - private Integer sort = 0; + private BigDecimal sort = NumConstant.ZERO_DECIMAL; /** * 总单元数 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..440b2323bb 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 @@ -17,12 +17,14 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.math.BigDecimal; @Data @@ -99,4 +101,6 @@ public class IcHouseAddFormDTO implements Serializable { */ private String ownerIdCard; + private BigDecimal sort = NumConstant.ZERO_DECIMAL; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java index 7fdbf31cc5..b57f0bdadc 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java @@ -65,5 +65,9 @@ public class IcHouseListFormDTO extends PageFormDTO { */ private String keyword; + /** + * asc：正序，desc：倒序 + */ + private String sortType; } 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-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java index 550938c23e..1d95bd3838 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java @@ -29,7 +29,7 @@ public class IcBuildingListResultDTO extends PageFormDTO { private Integer realTotalHouseNum; private String latitude; private String agencyId; - private Integer sort; + private Double sort; private String agencyName; private String buildingId; private String buildingName; 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/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 98b4d54012..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 Integer 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 4861c69271..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; /** @@ -103,4 +104,9 @@ public class IcHouseEntity extends BaseEpmetEntity { */ private String ownerIdCard; + /** + * 排序 + */ + 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 81495c3da6..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 上午 @@ -42,6 +44,9 @@ public class BuildingInfoModel { @ExcelProperty(value = "楼长电话") private String buildingLeaderMobile; + @ExcelProperty(value = "排序") + 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 740892f4cd..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 下午 @@ -50,6 +52,9 @@ public class HouseInfoModel { @ExcelProperty(value = "房主身份证") private String ownerIdCard; + @ExcelProperty(value = "排序") + 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 6fea4df3ff..3b13b608a8 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,8 @@ 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; import java.util.List; @@ -117,6 +119,11 @@ 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/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 4e8ccd0e93..ceab6ed43d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -157,7 +157,10 @@ public class BuildingServiceImpl implements BuildingService { //2.获取组织所在网格 List agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); // agencyIdList.add(customerAgency.getId()); - List customerGridList = customerGridDao.selectList(new QueryWrapper().lambda().in(CustomerGridEntity::getPid, agencyIdList)); + LambdaQueryWrapper gridWrapper = new LambdaQueryWrapper<>(); + gridWrapper.in(CustomerGridEntity::getPid, agencyIdList); + gridWrapper.last("ORDER BY CAST(GRID_NAME AS SIGNED),CONVERT(GRID_NAME using gbk)"); + List customerGridList = customerGridDao.selectList(gridWrapper); if (CollectionUtils.isEmpty(customerGridList)) { return covertToTree(customerAgency, agencyList); @@ -182,7 +185,7 @@ public class BuildingServiceImpl implements BuildingService { List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() .in(IcNeighborHoodEntity::getGridId, gridIdList) - .orderByAsc(IcNeighborHoodEntity::getCreatedTime); + .last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(NEIGHBOR_HOOD_NAME using gbk)"); List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); if (CollectionUtils.isEmpty(icNeighborHoodList)) { agencyList.addAll(gridList); @@ -206,7 +209,7 @@ public class BuildingServiceImpl implements BuildingService { List neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper buildingQueryWrapper = new QueryWrapper().lambda() .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList) - .orderByAsc(IcBuildingEntity::getCreatedTime, IcBuildingEntity::getBuildingName); + .last("ORDER BY SORT, CAST(BUILDING_NAME AS SIGNED),CONVERT(BUILDING_NAME USING gbk)"); List icBuildingList = icBuildingDao.selectList(buildingQueryWrapper); if (CollectionUtils.isEmpty(neighborHoodIdList)) { 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 82df952253..2c2101e5b3 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 @@ -137,6 +137,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { //设置 icHouseDTO.setHouseName(getHouseName(formDTO)); icHouseService.update(icHouseDTO); + //删除房屋缓存 + icHouseRedis.delHouseInfo(formDTO.getHouseId(),customerId); } @Override @@ -455,6 +457,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/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index d0f1bc4832..0696512e41 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -625,7 +625,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl @@ -120,7 +121,11 @@ AND a.DEL_FLAG = '0' - ORDER BY CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk), + ORDER BY + a.sort, + a.sort, + a.sort DESC, + CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk), CAST(a.BUILDING_NAME AS SIGNED),CONVERT(a.BUILDING_NAME USING gbk) @@ -203,7 +209,12 @@ ${groupTableName}.ID - order by ic_resi_user.CREATED_TIME desc + order by IC_RESI_USER.GRID_ID ASC, + IC_RESI_USER.VILLAGE_ID ASC, + IC_RESI_USER.BUILD_ID ASC, + IC_RESI_USER.UNIT_ID ASC, + IC_RESI_USER.HOME_ID ASC, + IC_RESI_USER.ID ASC @@ -800,6 +811,7 @@ AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' ) + ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk) ) t WHERE 1=1 @@ -809,7 +821,7 @@ AND natCount = #{natCount} - ORDER BY `NAME` +