增加反馈记录表、详情增加是否已反馈的返参

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

@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.item;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 项目评价反馈记录表
+ *
+ */
+@Data
+public class ItemCommentFeedbackDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 项目ID  epdc_item.id
+     */
+    private String referenceId;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 反馈内容
+     */
+    private String content;
+
+    /**
+     * 删除标记
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -221,6 +221,17 @@ public class ItemDetailForPCEndResultDTO implements Serializable {
      */
     private String handleAdviceRemark;
 
-
+    /**
+     * 项目状态 0-处理中，5-已关闭，10-已结案
+     */
+    private String itemState;
+    /**
+     * 满意度评价得分(0-不满意，1-基本满意，2-非常满意)
+     */
+    private String evaluationScore;
+    /**
+     * 是否已经反馈过 0否 1是
+     */
+    private String isFeedback = "0";
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemCommentFeedbackDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.item.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.item.entity.ItemCommentFeedbackEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 项目评价反馈记录表
+ *
+ */
+@Mapper
+public interface ItemCommentFeedbackDao extends BaseDao<ItemCommentFeedbackEntity> {
+
+
+
+}

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

@@ -0,0 +1,51 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+/**
+ * 项目评价反馈记录表
+ *
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_item_comment_feedback")
+public class ItemCommentFeedbackEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目ID  epdc_item.id
+     */
+	private String referenceId;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+	/**
+	 * 反馈内容
+	 */
+	private String content;
+
+}

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

@@ -0,0 +1,30 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.item.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.modules.item.entity.ItemCommentFeedbackEntity;
+
+/**
+ * 项目评价反馈记录表
+ *
+ */
+public interface ItemCommentFeedbackService extends BaseService<ItemCommentFeedbackEntity> {
+
+
+}

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

@@ -0,0 +1,34 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.item.service.impl;
+
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.modules.item.dao.ItemCommentFeedbackDao;
+import com.elink.esua.epdc.modules.item.entity.ItemCommentFeedbackEntity;
+import com.elink.esua.epdc.modules.item.service.ItemCommentFeedbackService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目评价反馈记录表
+ *
+ */
+@Service
+public class ItemCommentFeedbackServiceImpl extends BaseServiceImpl<ItemCommentFeedbackDao, ItemCommentFeedbackEntity> implements ItemCommentFeedbackService {
+
+
+}

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

@@ -215,6 +215,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     private ItemEnterpriseDao itemEnterpriseDao;
     @Autowired
     private PushToCityGridService pushToCityGridService;
+    @Autowired
+    private ItemCommentFeedbackDao itemCommentFeedbackDao;
 
     @Override
     public PageData<ItemDTO> page(Map<String, Object> params) {
@@ -933,7 +935,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         List<IssueProgressResultDTO> issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId());
         resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS);
 
-
+        //如果是不满意待处理列表的详情增加一个返参【项目未结案切评价结果为不满意的】
+        if ("0".equals(resultDTO.getItemState()) && StringUtils.isNotBlank(resultDTO.getEvaluationScore()) && "0".equals(resultDTO.getEvaluationScore())) {
+            QueryWrapper<ItemCommentFeedbackEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq("reference_id", resultDTO.getId());
+            wrapper.eq("del_flag", "0");
+            List<ItemCommentFeedbackEntity> entityList = itemCommentFeedbackDao.selectList(wrapper);
+            if (!entityList.isEmpty()) {
+                resultDTO.setIsFeedback("1");
+            }
+        }
         return resultDTO;
     }
 

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.item.dao.ItemCommentFeedbackDao">
+
+
+</mapper>

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

@@ -1064,6 +1064,8 @@
             item.category_code,
             item.first_category_code,
             item.CATEGORY_FULL_CODE,
+            item.ITEM_STATE,
+            item.EVALUATION_SCORE,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
             eve.COMMENT_NUM,