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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!45
This commit is contained in:
高嵩
2023-04-10 21:49:12 +08:00
parent 20222d02e5 0ecf6a0acd
commit 01369f3592
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+10 -4
View File
@@ -4434,10 +4434,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Override @Override
public ResponseMessage selectByIdAtt(String id) { public ResponseMessage selectByIdAtt(String id) {
SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.selectByIdAtt(id); String[] split = id.split(",");
AttFileEO byId = iAttFileEOService.getFileInfo(sarBussStandAttrInfo.getFbgbuss()); List<String> asList = Arrays.asList(split);
sarBussStandAttrInfo.setFbgbussNmae(byId.getOldFileName()); List<SarBussStandAttrInfo> sarBussStandAttrInfoList = new ArrayList<>();
return Result.success(sarBussStandAttrInfo); for(String idInfo :asList){
SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.selectByIdAtt(idInfo);
AttFileEO byId = iAttFileEOService.getFileInfo(sarBussStandAttrInfo.getFbgbuss());
sarBussStandAttrInfo.setFbgbussNmae(byId.getOldFileName());
sarBussStandAttrInfoList.add(sarBussStandAttrInfo);
}
return Result.success(sarBussStandAttrInfoList);
} }
public String updateInfo(List<String> asList,String standId,String attfId) { public String updateInfo(List<String> asList,String standId,String attfId) {
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
+8 -3
View File
@@ -24,6 +24,7 @@ import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result; import com.adc.da.util.http.Result;
import com.adc.da.utils.treetool.Tree; import com.adc.da.utils.treetool.Tree;
import com.adc.da.utils.treetool.TreeNode; import com.adc.da.utils.treetool.TreeNode;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -1054,7 +1055,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
sarFileSplitInfoEO.setResult("1"); sarFileSplitInfoEO.setResult("1");
sarFileSplitInfoEO.setModifyUser(LoginUserUtil.getUserId()); sarFileSplitInfoEO.setModifyUser(LoginUserUtil.getUserId());
sarFileSplitInfoEO.setStandId(sarFileSplitInfoEO.getStandId()); sarFileSplitInfoEO.setStandId(sarFileSplitInfoEO.getStandId());
sarFileSplitInfoEOService.insertSelective(sarFileSplitInfoEO); // sarFileSplitInfoEOService.insertSelective(sarFileSplitInfoEO);
} }
Map<String, String> menuPidMap = new HashMap<>(); Map<String, String> menuPidMap = new HashMap<>();
@@ -1073,10 +1074,14 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
} }
itemsEO.setItermsConditions(tupian); itemsEO.setItermsConditions(tupian);
} }
String menuIdT = createItemsInfo(itemsEO,infoId,countSuccess,menuPidMap); // String menuIdT = createItemsInfo(itemsEO,infoId,countSuccess,menuPidMap);
menuPidMap.put(itemsEO.getItemsNum(),menuIdT); //menuPidMap.put(itemsEO.getItemsNum(),menuIdT);
countSuccess++; countSuccess++;
} }
//加入的里面 删除旧的
QueryWrapper<SarStandItems> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("STAND_ID",sarFileSplitInfoEO.getStandId());
sarStandItemsDao.delete(objectQueryWrapper);
//加入的里面 //加入的里面
for (SarFileSplitItemsEO itemsEO : addItemsEOList){ for (SarFileSplitItemsEO itemsEO : addItemsEOList){
if(itemsEO.getItemsNum().equals("总目录")) { if(itemsEO.getItemsNum().equals("总目录")) {