From eb935ac81cfa4992629efb8494acbe02701e616a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 13 十二月 2023 18:17:09 +0800
Subject: [PATCH] 堆叠折线图 主数据导出加入Loading
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 9bfb0fe..3bb6a3e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -68,6 +68,7 @@
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.annotation.OperateLog;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
@@ -505,6 +506,7 @@
CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
CodeRuleVO ruleVO = ruleService.getObjectHasSecByOid(orderDTO.getCodeRuleOid());
+ final BladeUser user = AuthUtil.getUser();
//1.鍒ゆ柇瑙勫垯涓櫎浜嗘祦姘寸爜娈碉紝鏄惁鏈夊叾浠栫爜娈�
checkSecValueOnOrder(ruleVO, orderDTO);
//2.鍒ゆ柇蹇呰緭椤�
@@ -535,13 +537,13 @@
//cbo.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));銆�
if(authUser) {
// 瑕佹眰鏄剧ず璐﹀彿锛屾墍浠ュ仛浜嗘洿鏀�
- cbo.setCreator(String.valueOf(AuthUtil.getUser().getAccount()));
- cbo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
+ cbo.setCreator(String.valueOf(user.getAccount()));
+ cbo.setLastModifier(String.valueOf(user.getAccount()));
}else{
cbo.setCreator(orderDTO.getCreator());
cbo.setLastModifier(orderDTO.getLastModifier());
}
- cbo.setTenantId(AuthUtil.getTenantId());
+ cbo.setTenantId(user.getTenantId());
if(StringUtils.isNotBlank(orderDTO.getLcStatus())||StringUtils.isNotBlank(orderDTO.getData().get("lcStatus"))){
cbo.setLcStatus(StringUtils.isNotBlank(orderDTO.getLcStatus())?orderDTO.getLcStatus():orderDTO.getData().get("lcStatus"));
}
@@ -554,7 +556,7 @@
cbo.setDescription(orderDTO.getDescription());
cboList.add(cbo);
- List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList);
+ List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList,user);
batchSaveSelectChar(templateVO, cboList);
return codeList.size() > 0 ? codeList.get(0) : "";
@@ -2957,7 +2959,17 @@
}
conditionMap.put("t.lastr", "1");
conditionMap.put("t.lastv", "1");
- return queryGrid(btmTypeId, templateVO, conditionMap, pageHelper);
+ DataGrid<Map<String, String>> mapDataGrid = queryGrid(btmTypeId, templateVO, conditionMap, pageHelper);
+ //澶勭悊杩斿洖鏁版嵁涓庢ā鏉挎暟鎹厤缃殑瀛楁涓嶄竴鏍烽棶棰�
+ templateVO.getAttributes().stream().forEach(e->{
+ for (Map<String, String> datum : mapDataGrid.getData()) {
+ if(datum.containsKey(e.getId().toLowerCase()) && !datum.containsKey(e.getId())){
+ datum.put(e.getId(),datum.get(e.getId().toLowerCase()));
+ datum.remove(e.getId().toLowerCase());
+ }
+ }
+ });
+ return mapDataGrid;
// List<String> selectFieldList = templateVO.getAttributes().stream().map(CodeClassifyTemplateAttrVO::getId).collect(Collectors.toList());
// //鍙傜収璁╁钩鍙扮洿鎺ユ煡璇㈠氨琛�
// List<String> finalSelectFieldList = selectFieldList;
@@ -3186,6 +3198,15 @@
updateBatchByBaseModel(oldCbo.getBtmname(), Collections.singletonList(oldCbo));
// 鎻掑叆鏂扮殑鏁版嵁
insertBatchByType(cbo.getBtmname(), Collections.singletonList(cbo));
+ //澶勭悊鐮佸�艰〃锛屽鐮佸�艰〃杩涜澶勭悊鏇挎崲鍒涘缓鏁版嵁鐨刼id
+ QueryWrapper<CodeAllCode> wrapper = new QueryWrapper<>();
+ wrapper.eq("CREATECODEOID",orderDTO.getCopyFromVersion());
+ CodeAllCode codeAllCode = codeAllCodeService.getOne(wrapper);
+ codeAllCode.setCreateCodeOid(cbo.getOid());
+ codeAllCode.setLastModifyTime(new Date());
+ codeAllCode.setTs(new Date());
+ codeAllCode.setLastModifier(AuthUtil.getUser().getUserName());
+ codeAllCodeService.updateById(codeAllCode);
// 璁板綍鏁版嵁鏇存敼鏃ュ織
saveLogUtil.operateLog("鏁版嵁鏇存敼",false, StringUtil.format("{}\n淇敼涓�:\n{}",JSON.toJSONString(Collections.singletonList(oldCbo)),JSON.toJSONString(Collections.singletonList(cbo))));
} catch (Exception vciError) {
@@ -3391,6 +3412,16 @@
dataList.add(cbo);
wrapperData(dataList, templateVO, sqlBO.getSelectFieldList(), true);
R<List<Map<String, String>>> result = R.data(Collections.singletonList(cbo));
+ //澶勭悊杩斿洖鏁版嵁涓庢ā鏉挎暟鎹厤缃殑瀛楁涓嶄竴鏍烽棶棰�
+ templateVO.getAttributes().stream().forEach(e->{
+ for (Map<String, String> datum : result.getData()) {
+ if(datum.containsKey(e.getId().toLowerCase()) && !datum.containsKey(e.getId())){
+ datum.put(e.getId(),datum.get(e.getId().toLowerCase()));
+ datum.remove(e.getId().toLowerCase());
+ }
+ }
+ });
+
//鎴戜滑瑕佺湅鏄惁涓嶆槸鍗囩増鐨勶紝鍗囩増鐨勮瘽锛岄渶瑕佸姣斾笉鐩哥瓑鐨勫睘鎬�
/* String copy = cbo.get("copyfromversion");
// if (StringUtils.isBlank(copy)) {
--
Gitblit v1.9.3