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() } }) 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){ 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> 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>
@@ -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: { 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> <!-- 打包时剔除jar，放置在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> <!– 排除所有Jar –> <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>
@@ -180,9 +180,6 @@ @Resource CommonsMapper commonsMapper; @Resource ICodeBasicSecService codeBasicSecService; /** * 编码规则的服务 */ 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() + "%'"; 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>
@@ -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,
