From 8d1280d484185ec084f97f243c777541f3fe8377 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 23 Jul 2021 12:51:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E5=85=A5?= =?UTF-8?q?=E5=BA=93=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 169 +++++++++--------- .../entity/SarStandUnqualified.java | 3 + 2 files changed, 90 insertions(+), 82 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index e9e145da..73648498 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -24,9 +24,10 @@ import org.springframework.stereotype.Service; import java.util.*; import static com.adc.da.login.util.UserUtils.getUserName; + /** *

- * 服务实现类 + * 服务实现类 *

* * @author szc @@ -49,8 +50,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl idList) { QueryWrapper wrapper = new QueryWrapper<>(); - for (String id:idList){ - wrapper.eq("detailed_list_id",id); + for (String id : idList) { + wrapper.eq("detailed_list_id", id); sarLawsAttrDetailedListDao.delete(wrapper); } sarLawsDetailedListDao.deleteBatchIds(idList); @@ -86,37 +87,39 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if (addDetailedDto.getInforlist().indexOf(",") >= 0){ + if (addDetailedDto.getInforlist().indexOf(",") >= 0) { String[] id = addDetailedDto.getInforlist().split(","); String[] putTime = addDetailedDto.getInforlist1().split(","); String[] zcc = addDetailedDto.getInforlist2().split(","); String[] xcx = addDetailedDto.getInforlist3().split(","); - for (int a =0;a< id.length;a++){ + for (int a = 0; a < id.length; a++) { TimeDto dto = new TimeDto(); dto.setStandId(id[a]); - if ("\"".equals(putTime[a])){ + if ("\"".equals(putTime[a])) { dto.setPutTime(null); - }else { + } else { dto.setPutTime(putTime[a]); } - if ("\"".equals(putTime[a])){ + if ("\"".equals(putTime[a])) { dto.setXcxssrqgj(null); - }else { + } else { dto.setXcxssrqgj(xcx[a]); } - if ("\"".equals(putTime[a])){ + if ("\"".equals(putTime[a])) { dto.setZccssrqgj(null); - }else { + } else { dto.setZccssrqgj(zcc[a]); } timeDto.add(dto); } - }else { + } else { TimeDto dto = new TimeDto(); dto.setStandId(addDetailedDto.getInforlist()); dto.setPutTime(addDetailedDto.getInforlist1()); @@ -125,7 +128,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer page, Integer pageSize, String sortKey, - String countryArea,String projectName, - String detailedList,String detailedListName) { + String countryArea, String projectName, + String detailedList, String detailedListName) { QueryWrapper wrapper = new QueryWrapper<>(); - if ("1".equals(sortKey) ) { - wrapper.like(StringUtils.isNotEmpty(countryArea),"country_area",countryArea). - like(StringUtils.isNotEmpty(detailedListName),"detailed_list_name",detailedListName); - }else if ("2".equals(sortKey)) { - wrapper.like(StringUtils.isNotEmpty(projectName),"project_name",projectName). - like(StringUtils.isNotEmpty(detailedListName),"detailed_list_name",detailedListName); + if ("1".equals(sortKey)) { + wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); + } else if ("2".equals(sortKey)) { + wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName). + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); - }else if ("3".equals(sortKey)){ - wrapper.like(StringUtils.isNotEmpty(detailedList),"detailed_list_state",detailedList). - like(StringUtils.isNotEmpty(detailedListName),"detailed_list_name",detailedListName); + } else if ("3".equals(sortKey)) { + wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list_state", detailedList). + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } - wrapper.eq("sort_key",sortKey); + wrapper.eq("sort_key", sortKey); Page pageRes = new Page<>(page, pageSize); IPage userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper); - if ("1".equals(sortKey)){ - Map map= iDicTypeEOService.getDicTypeListCode(); - List list= userIPage.getRecords(); - List> arr = (List>)map.get("COUNTRY"); - for (SarLawsDetailedList list1:list){ - if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")){ + if ("1".equals(sortKey)) { + Map map = iDicTypeEOService.getDicTypeListCode(); + List list = userIPage.getRecords(); + List> arr = (List>) map.get("COUNTRY"); + for (SarLawsDetailedList list1 : list) { + if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")) { String[] split = list1.getCountryArea().split(","); StringBuilder builder = new StringBuilder(); - for (String s:split){ - for (Map map1:arr) { - if (map1.get("value").equals(s)){ - s=map1.get("label"); - builder.append(s+","); + for (String s : split) { + for (Map map1 : arr) { + if (map1.get("value").equals(s)) { + s = map1.get("label"); + builder.append(s + ","); break; } } } - String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + String completedString = builder.delete(builder.length() - 1, builder.length()).toString(); list1.setCountryArea(completedString); } } @@ -186,85 +189,87 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if (detailedUpDto.getInforlist().indexOf(",") >= 0){ - String[] id = detailedUpDto.getInforlist().split(","); - String[] putTime = detailedUpDto.getInforlist1().split(","); - String[] zcc = detailedUpDto.getInforlist2().split(","); - String[] xcx = detailedUpDto.getInforlist3().split(","); - for (int a =0;a< id.length;a++){ + if (null != detailedUpDto.getInforlist()) { + detailedUpDto.setInforlist(detailedUpDto.getInforlist().substring(1, detailedUpDto.getInforlist().length() - 1)); + List timeDto = new ArrayList<>(); + if (detailedUpDto.getInforlist().indexOf(",") >= 0) { + String[] id = detailedUpDto.getInforlist().split(","); + String[] putTime = detailedUpDto.getInforlist1().split(","); + String[] zcc = detailedUpDto.getInforlist2().split(","); + String[] xcx = detailedUpDto.getInforlist3().split(","); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("\"".equals(putTime[a])) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if ("\"".equals(putTime[a])) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if ("\"".equals(putTime[a])) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + } else { TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if ("\"".equals(putTime[a])){ - dto.setPutTime(null); - }else { - dto.setPutTime(putTime[a]); - } - if ("\"".equals(putTime[a])){ - dto.setXcxssrqgj(null); - }else { - dto.setXcxssrqgj(xcx[a]); - } - if ("\"".equals(putTime[a])){ - dto.setZccssrqgj(null); - }else { - dto.setZccssrqgj(zcc[a]); - } + dto.setStandId(detailedUpDto.getInforlist()); + dto.setPutTime(detailedUpDto.getInforlist1()); + dto.setXcxssrqgj(detailedUpDto.getInforlist2()); + dto.setZccssrqgj(detailedUpDto.getInforlist3()); timeDto.add(dto); } - }else { - TimeDto dto = new TimeDto(); - dto.setStandId(detailedUpDto.getInforlist()); - dto.setPutTime(detailedUpDto.getInforlist1()); - dto.setXcxssrqgj(detailedUpDto.getInforlist2()); - dto.setZccssrqgj(detailedUpDto.getInforlist3()); - timeDto.add(dto); + service.updateDetailedLaws(detailedUpDto.getId(), timeDto); } - service.updateDetailedLaws(detailedUpDto.getId(), timeDto); return "修改成功"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index f45817e6..347f77df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -140,12 +140,15 @@ public class SarStandUnqualified extends BaseEntity { @ApiModelProperty(value = "质量工程师") + @TableField(exist=false) private String qaEngineerName; @ApiModelProperty(value = "认证工程师") + @TableField(exist=false) private String authEngineerName; @ApiModelProperty(value = "责任工程师") + @TableField(exist=false) private String dutyEngineerName;