bug53107修改

This commit is contained in:
xiejunyu
2022-05-30 12:05:16 +08:00
parent 812cdc8fed
commit d50fdb6b0c
@@ -1558,12 +1558,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
@Override
public void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO) {/////
if(org.apache.commons.lang3.StringUtils.isNotBlank(projectLawsInventoryEO.getIds())){
//根据id查询数据库中完整信息,翻译
List<String> idList = Arrays.asList(projectLawsInventoryEO.getIds().split(","));
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> infoList = list(queryWrapper.in("id", idList));
String projectLibraryId = infoList.get(0).getProjectLibraryId();
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
for (String id : projectLawsInventoryEO.getIds().split(",")) {
ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
@@ -1584,6 +1578,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory());
}
//在产车实施日期implementTime
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
projectLawsInventoryEOTemp.setImplementTime(projectLawsInventoryEO.getImplementTime());
}
//新车型实施日期xin1Che1Xing2Shi2Shi1Ri4Qi1
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
projectLawsInventoryEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
}
//适用地区region
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
projectLawsInventoryEOTemp.setRegion(projectLawsInventoryEO.getRegion());
}
//设计符合性确认截止时间
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){
projectLawsInventoryEOTemp.setDesignDueDate(projectLawsInventoryEO.getDesignDueDate());
@@ -1600,6 +1606,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
this.updateBatchById(projectLawsInventoryEOList);
//根据id查询数据库中完整信息,翻译
List<String> idList = Arrays.asList(projectLawsInventoryEO.getIds().split(","));
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> infoList = list(queryWrapper.in("id", idList));
String projectLibraryId = infoList.get(0).getProjectLibraryId();
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
@@ -1725,9 +1736,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
}
projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
// projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
}
this.updateBatchById(projectLawsInventoryEOList);
// this.updateBatchById(projectLawsInventoryEOList);
contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1);
enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1);