From 4a6eabd5941227171333bf76ef9a57e6cf27dce1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 十二月 2023 19:03:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/cycle.vue | 2
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 10 ++-
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 60 ++++++++++----------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 17 +----
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 9 +++
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 19 -----
Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue | 2
Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue | 2
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 2
10 files changed, 59 insertions(+), 66 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index d4e40cc..d583d02 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -336,7 +336,7 @@
(formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null) ||
(this.status === "amend" && formItem.field === "codeStandardEditType" ? "2" : null) ||
//鐖剁粍浠跺鏋滄槸鍙傜収鏁版嵁浼氬皢selectRow缃┖,selectRow涓嶄负绌哄氨璇存槑涓嶆槸鍙傜収瑕佸洖濉簮鏍囧噯鍙锋暟鎹�
- (this.status === "amend" && this.selectRow && (formItem.field === "oldcode" ? this.selectValue : null)),
+ (this.status === "amend" ? (this.selectRow && (formItem.field === "oldcode" ? this.selectValue : null)) : null),
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index fc64b18..6d01849 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -42,6 +42,8 @@
:selfColumnConfig="selfColumnConfig"
:selfColumnType="selfColumnType"
:type="type"
+ :status="status"
+ :selectRow="selectRow"
data-key="codeApplyForm"
secDTOListv-bind="$attrs"
@attrList="attrListForm"
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index e3e913a..a2b1391 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -433,14 +433,13 @@
}
})
this.tableHeadFindDatas = newval;
- // console.log('new',newval)
if (!this.isCodeArrayPushed) {
if (newval.find(item => item.prop === 'id')) {
this.CodeArray.push(newval.find(item => item.prop === 'id'));
} else {
- this.CodeArray.push([]);
+ // this.CodeArray.push([]);
+ this.CodeArray = [];
}
- // console.log('CodeArray', this.CodeArray);
this.isCodeArrayPushed = true;
}
if (!this.islcstatusPushed) {
@@ -652,20 +651,13 @@
},
//鎵归噺缂栬緫
bulkEditHandler(type) {
- // console.log(this.nodeClickList)
if (this.nodeClickList.children.length >= 1) {
this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
return;
}
- const Editing = this.selectRow.every(item => item.lcstatus === 'Editing');
-
- if (Editing) {
this.batchImportData.visible = true
this.batchImportData.type = type
this.batchImportData.codeClassifyOid = this.codeClassifyOid
- } else {
- this.$message.warning('閫夋嫨鐨勬暟鎹腑鏈夌紪鐮佺姸鎬佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫锛�');
- }
},
addSaveHandler() {
this.$nextTick(() => {
@@ -677,10 +669,6 @@
if (this.selectRow.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
} else {
- // const requestData = this.selectRow.forEach(item => {
- // return { oids: item.oid, btmName: item.btmname };
- // });
-
const oids = this.selectRow.map(item => item.oid).join(',');
applyGroupCode({oids, btmName: this.selectRow[0].btmname}).then(res => {
if (res.data.code == 200) {
@@ -695,9 +683,6 @@
if (this.selectRow.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
} else {
- // const requestData = this.selectRow.forEach(item => {
- // return { oids: item.oid, btmName: item.btmname };
- // });
const oids = this.selectRow.map(item => item.oid).join(',');
receiveEditApply({oids, btmName: this.selectRow[0].btmname}).then(res => {
if (res.data.code == 200) {
diff --git a/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue b/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
index 9ec9ec9..050e580 100644
--- a/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
+++ b/Source/UBCS-WEB/src/components/StatisticsComponent/ColumnarChart.vue
@@ -36,7 +36,7 @@
);
});
- let colors = ["#91CC75", "#5470C6"];
+ let colors = ['#2eadd6', '#FFA500'];
const seriesData = [];
for (let i = 0; i < newval.length; i++) {
diff --git a/Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue b/Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue
index c9c5034..600df00 100644
--- a/Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue
+++ b/Source/UBCS-WEB/src/components/StatisticsComponent/mixCart.vue
@@ -79,7 +79,7 @@
immediate: true,
handler(newval, oldval) {
if (newval) {
- const colors = ["#8fef5b", "#db3c3c"];
+ const colors = ["#2eadd6", "#db3c3c"];
const seriesData = newval.map((data, index) => ({
name: index === 0 ? "鎬婚噺" : "鏂板",
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index b5cc7aa..5cb22bb 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -1,4 +1,4 @@
-<template>
+ <template>
<el-dialog
title="涓氬姟绫诲瀷"
:visible.sync="showSubmitDialog"
@@ -11,7 +11,7 @@
<el-form ref="form" :model="btmType" show-message="true" inline size="medium" label-suffix=":" class="btmTypeForm"
:rules="rules" @resetFields="resetForm" status-icon="true">
<el-form-item label="鑻辨枃鍚嶇О" label-width="100px" required="true" prop="id">
- <el-input v-model="btmType.id" :prefix-icon="icons.key"></el-input>
+ <el-input v-model="btmType.id" :prefix-icon="icons.key" :disabled="true"></el-input>
</el-form-item>
<el-form-item label="涓枃鍚嶇О" label-width="100px">
<el-input v-model="btmType.name" :prefix-icon="icons.name"></el-input>
@@ -232,7 +232,8 @@
{
label: '鑻辨枃鍚嶇О',
prop: 'id',
- align: 'center'
+ align: 'center',
+ disabled:true
}, {
label: '涓枃鍚嶇О',
prop: 'name',
@@ -284,6 +285,7 @@
prop: 'id',
align: 'left',
search: true,
+ disabled:true,
width: 230
}, {
label: '涓枃鍚嶇О',
@@ -356,6 +358,7 @@
{
label: '鑻辨枃鍚嶇О',
prop: 'id',
+ disabled:true,
search: true
},
{
@@ -420,6 +423,7 @@
{
label: '鑻辨枃鍚嶇О',
prop: 'id',
+ disabled:true,
search: true
},
{
diff --git a/Source/UBCS-WEB/src/views/modeling/cycle.vue b/Source/UBCS-WEB/src/views/modeling/cycle.vue
index 0fc23e9..6f00942 100644
--- a/Source/UBCS-WEB/src/views/modeling/cycle.vue
+++ b/Source/UBCS-WEB/src/views/modeling/cycle.vue
@@ -229,6 +229,8 @@
const nodes = res.data.data.nodes.map((item) => {
item.label = item.id;
item.index = item.indexNum;
+ item.x = Number(item.x);
+ item.y = Number(item.y);
return item;
});
const edges = res.data.data.edges.map((item) => {
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index cb12b69..9403436 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -124,36 +124,36 @@
this.dataKeyList = this.selectData.map(obj => obj.code)
const btmName = this.dataKeyList.join(",");
if (btmName) {
- this.menuList=[
- {
- menuData: [
- [0, 0, 0, 0, 0, 0, 4, 9, 12, 12, 12, 12],
- [0, 0, 0, 0, 0, 0, 4, 5, 3, 0, 0, 0]
- ],
- code:1
- },
- {
- menuData: [
- [0, 0, 0, 1, 1, 1, 1, 1, 1, 29, 5315, 5315],
- [0, 0, 0, 1, 0, 0, 0, 0, 0, 28, 5286, 0]
- ],
- code:2
- },
- {
- menuData: [
- [0, 58, 60, 61, 75, 84, 145, 162, 166, 177, 186, 186],
- [0, 58, 2, 1, 14, 9, 61, 17, 4, 11, 9, 0]
- ],
- code:3
- }
- ]
- this.nextSave();
- this.$message.success('淇濆瓨鎴愬姛')
- // getStatisticAnalysis({btmNames: btmName}).then(res => {
- // this.menuList = res.data.data;
- // this.nextSave();
- // this.$message.success('淇濆瓨鎴愬姛')
- // });
+ // this.menuList=[
+ // {
+ // menuData: [
+ // [0, 0, 0, 0, 0, 0, 4, 9, 12, 12, 12, 12],
+ // [0, 0, 0, 0, 0, 0, 4, 5, 3, 0, 0, 0]
+ // ],
+ // code:1
+ // },
+ // {
+ // menuData: [
+ // [0, 0, 0, 1, 1, 1, 1, 1, 1, 29, 5315, 5315],
+ // [0, 0, 0, 1, 0, 0, 0, 0, 0, 28, 5286, 0]
+ // ],
+ // code:2
+ // },
+ // {
+ // menuData: [
+ // [0, 58, 60, 61, 75, 84, 145, 162, 166, 177, 186, 186],
+ // [0, 58, 2, 1, 14, 9, 61, 17, 4, 11, 9, 0]
+ // ],
+ // code:3
+ // }
+ // ]
+ // this.nextSave();
+ // this.$message.success('淇濆瓨鎴愬姛')
+ getStatisticAnalysis({btmNames: btmName}).then(res => {
+ this.menuList = res.data.data;
+ this.nextSave();
+ this.$message.success('淇濆瓨鎴愬姛')
+ });
}else {
this.$message.warning('璇烽�夋嫨鏁版嵁锛�')
}
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..1e18849 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
@@ -3186,6 +3186,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) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 7a4942f..c8d8111 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -1282,6 +1282,7 @@
* @param file excel鏂囦欢鐨勪俊鎭�
* @return 鏈夐敊璇俊鎭殑excel
*/
+ @Transactional
@Override
public CodeImProtRusultVO batchImportEdit(String codeClassifyOid, String classifyAttr,File file) throws Throwable{
VciBaseUtil.alertNotNull(codeClassifyOid,"鍒嗙被鐨勪富閿�");
@@ -1328,7 +1329,7 @@
titleRowData.remove(titleRowData.size()-1);
templateVO= templateVOList.get(0);
}catch (Throwable e){
- throw new VciBaseException(e.getMessage());
+ throw new ServiceException(e.getMessage());
}
CodeClassifyTemplateVO finalTemplateVO = templateVO;
@@ -1355,23 +1356,13 @@
//鎴戜滑浣跨敤鍜屼笟鍔＄被鍨嬬殑鏉ユ煡璇�
List<Map> cbosB = commonsMapper.selectBySql(sqlBO.getSqlUnPage());
if(cbosB.size() == 0){
- throw new ServiceException("缂栫爜锛�"+ sheetRowData.getData().get(0) + ",鏈兘鏌ヨ鍒扮浉鍏虫暟鎹��");
+ throw new ServiceException("缂栫爜锛�"+ sheetRowData.getData().get(0) + ",鏈兘鏌ヨ鍒扮浉鍏虫暟鎹��");
}
excelToCboEdit(fieldIndexMap, sheetRowData, orderDTO, cbosB.get(0));
orderDTO.setCopyFromVersion(orderDTO.getOid());
orderDTO.setOid(null);
try {
mdmEngineService.upSaveCode(orderDTO);
- List<Map> newCbos = commonsMapper.selectBySql(sqlBO.getSqlUnPage());
- //瀵圭爜鍊艰〃杩涜澶勭悊鏇挎崲鍒涘缓鏁版嵁鐨刼id
- QueryWrapper<CodeAllCode> wrapper = new QueryWrapper<>();
- wrapper.eq("CREATECODEOID",orderDTO.getCopyFromVersion());
- List<CodeAllCode> codeAllCodes = codeAllCodeService.selectByWrapper(wrapper);
- codeAllCodes.get(0).setCreateCodeOid(newCbos.get(0).get("OID").toString());
- codeAllCodes.get(0).setLastModifyTime(new Date());
- codeAllCodes.get(0).setTs(new Date());
- codeAllCodes.get(0).setLastModifier(AuthUtil.getUser().getUserName());
- codeAllCodeService.updateBatchById(codeAllCodes);
} catch (Throwable e) {
log.error("鎵归噺浜х敓缂栫爜鐨勬椂鍊欏嚭閿欎簡", e);
errorMap.put(sheetRowData.getRowIndex(), ";绯荤粺閿欒锛屽瓨鍌ㄦ暟鎹殑鏃跺�欏嚭閿欎簡:"+e.getMessage());
@@ -3563,7 +3554,7 @@
if (StringUtils.isBlank(field)) {
throw new VciBaseException("绗�" + (index + 1) + "鍒楃殑鏍囬鍦ㄧ郴缁熶腑涓嶅瓨鍦�");
}
- map.put(field,value);
+ map.put(field.toUpperCase(),value);
});
try {
--
Gitblit v1.9.3