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

标准清单入库 bug修复

Browse Source
This commit is contained in:
yuezhihang
2021-07-23 12:51:27 +08:00
parent 03723a1522
commit 8d1280d484
2 changed files with 90 additions and 82 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
+87 -82
View File
@@ -24,9 +24,10 @@ 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>
* 服务实现类 * 服务实现类
* </p> * </p>
* *
* @author szc * @author szc
@@ -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);
@@ -86,37 +87,39 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
default: default:
break; break;
} }
if ("admin".equals(getUserName()))sarLawsDetailedList.setUpdatePeople("管理员"); if ("admin".equals(getUserName())) sarLawsDetailedList.setUpdatePeople("管理员");
else {sarLawsDetailedList.setUpdatePeople(getUserName());} else {
sarLawsDetailedList.setUpdatePeople(getUserName());
}
sarLawsDetailedListDao.insert(sarLawsDetailedList); sarLawsDetailedListDao.insert(sarLawsDetailedList);
addDetailedDto.setInforlist(addDetailedDto.getInforlist().substring(1,addDetailedDto.getInforlist().length()-1)); addDetailedDto.setInforlist(addDetailedDto.getInforlist().substring(1, addDetailedDto.getInforlist().length() - 1));
List<TimeDto> timeDto = new ArrayList<>(); List<TimeDto> timeDto = new ArrayList<>();
if (addDetailedDto.getInforlist().indexOf(",") >= 0){ if (addDetailedDto.getInforlist().indexOf(",") >= 0) {
String[] id = addDetailedDto.getInforlist().split(","); String[] id = addDetailedDto.getInforlist().split(",");
String[] putTime = addDetailedDto.getInforlist1().split(","); String[] putTime = addDetailedDto.getInforlist1().split(",");
String[] zcc = addDetailedDto.getInforlist2().split(","); String[] zcc = addDetailedDto.getInforlist2().split(",");
String[] xcx = addDetailedDto.getInforlist3().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(); 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(addDetailedDto.getInforlist()); dto.setStandId(addDetailedDto.getInforlist());
dto.setPutTime(addDetailedDto.getInforlist1()); dto.setPutTime(addDetailedDto.getInforlist1());
@@ -125,7 +128,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
timeDto.add(dto); timeDto.add(dto);
} }
service.insertDetailedList(sarLawsDetailedList.getId(),timeDto); service.insertDetailedList(sarLawsDetailedList.getId(), timeDto);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@@ -136,41 +139,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);
} }
} }
@@ -186,85 +189,87 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
SarLawsDetailedList list = sarLawsDetailedListDao.selectById(detailedUpDto.getId()); SarLawsDetailedList list = sarLawsDetailedListDao.selectById(detailedUpDto.getId());
//国家或地区 //国家或地区
if (StringUtils.isBlank(detailedUpDto.getCountryArea())) list.setCountryArea(null); if (StringUtils.isBlank(detailedUpDto.getCountryArea())) list.setCountryArea(null);
else if ("null".equals(detailedUpDto.getCountryArea())); else if ("null".equals(detailedUpDto.getCountryArea())) ;
else list.setCountryArea(detailedUpDto.getCountryArea()); else list.setCountryArea(detailedUpDto.getCountryArea());
//项目名称 //项目名称
if (StringUtils.isBlank(detailedUpDto.getProjectName())) list.setProjectName(null); if (StringUtils.isBlank(detailedUpDto.getProjectName())) list.setProjectName(null);
else if ("null".equals(detailedUpDto.getProjectName())); else if ("null".equals(detailedUpDto.getProjectName())) ;
else list.setProjectName(detailedUpDto.getProjectName()); else list.setProjectName(detailedUpDto.getProjectName());
//清单类别 //清单类别
if (StringUtils.isBlank(detailedUpDto.getDetailedList())) list.setDetailedList(null); if (StringUtils.isBlank(detailedUpDto.getDetailedList())) list.setDetailedList(null);
else if ("null".equals(detailedUpDto.getDetailedList())); else if ("null".equals(detailedUpDto.getDetailedList())) ;
else list.setDetailedList(detailedUpDto.getDetailedList()); else list.setDetailedList(detailedUpDto.getDetailedList());
//清单名称 //清单名称
if (StringUtils.isBlank(detailedUpDto.getDetailedListName())) list.setDetailedListName(null); if (StringUtils.isBlank(detailedUpDto.getDetailedListName())) list.setDetailedListName(null);
else if ("null".equals(detailedUpDto.getDetailedListName())); else if ("null".equals(detailedUpDto.getDetailedListName())) ;
else list.setDetailedListName(detailedUpDto.getDetailedListName()); else list.setDetailedListName(detailedUpDto.getDetailedListName());
//适用领域 //适用领域
if (StringUtils.isBlank(detailedUpDto.getApplicationScope())) list.setApplicationScope(null); if (StringUtils.isBlank(detailedUpDto.getApplicationScope())) list.setApplicationScope(null);
else if ("null".equals(detailedUpDto.getApplicationScope())); else if ("null".equals(detailedUpDto.getApplicationScope())) ;
else list.setApplicationScope(detailedUpDto.getApplicationScope()); else list.setApplicationScope(detailedUpDto.getApplicationScope());
//清单详情 //清单详情
if (StringUtils.isBlank(detailedUpDto.getRemark())) list.setRemark(null); if (StringUtils.isBlank(detailedUpDto.getRemark())) list.setRemark(null);
else if ("null".equals(detailedUpDto.getRemark())); else if ("null".equals(detailedUpDto.getRemark())) ;
list.setRemark(detailedUpDto.getRemark()); list.setRemark(detailedUpDto.getRemark());
//版本号 //版本号
if (StringUtils.isBlank(detailedUpDto.getDetailedListVision())) list.setDetailedListVision(null); if (StringUtils.isBlank(detailedUpDto.getDetailedListVision())) list.setDetailedListVision(null);
else if ("null".equals(detailedUpDto.getDetailedListVision())); else if ("null".equals(detailedUpDto.getDetailedListVision())) ;
list.setDetailedListVision(detailedUpDto.getDetailedListVision()); list.setDetailedListVision(detailedUpDto.getDetailedListVision());
//更新时间 //更新时间
list.setUpdateTime(new Date()); list.setUpdateTime(new Date());
//更新人 //更新人
if (StringUtils.isBlank(detailedUpDto.getReNewPeople())) list.setUpdatePeople(null); if (StringUtils.isBlank(detailedUpDto.getReNewPeople())) list.setUpdatePeople(null);
else if ("null".equals(detailedUpDto.getReNewPeople())); else if ("null".equals(detailedUpDto.getReNewPeople())) ;
else list.setUpdatePeople(detailedUpDto.getReNewPeople()); else list.setUpdatePeople(detailedUpDto.getReNewPeople());
//更新人 //更新人
if (StringUtils.isBlank(detailedUpDto.getDetailedListState())) list.setDetailedListState(null); if (StringUtils.isBlank(detailedUpDto.getDetailedListState())) list.setDetailedListState(null);
else if ("null".equals(detailedUpDto.getDetailedListState())); else if ("null".equals(detailedUpDto.getDetailedListState())) ;
else list.setDetailedListState(detailedUpDto.getDetailedListState()); else list.setDetailedListState(detailedUpDto.getDetailedListState());
//文件 //文件
if (StringUtils.isBlank(detailedUpDto.getFileIds())) list.setFileIds(null); if (StringUtils.isBlank(detailedUpDto.getFileIds())) list.setFileIds(null);
else if ("null".equals(detailedUpDto.getFileIds())); else if ("null".equals(detailedUpDto.getFileIds())) ;
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()) {
List<TimeDto> timeDto = new ArrayList<>(); detailedUpDto.setInforlist(detailedUpDto.getInforlist().substring(1, detailedUpDto.getInforlist().length() - 1));
if (detailedUpDto.getInforlist().indexOf(",") >= 0){ List<TimeDto> timeDto = new ArrayList<>();
String[] id = detailedUpDto.getInforlist().split(","); if (detailedUpDto.getInforlist().indexOf(",") >= 0) {
String[] putTime = detailedUpDto.getInforlist1().split(","); String[] id = detailedUpDto.getInforlist().split(",");
String[] zcc = detailedUpDto.getInforlist2().split(","); String[] putTime = detailedUpDto.getInforlist1().split(",");
String[] xcx = detailedUpDto.getInforlist3().split(","); String[] zcc = detailedUpDto.getInforlist2().split(",");
for (int a =0;a< id.length;a++){ 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(); TimeDto dto = new TimeDto();
dto.setStandId(id[a]); dto.setStandId(detailedUpDto.getInforlist());
if ("\"".equals(putTime[a])){ dto.setPutTime(detailedUpDto.getInforlist1());
dto.setPutTime(null); dto.setXcxssrqgj(detailedUpDto.getInforlist2());
}else { dto.setZccssrqgj(detailedUpDto.getInforlist3());
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); timeDto.add(dto);
} }
}else { service.updateDetailedLaws(detailedUpDto.getId(), timeDto);
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);
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;