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_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-12-15 10:41:51 +08:00
parent bb5cd0a360 ebd5c94057
commit e35990d25f
25 changed files with 220 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java
+4 -4
View File
@@ -77,13 +77,13 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE");
List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);
//开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下
sarStandFileEOS.forEach(item->{
QueryWrapper<SarStandFileEO> wrapper = new QueryWrapper<>();
wrapper.eq("ORI_ATT_ID",item.getOriAttId())
.eq("USE_MODEL","SOURCE_FILE");
SarStandFileEO sarStandFileEO = sarStandFileEODao.selectOne(wrapper);
item.setFileOldName(sarStandFileEO.getFileName());
.eq("USE_MODEL","SOURCE_FILE").orderByDesc("CREATION_TIME");
List<SarStandFileEO> sarStandFileEO = sarStandFileEODao.selectList(wrapper);
item.setFileOldName(sarStandFileEO.get(0).getFileOldName());
});
return sarStandFileEOS;
adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java
+3 -3
View File
@@ -54,11 +54,11 @@ public class WgDeptShow extends BaseEntity {
@ApiModelProperty(value = "中文名")
private String name;
@ApiModelProperty(value = "单位")
@ApiModelProperty(value = "单位名称")
private String unit;
@ApiModelProperty(value = "单位名称")
private String unitName;
@ApiModelProperty(value = "单位")
private String unitId;
@ApiModelProperty(value = "电话")
private String phone;
adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java
+3 -3
View File
@@ -48,11 +48,11 @@ public class WgNetInfoDTO extends BaseEntity {
@ApiModelProperty(value = "中文名")
private String name;
@ApiModelProperty(value = "单位")
@ApiModelProperty(value = "单位名称")
private String unit;
@ApiModelProperty(value = "单位名称")
private String unitName;
@ApiModelProperty(value = "单位")
private String unitId;
@ApiModelProperty(value = "电话")
private String phone;
adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java
+26 -4
View File
@@ -23,6 +23,7 @@ import com.adc.da.slrs.wgWorkGroup.dao.WgWorkGroupDao;
import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO;
import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO;
import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -333,15 +334,21 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> {
WgDept wgDept=new WgDept();
BeanUtils.copyProperties(wgDeptShow,wgDept);
if (null==wgDept.getWgId()){
wgDept.setWgId(wgWorkGroupShowDTO.getId());
}
wgDepts.add(wgDept);
});
flag = wgDeptService.saveOrUpdateBatch(wgDepts);
}
if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) {
List<String> removeMeet = new ArrayList<>();
List<WgMeetingUserRelation> wgMeetingUserRelations = new ArrayList<>();
wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> {
if (null==wgMeetingInfo.getId()){
wgMeetingInfo.setId(String.valueOf(UUID.randomUUID()));
wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId());
}
wgMeetingInfo.getMeetingPeople().forEach(s -> {
WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation();
wgMeetingUserRelation.setUserId(s);
@@ -350,27 +357,42 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
});
removeMeet.add(wgMeetingInfo.getId());
});
flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos());
if (!removeMeet.isEmpty()) {
wgMeetingUserRelationService.removeByIds(removeMeet);
wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations);
}
flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos());
}
if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) {
List<WgNetInfo> wgNetInfos = new ArrayList<>();
wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> {
WgNetInfo wgNetInfo = new WgNetInfo();
BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo);
if (null==wgNetInfo.getWgId()){
wgNetInfo.setWgId(wgWorkGroupShowDTO.getId());
}
wgNetInfos.add(wgNetInfo);
});
flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos);
}
if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) {
if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){
wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> {
if (null==wgPayInfo.getWgId()){
wgPayInfo.setWgId(wgWorkGroupShowDTO.getId());
}
});
}
flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos());
}
if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) {
if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){
wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> {
if (null==wgStandorpolicyInfo.getWgId()){
wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId());
}
});
}
flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos());
}