诉求初验和诉求终验接口

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptPlantformProcessDTO.java

@@ -76,5 +76,5 @@ public class AcceptPlantformProcessDTO implements Serializable {
      * 网格化平台-单位编码
      */
     private Date createDate;
-
+    private String itemId;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemInspectionFormDTO.java

@@ -0,0 +1,102 @@
+package com.elink.esua.epdc.dto.item.form;
+
+import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
+import com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 项目处理提交Form DTO
+ * @Author LC
+ * @Date 2019/9/16 19:01
+ */
+@Data
+public class ItemInspectionFormDTO implements Serializable {
+    private static final long serialVersionUID = -5395350316792859552L;
+
+    /**
+     * 项目ID
+     */
+    @NotBlank(message = "项目ID不能为空")
+    private String id;
+
+    /**
+     * 处理意见（内部）
+     */
+    @Size(min = 1, max = 300, message = "处理意见在500字以内")
+    private String handleAdvice;
+
+    /**
+     * 意见备注
+     */
+    private String handleAdviceRemark;
+
+    /**
+     * 处理意见（外部）
+     */
+    @Size(min = 0, max = 300, message = "处理意见在500字以内")
+    private String outHandleAdvice;
+
+    /**
+     * 处理方式：0 不同意，1 同意
+     */
+    @NotNull(message = "处理结果不能为空")
+    private Integer handleCategory;
+
+    /**
+     * 处理意见图片（内部）
+     */
+    private  List<String>  handleImages;
+
+    /**
+     * 处理意见图片（外部）
+     */
+    private  List<String>  outHandleImages;
+
+    /**
+     * 流转协助部门
+     */
+    private List<ItemCirculationDeptResultDTO> deptResultDTOS;
+
+    /**
+     * 满意度评价部门
+     */
+    private List<ItemEvaluateDeptDTO> evaluateDeptDTOS;
+
+    /**
+     *部门键类型
+     */
+    private String typeKey;
+
+    /**
+     *操作部门ID
+     */
+    @NotNull(message = "操作人部门ID不能为空")
+    private Long handlerDeptId;
+
+    /**
+     * 操作人部门
+     */
+    @NotBlank(message = "操作人部门不能为空")
+    private String handlerDept;
+
+    /**
+     * 所属类别
+     */
+    private String categoryId;
+
+    /**
+     * 办理人姓名
+     */
+    private String handlePeopleName;
+
+    /**
+     * 办理人办公电话
+     */
+    private String handlePeopleMobile;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java

@@ -28,7 +28,7 @@ public enum ItemHandleCategoryEnum {
     HANDLE_I_HANDLE_CHECK_APPLY(1002, "终验申请"), // 终验申请
     HANDLE_I_HANDLE_CHECK_AGREE(1003, "终验同意"), // 终验同意
     HANDLE_I_HANDLE_CHECK_UN_AGREE(1004, "终验不同意"), // 终验不同意
-
+    HANDLE_I_HANDLE_DISAGREE(1005, "初验不同意"), // 初验不同意
     HANDLE_REPORT(15, "社区吹哨");// 之前的上报网格化平台 2022.9.4需求变更
 
     private int value;

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@@ -536,5 +536,35 @@ public class ItemController {
         return new Result();
     }
 
+    /**
+     * 诉求初验结果
+     *
+     * @Param dto
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/10/24 15:19
+     */
+    @PostMapping("earlyInspection")
+    public Result earlyInspection(@RequestBody ItemInspectionFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        itemService.earlyInspection(dto);
+        return new Result();
+    }
+
+    /**
+     * 诉求终验结果
+     *
+     * @Param dto
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/10/24 15:19
+     */
+    @PostMapping("endInspection")
+    public Result endInspection(@RequestBody ItemInspectionFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        itemService.endInspection(dto);
+        return new Result();
+    }
+
 }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/redis/ItemAutoProcessRedis.java

@@ -68,7 +68,7 @@ public class ItemAutoProcessRedis{
                 ITEM_TASK_KEY,
                 itemId,
                 //24小时延时
-                totalMilliSeconds
+                totalMilliSeconds + (24 * 60 * 60 * 1000)
         );
 
         new Date();

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

@@ -723,4 +723,22 @@ public interface ItemService extends BaseService<ItemEntity> {
      */
     void itemClosed(String itemId);
 
+    /**
+     * 诉求初验
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/10/24 9:37
+     */
+    void earlyInspection(ItemInspectionFormDTO formDTO);
+
+    /**
+     * 诉求终验
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/10/24 9:37
+     */
+    void endInspection(ItemInspectionFormDTO formDTO);
+
 }

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

@@ -21,6 +21,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@@ -99,6 +100,7 @@ import com.elink.esua.epdc.modules.item.service.*;
 import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
+import com.elink.esua.epdc.modules.screen.entity.MetaSysDeptEntity;
 import com.elink.esua.epdc.user.dto.UserDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -1822,6 +1824,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return new Result();
     }
 
+
     /**
      * 初始化分类信息
      *
@@ -2440,6 +2443,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) {
             //结案申请
             result.setSJZT(CommonConstants.PARTY_ITEM_ZT_ZERO);
+        } else if (ItemHandleCategoryEnum.HANDLE_I_HANDLE_DISAGREE.getValue() == dto.getHandleCategory()) {
+            //诉求初验不通过，重新上报
+            result.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE);
+            result.setSENDTYPE("BMYCB");
         } else {
             //吹哨
             result.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE);
@@ -2942,14 +2949,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         } else if (ItemGridPlatformHandleStatusEnum.HANDLE_DB.getValue() == dto.getState()) {
             //诉求督办10.20废弃
 //            pushToCityGridService.appealSupervise(dto);
-        } else if (ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue() == dto.getState()) {
-            //初验申请
-            pushToCityGridService.earlyInspectionApply(dto);
-        } else if (ItemGridPlatformHandleStatusEnum.HANDLE_HCSB.getValue() == dto.getState()) {
-            //诉求初验
-            pushToCityGridService.earlyInspection(dto);
-            //诉求终验
-            pushToCityGridService.endInspection(dto);
         } else if (ItemGridPlatformHandleStatusEnum.HANDLE_ZF.getValue() == dto.getState()) {
             // 诉求废弃
             pushToCityGridService.appealScrap(dto);
@@ -4314,16 +4313,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         //3.判断评价结果，未评价的赋值为满意并且结案给网格化平台推送结果；已评价的结果为满意直接结案给网格化推结果，不满意直接给网格化推结果
         ItemHandleProcessDTO processDTO = new ItemHandleProcessDTO();
         if (null == entity.getEvaluationScore() || 0 != entity.getEvaluationScore()) {
-            //3-1.未评价的或评价结果不是不满意的则需要结案
-            QueryWrapper<ItemGridPlatformEntity> wrapper = new QueryWrapper<>();
-            wrapper.eq("reference_id", itemId);
-            wrapper.eq("del_flag", "0");
-            wrapper.orderByDesc(FieldConstant.CREATED_TIME);
-            wrapper.last("limit 1");
-            ItemGridPlatformEntity formEntity = itemGridPlatformDao.selectOne(wrapper);
-            if (null == formEntity) {
-                throw new RenException("获取项目与网格化平台关系数据失败，项目Id->" + itemId);
-            }
             QueryWrapper<ItemHandleProcessEntity> hWrapper = new QueryWrapper<>();
             hWrapper.eq("item_id", itemId);
             hWrapper.eq("state", "1105");
@@ -4343,7 +4332,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
             List<String> imgUrlList = iEntityList.stream().map(ImgEntity::getImgUrl).collect(Collectors.toList());
             AcceptPlantformProcessDTO dto = new AcceptPlantformProcessDTO();
-            dto.setP_recId(formEntity.getTaskid());
+            dto.setItemId(itemId);
             dto.setState("0");
             dto.setHandleAdvice(hEntity.getHandleAdvice());
             dto.setGridPartyid(hEntity.getGridPartyid());
@@ -4371,23 +4360,240 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         pushToCityGridService.caseClosedSentoCity(processDTO.getId());
     }
 
+    /**
+     * 诉求初验
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/10/24 9:37
+     */
+    @Override
+    public void earlyInspection(ItemInspectionFormDTO formDTO) {
+        Long deptId = SecurityUser.getDeptId();
+        CityCenterFromDTO deptDTO = new CityCenterFromDTO();
+        deptDTO.setDeptId(deptId);
+        Result<SysDeptDTO> dept = adminFeignClient.getDept(deptDTO);
+        if (!dept.success() || null == dept.getData()) {
+            throw new RenException("获取部门信息失败，部门ID:" + deptId);
+        }
+        //当前处理层级应该是街道
+        if ("street_party".equals(dept.getData().getTypeKey())) {
+            throw new RenException("当前处理层级不是街道级");
+        }
+        ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity();
+        handleProcessEntity.setHandlerDeptId(formDTO.getHandlerDeptId());
+        handleProcessEntity.setHandlerDept(formDTO.getHandlerDept());
+        handleProcessEntity.setItemId(formDTO.getId());
+        handleProcessEntity.setHandleAdvice(formDTO.getHandleAdvice());
+        handleProcessEntity.setOutHandleAdvice(formDTO.getOutHandleAdvice());
+        handleProcessEntity.setHandleAdviceRemark(formDTO.getHandleAdviceRemark());
+        if (NumConstant.ONE == formDTO.getHandleCategory()) {
+            //同意，进入终验
+            //保存处理节点
+            handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_APPLY.getValue());
+            itemHandleProcessService.insert(handleProcessEntity);
+
+            //上报市平台
+            pushToCityGridService.earlyInspection(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
+        } else {
+            //不同意，上报网格化平台
+            //保存处理节点
+            handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_APPLY.getValue());
+            itemHandleProcessService.insert(handleProcessEntity);
+            //上报
+            ItemHandleSubmitFormDTO dto = ConvertUtils.sourceToTarget(formDTO, ItemHandleSubmitFormDTO.class);
+            dto.setHandlerDeptId(deptId);
+            dto.setHandlerDept(dept.getData().getName());
+            reReport(dto);
+        }
+
+        // 更新项目最后一次处理时间
+        ItemEntity itemEntity = new ItemEntity();
+        itemEntity.setId(formDTO.getId());
+        itemEntity.setLastHandleTime(new Date());
+
+    }
+
+    /**
+     * 诉求终验
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/10/24 9:37
+     */
+    @Override
+    public void endInspection(ItemInspectionFormDTO formDTO) {
+        Long deptId = SecurityUser.getDeptId();
+        CityCenterFromDTO deptDTO = new CityCenterFromDTO();
+        deptDTO.setDeptId(deptId);
+        Result<SysDeptDTO> dept = adminFeignClient.getDept(deptDTO);
+        if (!dept.success() || null == dept.getData()) {
+            throw new RenException("获取部门信息失败，部门ID:" + deptId);
+        }
+        //当前处理层级应该是区
+        if ("district_party".equals(dept.getData().getTypeKey())) {
+            throw new RenException("当前处理层级不是区级");
+        }
+
+        ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity();
+        handleProcessEntity.setHandlerDeptId(formDTO.getHandlerDeptId());
+        handleProcessEntity.setHandlerDept(formDTO.getHandlerDept());
+        handleProcessEntity.setItemId(formDTO.getId());
+        handleProcessEntity.setHandleAdvice(formDTO.getHandleAdvice());
+        handleProcessEntity.setOutHandleAdvice(formDTO.getOutHandleAdvice());
+        handleProcessEntity.setHandleAdviceRemark(formDTO.getHandleAdviceRemark());
+        if (NumConstant.ONE == formDTO.getHandleCategory()) {
+            //同意，结案
+            handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_AGREE.getValue());
+            itemHandleProcessService.insert(handleProcessEntity);
+            //上报市平台
+            pushToCityGridService.endInspection(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
+
+            LambdaQueryWrapper<ItemHandleProcessEntity> hWrapper = new LambdaQueryWrapper<>();
+            hWrapper.eq(ItemHandleProcessEntity::getItemId, formDTO.getId());
+            hWrapper.eq(ItemHandleProcessEntity::getState, ItemGridPlatformHandleStatusEnum.HANDLE_XFPJ.getValue());
+            hWrapper.orderByDesc(ItemHandleProcessEntity::getCreatedTime);
+            hWrapper.last("limit 1");
+            ItemHandleProcessEntity hEntity = itemHandleProcessDao.selectOne(hWrapper);
+            if (null == hEntity) {
+                throw new RenException("获取项目流程节点数据失败，项目Id->" + formDTO.getId());
+            }
+            AcceptPlantformProcessDTO dto = new AcceptPlantformProcessDTO();
+            dto.setItemId(formDTO.getId());
+            dto.setState("0");
+            dto.setHandleAdvice(formDTO.getHandleAdvice());
+            dto.setGridPartyid(hEntity.getGridPartyid());
+            dto.setGridPartyname(hEntity.getGridPartyname());
+            dto.setGridUnitid(hEntity.getGridUnitid());
+            dto.setGridUnitname(hEntity.getGridUnitname());
+            dto.setCantoncode(hEntity.getGridCantoncode());
+            dto.setImages(formDTO.getHandleImages());
+            dto.setCreatedTime(new Date());
+            closedItem(dto);
+        } else {
+            //不同意，返回初验
+            handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_UN_AGREE.getValue());
+            itemHandleProcessService.insert(handleProcessEntity);
+
+        }
+    }
+
+    /**
+     * 重新上报
+     *
+     * @Param dto
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/10/24 15:02
+     */
+    private void reReport(ItemHandleSubmitFormDTO dto) {
+        try {
+            Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId());
+            log.info("处理项目-deptMessage：" + deptMessage);
+            String typeKey;
+            if (0 == deptMessage.getCode()) {
+                typeKey = deptMessage.getData().toString();
+            } else {
+                throw new RenException(deptMessage.getMsg());
+            }
+            dto.setTypeKey(typeKey);
+            ItemEntity entity = baseDao.selectById(dto.getId());
+            // 组装发送消息内容
+            EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
+            informationFormDTO.setUserId(entity.getUserId());
+            informationFormDTO.setContent(dto.getOutHandleAdvice());
+            informationFormDTO.setType(EventsNoticeConstant.NOTICE_TYPE_PROGRESS_NOTICE);
+            informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ITEM);
+            informationFormDTO.setBusinessId(entity.getId());
+            informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_HANDLE);
+            informationFormDTO.setRelBusinessContent("项目：" + entity.getItemContent());
+
+            ItemHandleProcessEntity handleProcessEntity = new ItemHandleProcessEntity();
+            handleProcessEntity.setHandlerDeptId(dto.getHandlerDeptId());
+            handleProcessEntity.setHandlerDept(dto.getHandlerDept());
+            handleProcessEntity.setItemId(dto.getId());
+            handleProcessEntity.setHandleAdvice(dto.getHandleAdvice());
+            handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice());
+            handleProcessEntity.setHandleAdviceRemark(dto.getHandleAdviceRemark());
+            // 当前操作人部门tyeKey
+            String sendTypeKey = "";
+            log.info("处理项目-上报网格化平台（社区吹哨）");
+            handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_REPORT.getValue());
+            informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT);
+            // 记录处理记录
+            itemHandleProcessService.insert(handleProcessEntity);
+
+            //社区吹哨，上报市平台
+            pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
+            log.info("社区吹哨-上报市平台-结束");
+            // 更新项目最后一次处理时间
+            ItemEntity itemEntity = new ItemEntity();
+            itemEntity.setId(dto.getId());
+            itemEntity.setLastHandleTime(new Date());
+
+            itemEntity.setHandlePeopleName(dto.getHandlePeopleName());
+            itemEntity.setHandlePeopleMobile(dto.getHandlePeopleMobile());
+
+            // 业务部门消息处理
+            ItemInformationEntity itemInfoDto = new ItemInformationEntity();
+            itemInfoDto.setType(ItemInformationConstant.INFORMATION_TYPE_ITEM);
+            itemInfoDto.setBusinessType(dto.getHandleCategory());
+            itemInfoDto.setAssociatedBusinessId(dto.getId());
+            itemInfoDto.setAssociatedBusinessContent(entity.getItemContent());
+            itemInfoDto.setHandleDeptId(dto.getHandlerDeptId());
+            itemInfoDto.setHandleDept(dto.getHandlerDept());
+            itemInfoDto.setHandleAdvice(dto.getHandleAdvice());
+            itemInfoDto.setReadFlag(ItemInformationConstant.READ_FLAG_NO);
+            // 回应处理------变更为【响应拟办】【直接办理】
+
+            log.info("处理项目-查询已吹哨部门");
+            //TODO 是否需要 查询已吹哨部门
+            //List<Long> oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandlerDeptId());
+            //// 遍历被吹哨部门插入项目消息表
+            //for (Long itemDeptId : oldDeptIds) {
+            //    // 通知部门Id（被吹哨部门）
+            //    ItemInformationEntity itemInfoEachDto = new ItemInformationEntity();
+            //    BeanUtils.copyProperties(itemInfoDto, itemInfoEachDto);
+            //    itemInfoEachDto.setId(null);
+            //    itemInfoEachDto.setDeptId(itemDeptId.toString());
+            //    itemInformationService.insert(itemInfoEachDto);
+            //}
+            //log.info("处理项目-发送消息");
+            //// 发送消息
+            //newsTask.insertUserInformation(informationFormDTO);
+
+            //项目外部处理意见图片保存
+            if (dto.getOutHandleImages() != null && dto.getOutHandleImages().size() > 0) {
+                imgService.saveImages(dto.getOutHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE);
+            }
+            //项目处理意见图片保存
+            if (dto.getHandleImages() != null && dto.getHandleImages().size() > 0) {
+                imgService.saveImages(dto.getHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE);
+            }
+            //上报到网格化平台
+            sendItemToDsf(dto, handleProcessEntity);
+            //工作端 根据不同的处理方式，进行短信通知
+            this.workProjectHandle(dto);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new Result();
+    }
+
 
     @Transactional(rollbackFor = Exception.class)
     public ItemHandleProcessDTO closedItem(AcceptPlantformProcessDTO formDto) {
         String successFlag = YesOrNoEnum.NO.value();
         String returnMsgBody = "";
-        ItemGridPlatformDTO itemPlat = itemGridPlatformService.getInfoByTaskId(formDto.getP_recId());
-        if (null == itemPlat) {
-            // 保存接口调用日志
-            this.saveInterfaceLog("", InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(),
-                    ApiConstants.acceptItemProcess, successFlag, formDto.getP_recId(), returnMsgBody);
-            logger.error("未查到相关事件信息");
-        }
         // 插入项目处理进度表
         String firstHandleId = "";
         ItemHandleProcessDTO itemHandleProcessDto = new ItemHandleProcessDTO();
         itemHandleProcessDto.setId(UUID.randomUUID().toString().replaceAll("-", ""));
-        itemHandleProcessDto.setItemId(itemPlat.getReferenceId());
+        itemHandleProcessDto.setItemId(formDto.getItemId());
         //组装处理人及部门相关字段
         itemHandleProcessDto.setGridPartyid(formDto.getGridPartyid());
         itemHandleProcessDto.setGridPartyname(formDto.getGridPartyname());
@@ -4404,21 +4610,21 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
         }
         if ("0".equals(formDto.getState())) {
-            ItemEntity item = baseDao.selectById(itemPlat.getReferenceId());
+            ItemEntity item = baseDao.selectById(formDto.getItemId());
             log.info("根据id查询数据");
             itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue());
             //判断最后一条处理进展是吹哨还是结案，结案：取第一条处置意见；吹哨：取平台处置意见
             if ("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag())) {
                 //执法和发展填写网格化平台的意见
                 itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice());
