Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

微调

Browse Source
This commit is contained in:
chendaofei
2025-06-24 10:04:05 +08:00
parent 934ac90daf
commit 120b0422f1
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
View File

@@ -179,6 +179,7 @@ public class CustomReportServiceImpl implements CustomReportService {
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public boolean updateCustomReportTemplate(ReportTemplateParam.UpdateReportTemplateParam reportTemplateParam) { public boolean updateCustomReportTemplate(ReportTemplateParam.UpdateReportTemplateParam reportTemplateParam) {
checkName(reportTemplateParam, true); checkName(reportTemplateParam, true);
MultipartFile fileContent = reportTemplateParam.getFileContent(); MultipartFile fileContent = reportTemplateParam.getFileContent();
@@ -200,6 +201,20 @@ public class CustomReportServiceImpl implements CustomReportService {
excelRptTemp.setUpdateTime(LocalDateTime.now()); excelRptTemp.setUpdateTime(LocalDateTime.now());
excelRptTempMapper.updateById(excelRptTemp); excelRptTempMapper.updateById(excelRptTemp);
//多模板绑定部门进行修改
//1、根据模板主键删除绑定的部门数据
LambdaQueryWrapper<SysDeptTemp> lambdaQuery = new LambdaQueryWrapper<>();
lambdaQuery.eq(SysDeptTemp::getTempId, excelRptTemp.getId());
deptTempMapper.delete(lambdaQuery);
//2、新增部门
String[] deptIdArr = reportTemplateParam.getValueTitle().split(StrUtil.COMMA);
for (String bindDeptId : deptIdArr) {
SysDeptTemp sysDeptTemp = new SysDeptTemp();
sysDeptTemp.setTempId(excelRptTemp.getId());
sysDeptTemp.setDeptId(bindDeptId);
sysDeptTemp.setActivation(DataStateEnum.ENABLE.getCode());
deptTempMapper.insert(sysDeptTemp);
}
return true; return true;
} }
@@ -809,6 +824,9 @@ public class CustomReportServiceImpl implements CustomReportService {
} }
/**
* map key转大写
*/
public static <V> Map<String, V> convertKeysToUpperCase(Map<String, V> originalMap) { public static <V> Map<String, V> convertKeysToUpperCase(Map<String, V> originalMap) {
Map<String, V> newMap = new HashMap<>(); Map<String, V> newMap = new HashMap<>();
for (Map.Entry<String, V> entry : originalMap.entrySet()) { for (Map.Entry<String, V> entry : originalMap.entrySet()) {
@@ -906,8 +924,7 @@ public class CustomReportServiceImpl implements CustomReportService {
//处理台账信息 //处理台账信息
Map<String, String> finalTerminalMap; Map<String, String> finalTerminalMap;
if (CollUtil.isNotEmpty(terminalList)) { if (CollUtil.isNotEmpty(terminalList)) {
finalTerminalMap = commTerminalGeneralClient.getCustomDetailByLineId(reportSearchParam.getLineId()).getData(); finalTerminalMap = convertKeysToUpperCase(commTerminalGeneralClient.getCustomDetailByLineId(reportSearchParam.getLineId()).getData());
convertKeysToUpperCase(finalTerminalMap);
}else { }else {
finalTerminalMap = new HashMap<>(); finalTerminalMap = new HashMap<>();
} }