diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java index 65976945..5dc28245 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java @@ -17,7 +17,8 @@ import java.util.List; */ public interface WgStandorpolicyInfoDao extends BaseMapper { - List researchDatas(@Param(value = "data") String data); + //仅用来政策或者标准新增验重不是查全部的接口 + List researchDatas(); List researchAllDatas(@Param(value = "type")String type); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 2042e81a..04e3946f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -15,6 +15,7 @@ import com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO; import com.adc.da.slrs.wgNetInfo.service.IWgNetInfoService; import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; import com.adc.da.slrs.wgPayInfo.service.IWgPayInfoService; +import com.adc.da.slrs.wgStandorpolicyInfo.dao.WgStandorpolicyInfoDao; import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; import com.adc.da.slrs.wgStandorpolicyInfo.service.IWgStandorpolicyInfoService; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup; @@ -56,6 +57,8 @@ public class WgWorkGroupServiceImpl extends ServiceImpl wgStandorpolicyInfos= wgStandorpolicyInfoDao.researchDatas(); + Map map=new HashMap<>(); + wgStandorpolicyInfos.forEach(wgStandorpolicyInfo -> { + map.put(wgStandorpolicyInfo.getStandId()+"-"+wgStandorpolicyInfo.getWgId(),wgStandorpolicyInfo); + }); if (null!=wgWorkGroupDTO.getWgStandorpolicyInfos() && wgWorkGroupDTO.getWgStandorpolicyInfos().size()>0){ List wgWorkGroups=new ArrayList<>(); wgWorkGroupDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { @@ -128,9 +136,13 @@ public class WgWorkGroupServiceImpl extends ServiceImpl - select * from wg_standorpolicy_info where wg_standorpolicy_info.wg_id = #{data} + select wg_standorpolicy_info.id , wg_standorpolicy_info.stand_id , wg_work_group.pid as wgId from wg_standorpolicy_info + left join wg_work_group on wg_work_group.id = wg_standorpolicy_info.wg_id