From 83673394b24ccfbe46cc4fac30a6554527cf8268 Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 5 Aug 2024 17:06:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E6=9F=A5=E5=90=8D=E5=8D=95=E5=8E=BB?= =?UTF-8?q?=E9=87=8D,=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2,?= =?UTF-8?q?=E7=94=A8=E8=B4=A3=E4=BB=BB=E4=BA=BA=E7=94=B5=E8=AF=9D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=B6=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99,=C2=A0?= =?UTF-8?q?=E4=BB=8A=E6=97=A5=E6=8A=BD=E6=9F=A5=E8=B4=A3=E4=BB=BB=E4=BA=BA?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99,=C2=A0?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88=E7=9A=84=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4,=E6=8A=BD=E6=9F=A5?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=AD=E5=8F=AB=E5=BA=94=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=8C=89=E5=8F=AB=E5=BA=94=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97,=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E8=B4=A3=E4=BB=BB=E4=BA=BA?= =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=EF=BC=8C=E9=A6=96?= =?UTF-8?q?=E8=A1=8C=E9=A6=96=E5=88=97=E5=BA=94=E8=AF=A5=E6=98=AF=E2=80=9C?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E2=80=9D=EF=BC=9B=E5=BA=8F=E5=8F=B7=E4=BB=8E?= =?UTF-8?q?1=E5=BC=80=E5=A7=8B=EF=BC=8C=E4=B8=8D=E8=83=BD=E4=BB=8E0?= =?UTF-8?q?=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShAddressBookController.java | 6 +- .../whdc/controller/ShCallsController.java | 5 ++ .../com/whdc/model/entity/ShAddressBook.java | 2 +- .../impl/ShAddressBookServiceImpl.java | 11 ++++ .../resources/mapper/ShAddressBookMapper.xml | 55 +++++++++++++++++-- 5 files changed, 73 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/whdc/controller/ShAddressBookController.java b/src/main/java/com/whdc/controller/ShAddressBookController.java index ee2f2f4..2e032f6 100644 --- a/src/main/java/com/whdc/controller/ShAddressBookController.java +++ b/src/main/java/com/whdc/controller/ShAddressBookController.java @@ -25,6 +25,8 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.Pattern; import java.util.List; import java.util.Objects; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; import static com.whdc.model.MyConstant.DEL; import static com.whdc.model.MyConstant.REC; @@ -246,7 +248,9 @@ public class ShAddressBookController { .orderByAsc(ShAddressBook::getSort); List list = service.list(query); - + AtomicInteger integer = new AtomicInteger(1); + list = list.stream().map(o->o.setSort(integer.getAndIncrement())) + .collect(Collectors.toList()); ExcelCommon.exportExcel(list, null, "山洪责任人通讯录", ShAddressBook.class, "山洪责任人通讯录.xlsx", response); diff --git a/src/main/java/com/whdc/controller/ShCallsController.java b/src/main/java/com/whdc/controller/ShCallsController.java index 14c9049..3c1d736 100644 --- a/src/main/java/com/whdc/controller/ShCallsController.java +++ b/src/main/java/com/whdc/controller/ShCallsController.java @@ -93,6 +93,7 @@ public class ShCallsController { }else{ throw new MyException("山洪通讯录编号不能为空"); } + query.orderByDesc(ShCalls::getCallTime); return ResultJson.ok(query.list()); } @@ -159,6 +160,8 @@ public class ShCallsController { if (Objects.nonNull(callType)){ type = callType.getValue(); } + }else{ + type = "未填写"; } String callType = o.getCallType(); if (StringUtils.isNotBlank(callType)){ @@ -166,6 +169,8 @@ public class ShCallsController { if (Objects.nonNull(callingType)){ callType = callingType.getValue(); } + }else{ + callType = "未填写"; } return DateUtils.dateToStr(o.getCallTime(),ThreadLocal.withInitial(() -> new SimpleDateFormat(DateUtils.DATE_PATTERN_HM))) + " " + type + " " + callType; }).distinct().collect(Collectors.toList()), ",")); diff --git a/src/main/java/com/whdc/model/entity/ShAddressBook.java b/src/main/java/com/whdc/model/entity/ShAddressBook.java index 40a7703..c0f8772 100644 --- a/src/main/java/com/whdc/model/entity/ShAddressBook.java +++ b/src/main/java/com/whdc/model/entity/ShAddressBook.java @@ -133,7 +133,7 @@ public class ShAddressBook implements Serializable { */ @TableField(value = "sort") @Schema(description = "顺序排序") - @Excel(name = "展示顺序", width = 20,orderNum = "0") + @Excel(name = "序号", width = 20,orderNum = "0") private Integer sort; /** diff --git a/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java b/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java index 8e689bc..cb6bba8 100644 --- a/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java @@ -51,6 +51,17 @@ public class ShAddressBookServiceImpl extends ServiceImpl(appends.stream() + .collect(Collectors.toMap(o -> o.getCity() + System.lineSeparator() + + o.getCounty() + System.lineSeparator() + + o.getArea() + System.lineSeparator() + + o.getVillage() + System.lineSeparator() + + o.getName() + System.lineSeparator() + + o.getPhone() + System.lineSeparator() + + o.getType2(), Function.identity(), (o1, o2) -> o1)) + .values()); + // 删除全部数据 String type1Str = null; switch (type1) { diff --git a/src/main/resources/mapper/ShAddressBookMapper.xml b/src/main/resources/mapper/ShAddressBookMapper.xml index 38d0e34..1884f4e 100644 --- a/src/main/resources/mapper/ShAddressBookMapper.xml +++ b/src/main/resources/mapper/ShAddressBookMapper.xml @@ -2,8 +2,8 @@ - + + SELECT + T."ID", + T."CITY", + T."COUNTY", + T."AREA", + T."VILLAGE", + T."TYPE1", + T."TYPE2", + T."NAME", + T."POSITION", + T."PHONE", + T."SORT", + T."LAND", + T."IS_SPOT_CHECK", + IFNULL( T."CALL_STATUS", 0 ) CALL_STATUS + FROM + ( + SELECT + T."CITY", + T."COUNTY", + T."AREA", + T."VILLAGE", + T."NAME", + T."PHONE" + FROM + "FXKH_TXL"."SH_ADDRESS_BOOK" T + WHERE + DEL = 1 + GROUP BY + T."CITY", + T."COUNTY", + T."AREA", + T."VILLAGE", + T."NAME", + T."PHONE" + ) T1 + LEFT JOIN "FXKH_TXL"."SH_ADDRESS_BOOK" T ON T.CITY = T1.CITY + AND T.COUNTY = T1.COUNTY + AND T.AREA = T1.AREA + AND T.VILLAGE = T1.VILLAGE + AND T.NAME = T1.NAME + AND T.PHONE = T1.PHONE + WHERE + 1 = 1 + AND DEL = 1 AND T.TYPE1 = #{dto.type1} @@ -54,7 +101,7 @@ AND T.CALL_STATUS = #{dto.callStatus} - AND T.PHONE CONCAT('%', #{dto.phone}, '%') + AND T.PHONE LIKE CONCAT('%', #{dto.phone}, '%') ORDER BY