FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_1

Browse Source 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
This commit is contained in:
zzy
2021-07-23 15:16:16 +08:00
parent 06aa79e3f6 dc884c0162
commit 3fb8bfafb9
2 changed files with 65 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+39 -36
View File
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
import static com.adc.da.login.util.UserUtils.getUserName; import static com.adc.da.login.util.UserUtils.getUserName;
/** /**
* <p> * <p>
* 服务实现类 * 服务实现类
@@ -49,8 +50,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
@Override @Override
public String del(List<String> idList) { public String del(List<String> idList) {
QueryWrapper<SarLawsAttrDetailedList> wrapper = new QueryWrapper<>(); QueryWrapper<SarLawsAttrDetailedList> wrapper = new QueryWrapper<>();
for (String id:idList){ for (String id : idList) {
wrapper.eq("detailed_list_id",id); wrapper.eq("detailed_list_id", id);
sarLawsAttrDetailedListDao.delete(wrapper); sarLawsAttrDetailedListDao.delete(wrapper);
} }
sarLawsDetailedListDao.deleteBatchIds(idList); sarLawsDetailedListDao.deleteBatchIds(idList);
@@ -160,41 +161,41 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
@Override @Override
public IPage<SarLawsDetailedList> AllSelectD(Integer page, Integer pageSize, String sortKey, public IPage<SarLawsDetailedList> AllSelectD(Integer page, Integer pageSize, String sortKey,
String countryArea,String projectName, String countryArea, String projectName,
String detailedList,String detailedListName) { String detailedList, String detailedListName) {
QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>(); QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>();
if ("1".equals(sortKey) ) { if ("1".equals(sortKey)) {
wrapper.like(StringUtils.isNotEmpty(countryArea),"country_area",countryArea). wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea).
like(StringUtils.isNotEmpty(detailedListName),"detailed_list_name",detailedListName); like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName);
}else if ("2".equals(sortKey)) { } else if ("2".equals(sortKey)) {
wrapper.like(StringUtils.isNotEmpty(projectName),"project_name",projectName). wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName).
like(StringUtils.isNotEmpty(detailedListName),"detailed_list_name",detailedListName); like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName);
}else if ("3".equals(sortKey)){ } else if ("3".equals(sortKey)) {
wrapper.like(StringUtils.isNotEmpty(detailedList),"detailed_list_state",detailedList). wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list_state", detailedList).
like(StringUtils.isNotEmpty(detailedListName),"detailed_list_name",detailedListName); like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName);
} }
wrapper.eq("sort_key",sortKey); wrapper.eq("sort_key", sortKey);
Page<SarLawsDetailedList> pageRes = new Page<>(page, pageSize); Page<SarLawsDetailedList> pageRes = new Page<>(page, pageSize);
IPage<SarLawsDetailedList> userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper); IPage<SarLawsDetailedList> userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper);
if ("1".equals(sortKey)){ if ("1".equals(sortKey)) {
Map<String,Object> map= iDicTypeEOService.getDicTypeListCode(); Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
List<SarLawsDetailedList> list= userIPage.getRecords(); List<SarLawsDetailedList> list = userIPage.getRecords();
List<Map<String, String>> arr = (List<Map<String, String>>)map.get("COUNTRY"); List<Map<String, String>> arr = (List<Map<String, String>>) map.get("COUNTRY");
for (SarLawsDetailedList list1:list){ for (SarLawsDetailedList list1 : list) {
if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")){ if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")) {
String[] split = list1.getCountryArea().split(","); String[] split = list1.getCountryArea().split(",");
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (String s:split){ for (String s : split) {
for (Map<String,String> map1:arr) { for (Map<String, String> map1 : arr) {
if (map1.get("value").equals(s)){ if (map1.get("value").equals(s)) {
s=map1.get("label"); s = map1.get("label");
builder.append(s+","); builder.append(s + ",");
break; break;
} }
} }
} }
String completedString = builder.delete(builder.length()-1,builder.length()).toString(); String completedString = builder.delete(builder.length() - 1, builder.length()).toString();
list1.setCountryArea(completedString); list1.setCountryArea(completedString);
} }
} }
@@ -253,34 +254,35 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
else list.setFileIds(detailedUpDto.getFileIds()); else list.setFileIds(detailedUpDto.getFileIds());
sarLawsDetailedListDao.updateById(list); sarLawsDetailedListDao.updateById(list);
detailedUpDto.setInforlist(detailedUpDto.getInforlist().substring(1,detailedUpDto.getInforlist().length()-1)); if (null != detailedUpDto.getInforlist()) {
detailedUpDto.setInforlist(detailedUpDto.getInforlist().substring(1, detailedUpDto.getInforlist().length() - 1));
List<TimeDto> timeDto = new ArrayList<>(); List<TimeDto> timeDto = new ArrayList<>();
if (detailedUpDto.getInforlist().indexOf(",") >= 0){ if (detailedUpDto.getInforlist().indexOf(",") >= 0) {
String[] id = detailedUpDto.getInforlist().split(","); String[] id = detailedUpDto.getInforlist().split(",");
String[] putTime = detailedUpDto.getInforlist1().split(","); String[] putTime = detailedUpDto.getInforlist1().split(",");
String[] zcc = detailedUpDto.getInforlist2().split(","); String[] zcc = detailedUpDto.getInforlist2().split(",");
String[] xcx = detailedUpDto.getInforlist3().split(","); String[] xcx = detailedUpDto.getInforlist3().split(",");
for (int a =0;a< id.length;a++){ for (int a = 0; a < id.length; a++) {
TimeDto dto = new TimeDto(); TimeDto dto = new TimeDto();
dto.setStandId(id[a]); dto.setStandId(id[a]);
if ("\"".equals(putTime[a])){ if ("\"".equals(putTime[a])) {
dto.setPutTime(null); dto.setPutTime(null);
}else { } else {
dto.setPutTime(putTime[a]); dto.setPutTime(putTime[a]);
} }
if ("\"".equals(putTime[a])){ if ("\"".equals(putTime[a])) {
dto.setXcxssrqgj(null); dto.setXcxssrqgj(null);
}else { } else {
dto.setXcxssrqgj(xcx[a]); dto.setXcxssrqgj(xcx[a]);
} }
if ("\"".equals(putTime[a])){ if ("\"".equals(putTime[a])) {
dto.setZccssrqgj(null); dto.setZccssrqgj(null);
}else { } else {
dto.setZccssrqgj(zcc[a]); dto.setZccssrqgj(zcc[a]);
} }
timeDto.add(dto); timeDto.add(dto);
} }
}else { } else {
TimeDto dto = new TimeDto(); TimeDto dto = new TimeDto();
dto.setStandId(detailedUpDto.getInforlist()); dto.setStandId(detailedUpDto.getInforlist());
dto.setPutTime(detailedUpDto.getInforlist1()); dto.setPutTime(detailedUpDto.getInforlist1());
@@ -289,6 +291,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
timeDto.add(dto); timeDto.add(dto);
} }
service.updateDetailedLaws(detailedUpDto.getId(), timeDto); service.updateDetailedLaws(detailedUpDto.getId(), timeDto);
}
return "修改成功"; return "修改成功";
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
+3
View File
@@ -140,12 +140,15 @@ public class SarStandUnqualified extends BaseEntity {
@ApiModelProperty(value = "质量工程师") @ApiModelProperty(value = "质量工程师")
@TableField(exist=false)
private String qaEngineerName; private String qaEngineerName;
@ApiModelProperty(value = "认证工程师") @ApiModelProperty(value = "认证工程师")
@TableField(exist=false)
private String authEngineerName; private String authEngineerName;
@ApiModelProperty(value = "责任工程师") @ApiModelProperty(value = "责任工程师")
@TableField(exist=false)
private String dutyEngineerName; private String dutyEngineerName;