冲突解决

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java

@@ -18,6 +18,8 @@
 package com.elink.esua.epdc.modules.item.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
 import com.elink.esua.epdc.dto.item.result.*;
 import org.apache.ibatis.annotations.Mapper;
 

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml

@@ -263,7 +263,7 @@
 
     <!--  区域调度-已解决项目列表  -->
     <select id="selectListReportSolvedItemResultDTO"
-            resultType="com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO">
+            resultType="com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO">
         SELECT
         t.ID,
         t.ITEM_CONTENT,