流程办结数据

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<ItemEntity> {
      * @Date: 2019/9/12 18:21
      */
     List<ItemPendingHandleDTO> selectListOfPendingHandleItems(Map<String, Object> params);
+
     List<ItemPendingHandleDTO> listEqPc(ItemWorkListFormDTO formDTO);
+
     List<ItemPendingHandleDTO> itemPageList(Map<String, Object> params);
 
     /**
@@ -171,10 +173,12 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @Date: 2019/9/12 18:21
      */
     List<ItemPendingHandleDTO> listOfItemsForPCReject(Map<String, Object> params);
+
     List<ItemPendingHandleDTO> rejectListEqPc(ItemWorkListFormDTO formDTO);
 
     /**
      * 工作端诉求列表
+     *
      * @param formDTO
      * @return
      */
@@ -424,11 +428,11 @@ public interface ItemDao extends BaseDao<ItemEntity> {
     List<ItemAppealPageResultDTO> getItemAppealPage(Map<String, Object> params);
 
     /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
      * @describe: 北尚诉求列表(不满意列表)
      * @author wgf
      * @date 2022/10/10 08:39
      * @params [dto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
      */
     List<ItemAppealPageResultDTO> getItemAppealPageUnsatisfactory(Map<String, Object> params);
 
@@ -458,16 +462,17 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @params [params]
      */
     List<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params);
+
     List<ItemExaminePageResultDTO> 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<ItemEntity> {
 
     /**
      * 类别分析
+     *
      * @param formDTO
      * @return
      */
@@ -501,6 +507,7 @@ public interface ItemDao extends BaseDao<ItemEntity> {
 
     /**
      * 满意度统计
+     *
      * @param formDTO
      * @return
      */
@@ -508,6 +515,7 @@ public interface ItemDao extends BaseDao<ItemEntity> {
 
     /**
      * 满意度趋势-日数据
+     *
      * @param formDTO
      * @return
      */
@@ -515,10 +523,12 @@ public interface ItemDao extends BaseDao<ItemEntity> {
 
     /**
      * 满意度趋势-月数据
+     *
      * @param formDTO
      * @return
      */
     List<EvaluationTotalLineDetailResultDTO> getEvaluationDataListByMonths(ScreenTotalFormDTO formDTO);
+
     List<ItemStatisListPageResultDTO> getItemStatisListPage(Map<String, Object> params);
 
     void updateBatchBySerialNum(@Param("updateList") List<String> updateList);

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<GridPlatformHa
     void delete(String[] ids);
 
     /**
-     *
      * 根据网格化平台项目关系表ID获取历史处理记录
      *
-     * @params [itemGridPlatformId]
      * @return java.util.List<java.lang.String>
+     * @params [itemGridPlatformId]
      * @author liuchuang
      * @since 2019/12/25 19:17
      */
     List<String> 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
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -3736,10 +3736,20 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 }
                 itemHandleProcessDto.setOutHandleAdvice(handleAdvice+"h_s办理人："+item.getHandlePeopleName()+"，联系电话："+item.getHandlePeopleMobile());
 */
-                //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！
+                //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！没有结案申请就取网格化结案状态流程数据
-                ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId());
+                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("区中心");
             item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue());