Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 896a3cc0f925815d096ba4b93c07a0e6bce662f4
+Subproject commit 8f098d15559c1f17a9c507eac39475620b667ac2

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkAdminController.java

@@ -0,0 +1,40 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+import com.elink.esua.epdc.service.WorkAdminService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 工作端，用户登录，用户管理相关接口
+ *
+ * @author work@yujt.net.cn
+ * @date 2019/11/18 10:45
+ */
+@RestController
+@RequestMapping("work/admin")
+public class ApiWorkAdminController {
+
+    @Autowired
+    private WorkAdminService workAdminService;
+
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType 数据字典类型
+     * @return com.elink.esua.commons.tools.utils.Result<java.util.List < com.elink.esua.dto.SysSimpleDictDTO>>
+     * @author yujintao
+     * @date 2019/7/15 09:33
+     */
+    @GetMapping("listSimple/{dictType}")
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@PathVariable("dictType") String dictType) {
+        //字典分类数据
+        return workAdminService.listSimpleDictInfo(dictType);
+    }
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java

@@ -169,4 +169,16 @@ public class ApiWorkItemController {
     public Result<ItemAppealDetailResultDTO> getLawItemDetail(@PathVariable String id) {
         return workItemService.getLawItemDetail(id);
     }
+
+    /**
+    * @describe: 工作端-执法诉求-满意度评价
+    * @author wangtong
+    * @date 2022/9/13 16:41
+    * @params [evaluationFormDTO]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("zfEvaluation")
+    public Result zfEvaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) {
+        return workItemService.zfEvaluation(evaluationFormDTO);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkAdminService.java

@@ -0,0 +1,25 @@
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+
+import java.util.List;
+
+/**
+ * 工作端，系统功能实现接口
+ *
+ * @author work@yujt.net.cn
+ * @date 2019/11/18 10:48
+ */
+public interface WorkAdminService {
+
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType 数据字典类型
+     * @return com.elink.esua.commons.tools.utils.Result<java.util.List < com.elink.esua.dto.SysSimpleDictDTO>>
+     * @author yujintao
+     * @date 2019/7/15 09:33
+     */
+    Result<List<SysSimpleDictDTO>> listSimpleDictInfo(String dictType);
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java

@@ -124,4 +124,13 @@ public interface WorkItemService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
      */
     Result<ItemAppealDetailResultDTO> getLawItemDetail(String id);
+
+    /**
+     * @describe: 工作端-执法诉求-满意度评价
+     * @author wangtong
+     * @date 2022/9/13 16:41
+     * @params [evaluationFormDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result zfEvaluation(EvaluationFormDTO evaluationFormDTO);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkAdminServiceImpl.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.service.impl;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.service.WorkAdminService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 工作端，系统功能实现
+ *
+ * @author work@yujt.net.cn
+ * @date 2019/11/18 10:49
+ */
+@Service
+public class WorkAdminServiceImpl implements WorkAdminService {
+
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
+    @Override
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(String dictType) {
+        return adminFeignClient.listSimpleDictInfo(dictType);
+    }
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java

@@ -7,6 +7,8 @@ import com.elink.esua.epdc.dto.EventDeptFormDTO;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
+import com.elink.esua.epdc.feign.ItemFeignClient;
+import com.elink.esua.epdc.feign.PointsFeignClient;
 import com.elink.esua.epdc.feign.WorkItemFeignClient;
 import com.elink.esua.epdc.service.WorkItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +27,12 @@ public class WorkItemServiceImpl implements WorkItemService {
     @Autowired
     private WorkItemFeignClient workItemFeignClient;
 
+    @Autowired
+    private ItemFeignClient itemFeignClient;
+
+    @Autowired
+    private PointsFeignClient pointFeignClient;
+
     /**
      * 项目统计
      * @Params: [formDto]
@@ -103,4 +111,16 @@ public class WorkItemServiceImpl implements WorkItemService {
         return workItemFeignClient.getLawItemDetail(id);
     }
 
+    @Override
+    public Result zfEvaluation(EvaluationFormDTO evaluationFormDTO) {
+        UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RuntimeException("获取用户信息失败");
+        }
+        evaluationFormDTO.setUserId("zfsq"+user.getId().toString());
+        evaluationFormDTO.setUserName(user.getUsername());
+        evaluationFormDTO.setDeptId(user.getDeptId());
+        return itemFeignClient.evaluation(evaluationFormDTO);
+    }
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java

@@ -150,4 +150,10 @@ public class ItemDetailResultDTO implements Serializable {
      * 满意度评价内容
      */
     private String evaluationContent;
+
+    /**
+     * 流水号
+     */
+    private String serialNum;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java

@@ -90,6 +90,12 @@ public class ItemResultDTO implements Serializable {
      * 是否是诉求上报:0否1是
      */
     private String isPeople;
+
+    /**
+     * 流水号
+     */
+    private String serialNum;
+
     /**
      * 最新进展
      */

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

@@ -93,7 +93,11 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
 
 	@Override
 	public List<CategoryDTO> list(Map<String, Object> params) {
-		List<CategoryEntity> entityList = baseDao.getList(params);
+        if (!params.containsKey("infoCode")) {
+            params.put("infoCode", "0");
+        }
+
+        List<CategoryEntity> entityList = baseDao.getList(params);
 
 		List<CategoryDTO> dtoList = ConvertUtils.sourceToTarget(entityList, CategoryDTO.class);
 

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

@@ -67,6 +67,7 @@ import com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity;
 import com.elink.esua.epdc.modules.item.service.ItemDeptService;
 import com.elink.esua.epdc.modules.item.service.ItemHandleProcessService;
 import com.elink.esua.epdc.modules.item.service.ItemService;
+import com.elink.esua.epdc.modules.item.service.impl.ItemServiceImpl;
 import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
 import org.apache.commons.lang3.StringUtils;
@@ -91,6 +92,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Autowired
     private ItemService itemService;
 
+    @Autowired
+    private ItemServiceImpl itemServiceImpl;
+
     @Autowired
     private ItemHandleProcessService itemHandleProcessService;
 
@@ -459,6 +463,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         itemEntity.setTopicId(issueEntity.getTopicId());
         itemEntity.setLastHandleTime(new Date());
         itemEntity.setItemCode("PT" + System.currentTimeMillis());
+        //默认设置为民生诉求
+        itemEntity.setIsPeople("1");//诉求上报
+        itemEntity.setPeopleFlag("0");//民生诉求
+        itemEntity.setSerialNum(itemServiceImpl.getSerialNum("MS"));
         return itemEntity;
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemGridPlatformEntity.java

@@ -18,7 +18,6 @@
 package com.elink.esua.epdc.modules.item.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -58,4 +57,9 @@ public class ItemGridPlatformEntity extends BaseEpdcEntity {
      */
 	private Integer status;
 
+	/**
+	 * 驳回上报时间
+	 */
+	private Date rejectDoTime;
+
 }

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

@@ -67,6 +67,7 @@ import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdItemDto;
 import com.elink.esua.epdc.gird.shibei.dto.form.*;
 import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessHisResultDto;
 import com.elink.esua.epdc.gird.shibei.dto.result.EventProcessResultDto;
+import com.elink.esua.epdc.gird.shibei.dto.result.EventRejectDoResultDto;
 import com.elink.esua.epdc.gird.shibei.dto.result.SendEventResultDto;
 import com.elink.esua.epdc.gird.shibei.util.XstreamUtil;
 import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask;
@@ -399,7 +400,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemEntity.setIsPeople("1");//诉求上报
         itemEntity.setPeopleFlag("2");//执法诉求
         // 流水号
-        itemEntity.setSerialNum(getSerialNum("zf"));
+        itemEntity.setSerialNum(getSerialNum("ZF"));
         baseDao.insert(itemEntity);
         //插入项目部门关联表
         itemDeptService.savePeopleSubmitInfo(itemEntity);
@@ -1394,6 +1395,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return false;
     }
 
+    private ItemGridPlatformEntity getReport(String id) {
+        QueryWrapper<ItemGridPlatformEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("REFERENCE_ID", id);
+        ItemGridPlatformEntity gridEntity = itemGridPlatformDao.selectOne(wrapper);
+        return gridEntity;
+    }
+
     /**
      * 项目流转校验
      *
@@ -1640,6 +1648,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return sendResult;
     }
 
+
     /**
      * 保存接口调用日志
      *
@@ -1827,16 +1836,39 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         List<String> handleImagesList = new ArrayList<>();
         log.info("处理项目-获取进度开始");
         List<EventHandleListFormDto> handleList = getHandleList(itemEntity.getId(),handleImagesList);
+        log.info("事件进度图片："+handleImagesList);
         log.info("处理项目-获取进度结束");
         sendDto.setHandleList(handleList);
         //图片
         List<String> images = getImageFileNew(itemEntity.getEventId() == null?itemEntity.getId():itemEntity.getEventId(),handleImagesList);//事件图片+处理流程图片
+        log.info("图片组装结束："+images);
         //时间处理进度图片
         sendDto.setIMAGES(images);
         log.info("处理项目-返回组装数据");
         return sendDto;
     }
 
+    /**
+    * @describe: 组装驳回重办数据
+    * @author wangtong
+    * @date 2022/9/13 13:47
+    * @params [itemEntity]
+    * @return com.elink.esua.epdc.gird.shibei.dto.form.EventRejectReDoFormDto
+    */
+    private EventRejectReDoFormDto packeageSendRejectReInfo(ItemEntity itemEntity) throws Exception {
+        EventRejectReDoFormDto result = new EventRejectReDoFormDto();
+        //事件处理进度
+        List<String> handleImagesList = new ArrayList<>();
+        List<EventHandleListFormDto> handleList = getHandleList(itemEntity.getId(),handleImagesList);
+        log.info("事件进度图片："+handleImagesList);
+        result.setHandleList(handleList);
+        //图片
+        List<String> images = getImageFileNew(itemEntity.getEventId() == null?itemEntity.getId():itemEntity.getEventId(),handleImagesList);//事件图片+处理流程图片
+        //时间处理进度图片
+        result.setIMAGES(images);
+        return result;
+    }
+
     private String getItemLawNote(String itemId) {
         QueryWrapper<ItemLawEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("item_id", itemId);
@@ -1973,9 +2005,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
             //替换了诉求上传接口，现在无需压缩
 //            List<String> imgUrlList = this.getUploadDTOListNew(handleImagesList);
-            return handleImagesList;
         }
-        return null;
+        return handleImagesList;
     }
 
     // 组装事件图片
@@ -2091,6 +2122,29 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         gridPlatformHandleLogService.insert(logEntity);
     }
 
+    /**
+    * @describe: 保存项目驳回上报信息
+    * @author wangtong
+    * @date 2022/9/13 10:52
+    * @params [gridEntity, handleProcessEntity]
+    * @return void
+    */
+    private void saveItemRejectReDoInfo(ItemGridPlatformEntity gridEntity, ItemHandleProcessEntity handleProcessEntity) {
+        UserDetail user = SecurityUser.getUser();
+        gridEntity.setRejectDoTime(new Date());
+        itemGridPlatformService.updateById(gridEntity);
+
+        GridPlatformHandleLogEntity logEntity = new GridPlatformHandleLogEntity();
+        logEntity.setItemGridPlatformId(gridEntity.getId());
+        logEntity.setStatus(handleProcessEntity.getState());
+        logEntity.setItemHandleProcessId(handleProcessEntity.getItemId());
+        logEntity.setHandler(null == user?handleProcessEntity.getHandlerDept():user.getRealName());
+        logEntity.setHandlingOpinions(handleProcessEntity.getHandleAdvice());
+        logEntity.setHandlingDept(handleProcessEntity.getHandlerDept());
+        logEntity.setHandlingTime(handleProcessEntity.getCreatedTime());
+        gridPlatformHandleLogService.insert(logEntity);
+    }
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -2169,7 +2223,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         try {
             for (EventProcessResultDto dto :
                     progressList) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Date insertTime = sdf.parse(dto.getCREATEDATE());
                 // 拉取的记录增加30秒，防止出现排序问题
                 insertTime.setTime(insertTime.getTime() + 55000);
@@ -2500,9 +2554,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         entity.setItemCode("PT" + System.currentTimeMillis());//项目编号
         entity.setIsPeople("1");//诉求上报
         if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) {
-            entity.setSerialNum(getSerialNum("ms"));
+            entity.setSerialNum(getSerialNum("MS"));
         } else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) {
-            entity.setSerialNum(getSerialNum("fz"));
+            entity.setSerialNum(getSerialNum("FZ"));
         }
         baseDao.insert(entity);
         //插入项目部门关联表
@@ -2665,8 +2719,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             result.setLawDetail(ConvertUtils.sourceToTarget(itemLaw, ItemAppealLawDetailResultDTO.class));
         }
         // 满意度评价部门
-//        List<ItemEvaluateDeptDTO> evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(resultDTO.getId(), deptId);
-//        resultDTO.setEvaluateDeptDTOS(evaluateDeptDTOS);
+//        List<ItemEvaluateDeptDTO> evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(result.getId(), deptId);
+//        result.setEvaluateDeptDTOS(evaluateDeptDTOS);
         return new Result<ItemAppealDetailResultDTO>().ok(result);
     }
 
