diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java index 4069caa89..3b485d25d 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.evaluate.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption; import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO; import com.elink.esua.epdc.modules.evaluate.entity.EvaluateInfoEntity; import org.apache.ibatis.annotations.Mapper; @@ -41,6 +42,7 @@ public interface EvaluateInfoDao extends BaseDao { * @return */ List getInfoPage(Map params); + List getInfoDetail(@Param("id")String id); void deleteEvaluate(@Param("id")String id); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java index d3c2864b7..5e9a0215e 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java @@ -77,6 +77,9 @@ public class EvaluateInfoServiceImpl extends BaseServiceImpl infoPage(Map params) { IPage page = getPage(params); List list = baseDao.getInfoPage(params); + for(EvaluateInfoResultDTO item :list){ + item.setOptionsList(baseDao.getInfoDetail(item.getId())); + } return new PageData<>(list, page.getTotal()); } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml index 41e982f6e..f8554a6cb 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml @@ -32,10 +32,7 @@ - - - - + + + + + + + + update epdc_evaluate_info set DEL_FLAG = '1' where ID = #{id}; update epdc_evaluate_detail set DEL_FLAG = '1' where INFO_ID = #{id};