新新向党bug

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

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.dto.events.form.XxxdFeedBackQuestionFormDTO;
 import com.elink.esua.epdc.dto.events.result.XxxdFeedBackResultDTO;
 import com.elink.esua.epdc.dto.item.form.SubmitItemFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
+import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum;
 import com.elink.esua.epdc.modules.events.dao.XxxdEventDao;
 import com.elink.esua.epdc.modules.events.entity.XxxdEventEntity;
 import com.elink.esua.epdc.modules.events.service.XxxdEventService;
@@ -269,7 +270,12 @@ public class XxxdEventServiceImpl extends BaseServiceImpl<XxxdEventDao, XxxdEven
                 if(CollectionUtils.isEmpty(processList)){
                     throw new RenException("epdc_item_handle_process处理进展为空");
                 }
-                ItemHandleProgressResultDTO latestProcess=processList.get(NumConstant.ZERO);
+                // 从下放评价信息里面出反馈信息
+                final ItemHandleProgressResultDTO[] latestProcessTemp = {null};
+                processList.forEach(item-> { if(item.getState() == ItemGridPlatformHandleStatusEnum.HANDLE_XFPJ.getValue()){
+                    latestProcessTemp[0] = item;
+                } });
+                ItemHandleProgressResultDTO latestProcess = latestProcessTemp[0];
                 String processResult = latestProcess.getAdvice();
                 String processTime = latestProcess.getCreatedTime();
                 // 向新新向党反馈数据结果：status:0-未处理，1-已处理，5-不予处理

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

@@ -6,15 +6,14 @@
     <!-- 查询未反馈，在北上速办这，已经关闭或者结案的数据，推送给新新向党   -->
     <select id="selectNoFeedBackData" parameterType="map" resultType="com.elink.esua.epdc.modules.events.entity.XxxdEventEntity">
         SELECT
-            xe.*
+        xe.*
         FROM
-            xxxd_event xe
+        xxxd_event xe
-        LEFT JOIN epdc_item ei
+        LEFT JOIN epdc_item_handle_process ei ON xe.BSSB_EVENT_ID = ei.ITEM_ID
         WHERE
-            xe.DEL_FLAG = '0'
+        xe.DEL_FLAG = '0'
-            AND xe.INTERNAL_STATUS != '2'
+        AND xe.INTERNAL_STATUS != '2'
-            AND xe.BSSB_EVENT_ID = ei.ID
+        AND ei.STATE = 1105
-            and ei.ITEM_STATE !='0'
             <if test="null != questionId and '' != questionId">
                 and xe.QUESTION_ID = #{questionId}
             </if>
@@ -24,6 +23,7 @@
             <if test="null != endDateStr and '' != endDateStr">
                 AND DATE_FORMAT(xe.CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDateStr}
             </if>
+            GROUP BY xe.id
             order by xe.CREATED_TIME asc
         LIMIT #{pageIndex}, #{pageSize}
     </select>