@@ -2736,22 +2790,57 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      */
     @Transactional(rollbackFor = Exception.class)
     public void sendItemToDsf(ItemHandleSubmitFormDTO dto,ItemHandleProcessEntity process){
-        boolean reportFlag = this.checkReport(dto.getId());
-        if (reportFlag) {
-            throw new RenException("当前项目已上报网格化平台");
-        }
-        SendEventResultDto sendResult = null;
-        try {
-            sendResult = this.reportCaseNew(dto);
-        } catch (Exception e) {
-            throw new RenException("上报网格化平台接口失败" + sendResult.getMessage());
+        ItemGridPlatformEntity gridEntity = this.getReport(dto.getId());
+        if (null != gridEntity) {
+            //驳回重办
+            EventRejectDoResultDto reDoResult = null;
+            try {
+                reDoResult = this.eventsRejectDo(dto,gridEntity.getTaskid());
+            } catch (Exception e) {
+                throw new RenException("上报驳回重办失败" + reDoResult.getMessage());
+            }
+            if (null == reDoResult || !("0").equals(reDoResult.getCode())) {
+                // 接口没有返回信息，也没有异常信息
+                throw new RenException("上报驳回重办失败" + reDoResult.getMessage());
+            }
+            //记录平台上报信息
+            this.saveItemRejectReDoInfo(gridEntity,process);
+        } else {
+            //事件第一次上报
+            SendEventResultDto sendResult = null;
+            try {
+                sendResult = this.reportCaseNew(dto);
+            } catch (Exception e) {
+                throw new RenException("上报网格化平台接口失败" + sendResult.getMessage());
+            }
+            if (null == sendResult || !("0").equals(sendResult.getCode())) {
+                // 接口没有返回信息，也没有异常信息
+                throw new RenException("上报网格化平台接口失败" + sendResult.getMessage());
+            }
+            // 记录平台上报信息
+            this.saveItemGridPlatformInfo(sendResult, process);
         }
-        if (null == sendResult || !("0").equals(sendResult.getCode())) {
-            // 接口没有返回信息，也没有异常信息
-            throw new RenException("上报网格化平台接口失败" + sendResult.getMessage());
+    }
+
+    private EventRejectDoResultDto eventsRejectDo(ItemHandleSubmitFormDTO dto,String recid) throws Exception {
+        ItemEntity entity = baseDao.selectById(dto.getId());
+        // 组装上报信息（图片和处理流程）
+        EventRejectReDoFormDto rejectReDoDTO = packeageSendRejectReInfo(entity);
+        rejectReDoDTO.setRECID(recid);
+        // 接口请求返回实体，getCode 1失败 0成功（非空）
+        log.info("处理项目-进入上报驳回重办-发送");
+        EventRejectDoResultDto sendResult = shiBeiCityGridApi.sendReDoEvent(rejectReDoDTO);
+        log.info("处理项目-进入上报驳回重办-结束："+sendResult);
+        // 保存接口调用日志
+        String successFlag = YesOrNoEnum.NO.value();
+        if (NumConstant.ZERO_STR.equals(sendResult.getCode())) {
+            successFlag = YesOrNoEnum.YES.value();
         }
-        // 记录平台上报信息
-        this.saveItemGridPlatformInfo(sendResult, process);
+        this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REJECT_RE_DO.getValue(),
+                ApiConstants.sendEventUrl, successFlag, XstreamUtil.objectToXml(rejectReDoDTO),
+                XstreamUtil.objectToXml(sendResult));
+        log.info("处理项目-进入上报驳回重办-存储日志结束");
+        return sendResult;
     }
 
     /**
@@ -2762,7 +2851,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @author zhy
      * @date 2022/9/5 18:17
      */
-    private String getSerialNum(String prefix) {
+    public String getSerialNum(String prefix) {
         String serialNum = prefix;
         String dateStr = DateUtils.format(new Date(), DateUtils.DATE_TIME_HOUR);
         serialNum = serialNum + dateStr;
@@ -2802,10 +2891,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if("0".equals(formDto.getState())){
             ItemEntity item = baseDao.selectById(itemPlat.getReferenceId());
             itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue());
-            //判断最后一条处理进展是吹哨还是结案，结案：取第一条处置意见；吹哨：取最后一条处置意见
-            if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag()) || getItemIsCs(itemPlat.getReferenceId())){
+            //判断最后一条处理进展是吹哨还是结案，结案：取第一条处置意见；吹哨：取平台处置意见
+            if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag())){
                 //执法和发展填写网格化平台的意见
                 itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice());
