From 4f4e9babc67b8caf3a68528f6c02258eeb29690e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 18 Oct 2022 16:57:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8A=9E=E7=BB=93=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/dao/ItemDao.java | 16 ++++++++++--- .../service/GridPlatformHandleLogService.java | 9 +++---- .../item/service/impl/ItemServiceImpl.java | 24 +++++++++++++------ 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 3c848770a..e944a2eaa 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -159,7 +159,9 @@ public interface ItemDao extends BaseDao { * @Date: 2019/9/12 18:21 */ List selectListOfPendingHandleItems(Map params); + List listEqPc(ItemWorkListFormDTO formDTO); + List itemPageList(Map params); /** @@ -171,10 +173,12 @@ public interface ItemDao extends BaseDao { * @Date: 2019/9/12 18:21 */ List listOfItemsForPCReject(Map params); + List rejectListEqPc(ItemWorkListFormDTO formDTO); /** * 工作端诉求列表 + * * @param formDTO * @return */ @@ -424,11 +428,11 @@ public interface ItemDao extends BaseDao { List getItemAppealPage(Map params); /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @describe: 北尚诉求列表(不满意列表) * @author wgf * @date 2022/10/10 08:39 * @params [dto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> */ List getItemAppealPageUnsatisfactory(Map params); @@ -458,16 +462,17 @@ public interface ItemDao extends BaseDao { * @params [params] */ List getExaminePage(Map params); + List getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO); /** + * @return com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity * @describe: 获取项目的第一个结案申请/吹哨的意见 * @author wangtong * @date 2022/9/8 19:54 * @params [itemId] - * @return com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity */ - ItemHandleProcessEntity selectFirstHandleProcessByItemId(@Param("itemId") String itemId); + ItemHandleProcessEntity selectFirstHandleProcessByItemId(@Param("itemId") String itemId, @Param("state") int state); /** * 获取市平台诉求ID @@ -494,6 +499,7 @@ public interface ItemDao extends BaseDao { /** * 类别分析 + * * @param formDTO * @return */ @@ -501,6 +507,7 @@ public interface ItemDao extends BaseDao { /** * 满意度统计 + * * @param formDTO * @return */ @@ -508,6 +515,7 @@ public interface ItemDao extends BaseDao { /** * 满意度趋势-日数据 + * * @param formDTO * @return */ @@ -515,10 +523,12 @@ public interface ItemDao extends BaseDao { /** * 满意度趋势-月数据 + * * @param formDTO * @return */ List getEvaluationDataListByMonths(ScreenTotalFormDTO formDTO); + List getItemStatisListPage(Map params); void updateBatchBySerialNum(@Param("updateList") List updateList); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java index c84629211..ae2526a26 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/GridPlatformHandleLogService.java @@ -94,33 +94,30 @@ public interface GridPlatformHandleLogService extends BaseService + * @params [itemGridPlatformId] * @author liuchuang * @since 2019/12/25 19:17 */ List listOfHandleProcessLogByItemGridPlatFormId(String itemGridPlatformId); /** - * * 根据网格化平台项目关系表ID清空处理记录 * - * @params [itemGridPlatformId] * @return void + * @params [itemGridPlatformId] * @author liuchuang * @since 2019/12/25 18:56 */ void removeHandleProcessByItemGridPlatFormId(String itemGridPlatformId); /** - * * 获取网格化平台最新处理情况 * - * @params [itemGridPlatformId] * @return com.elink.esua.epdc.dto.item.GridPlatformHandleLogDTO + * @params [itemGridPlatformId] * @author liuchuang * @since 2019/12/27 10:16 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 5c9ad5908..7a5544165 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -3736,9 +3736,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem } itemHandleProcessDto.setOutHandleAdvice(handleAdvice+"h_s办理人："+item.getHandlePeopleName()+"，联系电话："+item.getHandlePeopleMobile()); */ - //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！ - ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId()); - itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice() + "h_s办理人：" + item.getHandlePeopleName() + "，联系电话：" + item.getHandlePeopleMobile()); + //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！没有结案申请就取网格化结案状态流程数据 + ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId(), ItemGridPlatformHandleStatusEnum.HANDLE_SQ.getValue()); + if (firsthandleProcess == null) { + firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId(), ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); + if (firsthandleProcess == null) { + itemHandleProcessDto.setOutHandleAdvice("办理人：" + item.getHandlePeopleName() + "，联系电话：" + item.getHandlePeopleMobile()); + } else { + itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice() + "h_s办理人：" + item.getHandlePeopleName() + "，联系电话：" + item.getHandlePeopleMobile()); + } + } else { + itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice() + "h_s办理人：" + item.getHandlePeopleName() + "，联系电话：" + item.getHandlePeopleMobile()); + } + } itemHandleProcessDto.setGridPartyname("结案"); itemHandleProcessDto.setGridTaskcnname("区中心"); @@ -3910,10 +3920,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem IPage page = getPage(params); //入参集合为空或者集合里时间参数都为空时 if (params.isEmpty() || ( - (!params.containsKey("startTime") || StringUtils.isEmpty(params.get("startTime").toString())) - && (!params.containsKey("endTime") || StringUtils.isEmpty(params.get("endTime").toString())) - && (!params.containsKey("statMonth") || StringUtils.isEmpty(params.get("statMonth").toString())) - && (!params.containsKey("statYear") || StringUtils.isEmpty(params.get("statYear").toString()))) + (!params.containsKey("startTime") || StringUtils.isEmpty(params.get("startTime").toString())) + && (!params.containsKey("endTime") || StringUtils.isEmpty(params.get("endTime").toString())) + && (!params.containsKey("statMonth") || StringUtils.isEmpty(params.get("statMonth").toString())) + && (!params.containsKey("statYear") || StringUtils.isEmpty(params.get("statYear").toString()))) ) { DateTime dateTime = new DateTime(new Date()); Date d = dateTime.plusDays(-1).toDate();