From a3185a03c61d07adfba36b27f2afb18b682760c2 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期五, 04 八月 2023 15:35:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/todo.vue | 8 ++
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 5 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 11 +++
Source/UBCS-WEB/src/views/wel/index.vue | 9 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 3 +
Source/UBCS-WEB/src/components/template/FlowPath.vue | 2
Source/UBCS-WEB/src/components/template/Stage.vue | 8 ++
Source/UBCS/pom.xml | 56 ++++++++++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml | 1
Source/UBCS-WEB/src/views/work/send.vue | 11 ++-
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 6 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 3 -
Source/UBCS-WEB/src/views/work/done.vue | 9 ++
Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue | 2
Source/UBCS-WEB/src/views/work/claim.vue | 6 ++
15 files changed, 121 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index 8d79684..14a58c6 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -137,7 +137,7 @@
exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArr,limit:-1}).then(res=>{
// console.log('res',res)
if(res){
- func.downloadFileByBlob(res);
+ func.downloadFileByBlobHandler(res);
this.escHandler()
}
})
@@ -155,7 +155,7 @@
exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':this.ids,...this.exportArr}).then(res=>{
// console.log('res',res)
if(res){
- func.downloadFileByBlob(res);
+ func.downloadFileByBlobHandler(res);
this.escHandler()
}
})
@@ -166,7 +166,7 @@
exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArr,limit:-1}).then(res=>{
// console.log('res',res)
if(res){
- func.downloadFileByBlob(res);
+ func.downloadFileByBlobHandler(res);
this.escHandler()
}
})
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 39bad89..3eecc2d 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -1624,7 +1624,10 @@
this.addVisible = true;
this.busineSelectList = []
this.busineAddList = [];
- this.BuineAttrByBtm()
+ this.BuineAttrByBtm();
+ this.$nextTick(() => {
+ this.$refs.AddOriginPlace.doLayout();
+ })
},
//涓氬姟绫诲瀷鏁版嵁
BuineAttrByBtm(masterParameter){
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
index 160c034..3caff98 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
@@ -5,7 +5,7 @@
<attrCrud :ProData="ProData" :crudOid="crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
</span>
<span v-else-if="type.prop==='tab2'">
- <FlowPath ref="FlowPath" :code="this.crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus" :Formlist="Formlist"></FlowPath>
+ <FlowPath ref="FlowPath" :code="this.crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus" :Formlist="Formlist"></FlowPath>
</span>
<span v-else-if="type.prop==='tab3'">
<stage ref="stage" :code="this.crudOid" :Formlist="Formlist"></stage>
diff --git a/Source/UBCS-WEB/src/components/template/FlowPath.vue b/Source/UBCS-WEB/src/components/template/FlowPath.vue
index b1e37dd..f3d30c7 100644
--- a/Source/UBCS-WEB/src/components/template/FlowPath.vue
+++ b/Source/UBCS-WEB/src/components/template/FlowPath.vue
@@ -2,7 +2,7 @@
<avue-crud ref="crud" :table-loading="loading" :data="data" v-model="form" :option="option" :page.sync="page"
:search.sync="search" @on-load="getDataList" @row-save="handleSave" @row-del="handleDelete"
@row-update="handleEdit" @refresh-change="handleRefresh" @size-change="handleSizePage"
- @current-change="handleCurrentPage">
+ @current-change="handleCurrentPage" v-if="Formlist.length>0">
</avue-crud>
</template>
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index e440f54..a4bd748 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/Source/UBCS-WEB/src/components/template/Stage.vue
@@ -1,5 +1,5 @@
<template>
- <div>
+ <div v-if="Formlist.length>0">
<avue-crud ref="crud" :table-loading="loading" :data="data" :option="option" :page.sync="page"
@on-load="getDataList" @size-change="handleSizePage" @current-change="handleCurrentPage"
@row-click="handleRowClick">
@@ -35,7 +35,11 @@
typeof: String,
required: true,
default: ""
- }
+ },
+ Formlist:{
+ type:Array,
+ default:[]
+ }
},
watch: {
code: {
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index d7ffd1a..69a47eb 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -90,9 +90,10 @@
header: false,
align: 'center',
index: true,
- menuWidth: 100,
+ menuWidth: 80,
editBtn: false,
delBtn: false,
+ border:true,
column: [{
label: '浠诲姟鍚嶇О',
prop: 'taskName',
@@ -100,6 +101,8 @@
headerAlign:'center',
align:'left',
html: true,
+ width:300,
+ overHidden:true,
formatter: (val) => {
return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
}
@@ -107,16 +110,19 @@
{
label: '涓婁竴姝ュ鐞嗘椂闂�',
sortable:true,
+ width:150,
prop: 'historyActivityDurationTime'
},
{
label: '涓婁竴姝ユ搷浣滀汉',
sortable:true,
+ width:120,
prop: 'historyActivityAssigneName'
},
{
label: '娴佺▼鎻忚堪',
prop: 'processDesc',
+ overHidden:true,
formatter: (val) => {
return val.variables.processDesc
}
@@ -124,6 +130,7 @@
{
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable:true,
+ overHidden:true,
prop: 'categoryName'
}
]
diff --git a/Source/UBCS-WEB/src/views/work/claim.vue b/Source/UBCS-WEB/src/views/work/claim.vue
index 63b6582..9d31372 100644
--- a/Source/UBCS-WEB/src/views/work/claim.vue
+++ b/Source/UBCS-WEB/src/views/work/claim.vue
@@ -88,6 +88,8 @@
headerAlign:'center',
align:'left',
sortable:true,
+ width:300,
+ overHidden:true,
formatter: (val) => {
return val.variables.processName
}
@@ -95,12 +97,14 @@
label: '鍙戣捣浜�',
prop: 'createUser',
sortable:true,
+ width:150,
formatter: (val) => {
return val.variables.createUser
}
}, {
label: '鍙戣捣鏃堕棿',
sortable:true,
+ width:180,
prop: 'createTime',
}, {
label: '褰撳墠姝ラ',
@@ -108,10 +112,12 @@
},{
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable:true,
+ width:200,
prop: 'categoryName'
}, {
label: '娴佺▼鎻忚堪',
prop: 'processDesc',
+ overHidden:true,
formatter: (val) => {
return val.variables.processDesc
}
diff --git a/Source/UBCS-WEB/src/views/work/done.vue b/Source/UBCS-WEB/src/views/work/done.vue
index 88cc1f7..7dd1822 100644
--- a/Source/UBCS-WEB/src/views/work/done.vue
+++ b/Source/UBCS-WEB/src/views/work/done.vue
@@ -82,6 +82,8 @@
headerAlign: 'center',
align: 'left',
sortable: true,
+ overHidden:true,
+ width:300,
formatter: (val) => {
return val.variables.processName
}
@@ -89,24 +91,29 @@
label: '鍙戣捣浜�',
prop: 'createUser',
sortable: true,
+ width:150,
formatter: (val) => {
return val.variables.createUser
}
}, {
label: '鍙戣捣鏃堕棿',
sortable: true,
+ width:180,
prop: 'createTime',
}, {
label: '瀹屾垚鏃堕棿',
sortable: true,
- prop: 'endTime',
+ width:180,
+ prop: 'historyTaskEndTime',
}, {
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable: true,
+ width:200,
prop: 'categoryName'
}, {
label: '娴佺▼鍚姩鏃舵弿杩�',
prop: 'processDesc',
+ overHidden:true,
formatter: (val) => {
return val.variables.processDesc
}
diff --git a/Source/UBCS-WEB/src/views/work/send.vue b/Source/UBCS-WEB/src/views/work/send.vue
index 2cd93e8..2e50088 100644
--- a/Source/UBCS-WEB/src/views/work/send.vue
+++ b/Source/UBCS-WEB/src/views/work/send.vue
@@ -86,6 +86,7 @@
headerAlign:'center',
align:'left',
sortable:true,
+ overHidden:true,
formatter: (val) => {
return val.variables.processName
}
@@ -93,21 +94,25 @@
label: '娴佺▼杩涘害',
prop: 'processIsFinished',
slot: true,
- width: 80,
+ width: 100,
}, {
label: '褰撳墠姝ラ',
prop: 'taskName',
+ width:150
}, {
label: '鍙戣捣鏃堕棿',
sortable:true,
- prop: 'createTime',
+ width:180,
+ prop: 'createTime'
},{
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable:true,
- prop: 'categoryName'
+ prop: 'categoryName',
+ width:200
}, {
label: '娴佺▼鎻忚堪',
prop: 'processDesc',
+ overHidden:true,
formatter: (val) => {
return val.variables.processDesc
}
diff --git a/Source/UBCS-WEB/src/views/work/todo.vue b/Source/UBCS-WEB/src/views/work/todo.vue
index 30514b7..bff6aab 100644
--- a/Source/UBCS-WEB/src/views/work/todo.vue
+++ b/Source/UBCS-WEB/src/views/work/todo.vue
@@ -78,7 +78,7 @@
viewBtn: false,
delBtn: false,
dialogWidth: 900,
- menuWidth: 200,
+ menuWidth: 220,
dialogClickModal: false,
align: 'center',
column: [{
@@ -88,6 +88,8 @@
headerAlign:'center',
align:'left',
sortable:true,
+ width:360,
+ overHidden:true,
formatter: (val) => {
return val.variables.processName
}
@@ -95,20 +97,24 @@
label: '鍙戣捣浜�',
prop: 'createUser',
sortable:true,
+ width:150,
formatter: (val) => {
return val.variables.createUser
}
}, {
label: '鍙戣捣鏃堕棿',
sortable:true,
+ width:180,
prop: 'createTime',
}, {
label: '鎵�灞炴祦绋嬫ā鏉�',
sortable:true,
+ width:200,
prop: 'categoryName'
}, {
label: '娴佺▼鎻忚堪',
prop: 'processDesc',
+ overHidden:true,
formatter: (val) => {
return val.variables.processDesc
}
diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml
index 9a71e3e..bb23751 100644
--- a/Source/UBCS/pom.xml
+++ b/Source/UBCS/pom.xml
@@ -10,7 +10,6 @@
<properties>
<bladex.project.version>3.0.1.RELEASE</bladex.project.version>
-
<java.version>1.8</java.version>
<maven.plugin.version>3.8.0</maven.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -204,6 +203,61 @@
</compilerArgs>
</configuration>
</plugin>
+
+ <!-- 鎵撳寘鏃跺墧闄ar锛屾斁缃湪lib褰撲腑 -->
+ <!-- <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version> <!– 濡傛灉 spring.boot.version 鐗堟湰淇敼锛屽垯杩欓噷涔熻璺熺潃淇敼 –>
+ <configuration>
+ <fork>true</fork>
+ <!–瑙ｅ喅windows鍛戒护琛岀獥鍙ｄ腑鏂囦贡鐮�–>
+ <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
+ <!– 鎷嗗紑渚濊禆–>
+ <mainClass>cn.iocoder.qingning.server.QingningServerApplication</mainClass>
+ <layout>ZIP</layout>
+ <includes>
+ <include>
+ <!– 鎺掗櫎鎵�鏈塉ar –>
+ <groupId>nothing</groupId>
+ <artifactId>nothing</artifactId>
+ </include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal> <!– 灏嗗紩鍏ョ殑 jar 鎵撳叆鍏朵腑 –>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!–姝ゆ彃浠剁敤浜庡皢渚濊禆鍖呮娊鍑�–>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>../target/lib</outputDirectory>
+ <excludeTransitive>false</excludeTransitive>
+ <stripVersion>false</stripVersion>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>-->
</plugins>
</build>
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 1c4d73c..dd05221 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
@@ -180,9 +180,6 @@
@Resource
CommonsMapper commonsMapper;
- @Resource
- ICodeBasicSecService codeBasicSecService;
-
/**
* 缂栫爜瑙勫垯鐨勬湇鍔�
*/
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 038f48c..3072649 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
@@ -52,6 +52,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -1490,7 +1491,15 @@
conditionMap.put("lastr", "1");
conditionMap.put("lastv", "1");
- String countSql = "select count(*) from " + VciBaseUtil.getTableName(btmTypeId) +" where 1=1" +
+ R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Arrays.asList(btmTypeId));
+ String tableName = "";
+ if(listR.isSuccess() && !listR.getData().isEmpty()){
+ tableName = Func.isNotBlank(listR.getData().get(0).getTableName()) ? listR.getData().get(0).getTableName():VciBaseUtil.getTableName(btmTypeId);
+ }else{
+ tableName = VciBaseUtil.getTableName(btmTypeId);
+ }
+
+ String countSql = "select count(*) from " + tableName +" where 1=1" +
" and lastr = '1'" +
" and lastv='1'" +
" and codeclsfpath like '%" + exportAttrDTO.getCodeClassifyOid() + "%'";
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
index db6b406..2f97ec8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
@@ -9,6 +9,7 @@
<select id="selectCodeAllCodePage" resultMap="CodeAllcodeResultMap">
select * from PL_CODE_ALLCODE
+
</select>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 5ac72c8..6ef500b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -39,9 +39,11 @@
<result column="CODERESEMBLERULEOID" property="codeResembleRuleOid"/>
<result column="TENANT_ID" property="tenantId"/>
</resultMap>
+
<sql id="tableName">
pl_code_classify
</sql>
+
<select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
select * from PL_CODE_CLASSIFY where is_deleted = 0
</select>
@@ -364,6 +366,7 @@
</if>
order by id asc
</select>
+
<select id="getRMLibByName" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
--
Gitblit v1.9.3