-            } else if (getItemIsCs(itemPlat.getReferenceId())) {
+            } else if (getItemIsCs(formDto.getItemId())) {
                 //吹哨
                 itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice() + "h_s办理人：" + item.getHandlePeopleName() + "，联系电话：" + item.getHandlePeopleMobile());
             } else {
                 //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！没有结案申请就取网格化结案状态流程数据
-                ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId(), ItemGridPlatformHandleStatusEnum.HANDLE_SQ.getValue());
+                ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(formDto.getItemId(), ItemGridPlatformHandleStatusEnum.HANDLE_SQ.getValue());
                 if (firsthandleProcess == null) {
-                    firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId(), ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue());
+                    firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(formDto.getItemId(), ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue());
                     if (firsthandleProcess == null) {
                         itemHandleProcessDto.setOutHandleAdvice("办理人：" + item.getHandlePeopleName() + "，联系电话：" + item.getHandlePeopleMobile());
                     } else {
@@ -4433,10 +4639,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
             itemHandleProcessDto.setGridPartyname("结案");
             itemHandleProcessDto.setGridTaskcnname("区中心");
+            item.setEvaluationState(NumConstant.ZERO_STR);
             item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue());
-            // 可以进行评价了，默认评分-满意
-            item.setEvaluationScore(ItemEvaluationLevel.LEVALUATION_LEVEL_BETTER);
-            item.setEvaluationState(NumConstant.ONE_STR);
             updateById(item);
         }
         itemHandleProcessDto.setHandleAdvice(formDto.getHandleAdvice());
