From 95e2316a99b285d6673f8194bda74e7ec10d5349 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 21 Aug 2021 23:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95?= =?UTF-8?q?=E8=A7=84-=E5=81=87=E8=AE=BE=E6=A0=87=E5=87=86A=E7=9A=84?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E9=80=89=E6=8B=A9=E4=B8=AD?= =?UTF-8?q?=E5=9B=BD=EF=BC=8C=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E6=B8=85?= =?UTF-8?q?=E5=8D=95tab=E9=A1=B5=E4=B8=8B=E7=9A=84=E4=B8=AD=E5=9B=BD?= =?UTF-8?q?=E7=9A=84=E6=B8=85=E5=8D=95=E9=87=8C=E8=A6=81=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E6=A0=87=E5=87=86A=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsDetailedListController.java | 17 ++++-- .../service/ISarLawsDetailedListService.java | 4 ++ .../impl/SarLawsDetailedListServiceImpl.java | 61 +++++++++++++++++++ 3 files changed, 77 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index 146af0f1..312e91f6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -6,18 +6,18 @@ import com.adc.da.att.entity.AttFileEO; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; -import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto; -import com.adc.da.slrs.sarLawsDetailedList.entity.FindFileNameDto; -import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; -import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; +import com.adc.da.slrs.sarLawsDetailedList.entity.*; import com.adc.da.slrs.sarLawsDetailedList.service.impl.SarLawsDetailedListServiceImpl; import com.adc.da.util.utils.CollectionUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -157,4 +157,11 @@ public class SarLawsDetailedListController extends BaseController wrapper = new QueryWrapper<>(); + wrapper.select("country_area","id"); + //查询清单中的国家地区和清单id + List sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper); + //2.判断修改的标准的"国家/地区"与清单中的是否一致,一致则添加到清单中,不一致不作处理 + String[] split = countryArea.split(","); //拆分标准中的国家地区 + + + + //遍历清单 对比国家地区 + for (SarLawsDetailedList lawsDetailed : sarLawsDetailedLists) { + if (lawsDetailed.getCountryArea()==null){ + continue; + } + String[] sarLawsCounties = lawsDetailed.getCountryArea().split(",");//拆分清单中的国家地区 + // 对比清单列表中的国家地区,是否一致 + Arrays.sort(split); + Arrays.sort(sarLawsCounties); + if ( Arrays.equals(split,sarLawsCounties)){ + + //一致时插入表并关联detailedListId和standId + ArrayList timeDtos = new ArrayList<>(); + timeDtos.add(timeDto); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("stand_id",timeDto.getStandId()); + + + //如果目标清单中已存标准在则更新 懒得写更新(⓿_⓿) 直接删掉,在重新插入 + if (sarLawsAttrDetailedListDao.selectCount(queryWrapper)>0) { + sarLawsAttrDetailedListDao.delete(queryWrapper); + } + + sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(),timeDtos); + + break; + } + } + + } + + }