+            }else if(getItemIsCs(itemPlat.getReferenceId())){
+                //吹哨
+                itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()+"h_s办理人："+item.getHandlePeopleName()+"，联系电话："+item.getHandlePeopleMobile());
             }else{
                 //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！
                 ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId());
@@ -2850,7 +2942,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return 0 == process.getState()?true:15 == process.getState();
     }
 
-
     /**
      * 领域类别处理
      *

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -22,6 +22,7 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="statementNum" column="statementNum"/>
         <result property="address" column="ISSUE_ADDRESS"/>
+        <result property="serialNum" column="SERIAL_NUM"/>
         <result property="isPeople" column="IS_PEOPLE"/>
         <result property="peopleFlag" column="PEOPLE_FLAG"/>
         <result property="latestProgress.progressName" column="stateName"/>
@@ -373,6 +374,7 @@
         <result property="statementNum" column="statementNum"/>
         <result property="categoryCode" column="CATEGORY_CODE"/>
         <result property="firstCategoryCode" column="FIRST_CATEGORY_CODE"/>
+        <result property="serialNum" column="SERIAL_NUM"/>
         <result property="isOperational" column="isOperational"/>
         <result property="isSatisfactionEvaluation" column="isSatisfactionEvaluation"/>
         <result property="isShowSatisfactionEvaluation" column="isShowSatisfactionEvaluation"/>
@@ -389,13 +391,14 @@
               (ua.attitude_flag = 1) userDislike,
             </if>
             item.ID,
-            item.EVALUATION_SCORE,
+            item.SERIAL_NUM,
+            ifnull(item.EVALUATION_SCORE,2) as EVALUATION_SCORE,
             item.EVALUATION_CONTENT,
             item.EVENT_ID,
             item.ISSUE_ID,
             item.ITEM_CONTENT,
             IFNULL(item.item_voice,iii.IMG_URL) as VOICE,
-            IFNULL(item.DURATION,iii.DURATION) as DURATION,
+            IF(item.DURATION=0,iii.DURATION,item.DURATION) as DURATION,
             item.ITEM_STATE,
             item.CREATED_TIME,
             item.IS_PARTY_MEMBER,
@@ -1358,6 +1361,7 @@
         eve.APPROVE_NUM,
         eve.OPPOSE_NUM,
         eve.COMMENT_NUM,
+        item.SERIAL_NUM,
         ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum,
         cate.CATEGORY_NAME,
         img.IMG_URL,
@@ -1520,7 +1524,7 @@
             item.ITEM_VOICE,
             item.DURATION,
             item.CONTACT_NAME,
-            EVALUATION_SCORE,
+            ifnull(EVALUATION_SCORE,2) as EVALUATION_SCORE,
             case EVALUATION_SCORE
                 when '0' then '不满意'
                 when '1' then '基本满意'
@@ -1539,8 +1543,6 @@
 
     </select>
     <select id="getLawItemList" resultType="com.elink.esua.epdc.dto.item.result.ItemResultDTO">
-
-
         SELECT
         item.ID,
         item.EVENT_ID,
@@ -1550,6 +1552,7 @@
         item.USER_FACE,
         item.IS_PARTY_MEMBER,
         item.CREATED_TIME,
+        item.SERIAL_NUM,
         cate.CATEGORY_NAME,
         img.IMG_URL,
         hp.CREATED_TIME AS handleTime,

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml

@@ -16,6 +16,7 @@
         from epdc_item_handle_process
         where DEL_FLAG='0'
                     and item_id=#{itemId}
+                    and HANDLER_DEPT !='网格化平台'
         order by CREATED_TIME desc
         limit 1
     </select>