@@ -4463,7 +4667,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         // 保存接口调用日志
         String message = formDto.getP_recId();
         message = message + ":" + formDto;
-        this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(),
+        this.saveInterfaceLog(formDto.getItemId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(),
                 ApiConstants.acceptItemProcess, successFlag, message, returnMsgBody);
         return itemHandleProcessDto;
     }

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

@@ -1145,16 +1145,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
     public void endInspection(ItemHandleProcessDTO processDTO) {
         List<ItemHandleProcessDTO> list = new ArrayList<>();
         if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) {
-            //获取上报核查的节点，取最新一条
+            ItemHandleProcessEntity item = itemHandleProcessDao.selectById(processDTO.getId());
-            LambdaQueryWrapper<ItemHandleProcessEntity> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(ItemHandleProcessEntity::getItemId, processDTO.getItemId());
-            wrapper.eq(ItemHandleProcessEntity::getState, ItemGridPlatformHandleStatusEnum.HANDLE_HCSB.getValue());
-            wrapper.orderByDesc(ItemHandleProcessEntity::getCreatedTime);
-            List<ItemHandleProcessEntity> processList = itemHandleProcessDao.selectList(wrapper);
-            if (CollectionUtils.isEmpty(processList)) {
-                return;
-            }
-            ItemHandleProcessEntity item = processList.get(NumConstant.ZERO);
             String sqId = getSqid(item.getItemId());
             if (StringUtils.isNotBlank(sqId)) {
                 ItemHandleProcessDTO dto = ConvertUtils.sourceToTarget(item, ItemHandleProcessDTO.class);
@@ -1186,12 +1177,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             dto.setCzyj(item.getHandleAdvice());
             //终验人员
             EndInspectionResultDTO.CzrBean czr = new EndInspectionResultDTO.CzrBean();
-            czr.setId(item.getGridPartyid());
+            czr.setId(CY_MEMBER_ID);
-            czr.setXm(item.getGridPartyname());
+            czr.setXm("区中心工作人员");
-            czr.setSsbmbm(item.getGridUnitid());
+            czr.setSsbmbm("370203");
-            czr.setSsbm(item.getGridUnitname());
+            czr.setSsbm("区中心");
-            czr.setSsjgbm(item.getDisCenterZoningCode());
+            czr.setSsjgbm("370203");
-            czr.setSsjg(item.getGridUnitname());
+            czr.setSsjg("区中心");
             dto.setCzr(czr);
             // 组装好直接推送
             String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.END_INSPECTION, "诉求终验");