From cfeab4c16fe43b4bebd31358d40c775de8a92a47 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 9 Sep 2022 02:14:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E7=BB=93?= =?UTF-8?q?=E6=A1=88\=E5=90=B9=E5=93=A8=E8=AF=9D=E6=9C=AF=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/item/dao/ItemHandleProcessDao.java | 9 +++++++++ .../item/service/impl/ItemServiceImpl.java | 16 ++++++++++++++-- .../src/main/resources/mapper/item/ItemDao.xml | 4 ++-- .../mapper/item/ItemHandleProcessDao.xml | 10 ++++++++++ 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java index 805da2e6e..452d7f23f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO; import com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 项目处理流程表 项目处理流程表 @@ -53,4 +54,12 @@ public interface ItemHandleProcessDao extends BaseDao { */ void updateDeptNameByDeptId(String newDeptName, Long deptId); + /** + * @describe: 查询项目的最后一次吹哨记录 + * @author wangtong + * @date 2022/9/9 2:10 + * @params [itemId] + * @return com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity + */ + ItemHandleProcessEntity selectByItemIdBestNew(@Param("itemId") String itemId); } 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 79fcf4461..9000fe995 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 @@ -2768,12 +2768,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem if("0".equals(formDto.getState())){ ItemEntity item = baseDao.selectById(itemPlat.getReferenceId()); itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); - ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId()); - if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag()) || 0 == firsthandleProcess.getState()){ + //判断最后一条处理进展是吹哨还是结案，结案：取第一条处置意见；吹哨：取最后一条处置意见 + if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag()) || getItemIsCs(itemPlat.getReferenceId())){ //执法和发展填写网格化平台的意见 itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()); }else{ //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！ + ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId()); itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice()+" 办理人："+item.getHandlePeopleName()+"，办理电话："+item.getHandlePeopleMobile()); } item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue()); @@ -2803,6 +2804,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().ok("操作成功"); } + /** + * @describe: 判断项目最后的提交网格化是不是吹哨 + * @author wangtong + * @date 2022/9/9 2:08 + * @params [itemId] + * @return boolean + */ + private boolean getItemIsCs(String itemId) { + ItemHandleProcessEntity process = itemHandleProcessDao.selectByItemIdBestNew(itemId); + return process != null; + } /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index e510ae92c..d3201315f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -1595,9 +1595,9 @@ SELECT * FROM epdc_item_handle_process WHERE DEL_FLAG='0' - AND STATE IN (0,11) + AND STATE IN 11 AND ITEM_ID=#{itemId} - ORDER BY CREATED_TIME DESC + ORDER BY CREATED_TIME ASC LIMIT 1 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml index ecb04e306..06aa286fc 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml @@ -10,4 +10,14 @@ UPDATE epdc_item_handle_process SET HANDLER_DEPT = #{newDeptName}, UPDATED_TIME = NOW() WHERE HANDLER_DEPT_ID = #{deptId} +