From e1a2b770a3b9bf440ddccf4518c436e55bdaecda Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 06 六月 2023 17:02:37 +0800
Subject: [PATCH] 高级查询相关内容提交
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java | 25
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java | 9
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java | 15
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java | 21 -
Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml | 20
Source/UBCS-WEB/src/api/code/mdmrule.js | 6
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 86 ++-
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java | 136 ++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml | 56 +-
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java | 1
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java | 46 --
Source/UBCS-WEB/src/views/code/code.vue | 178 +++++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java | 1
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java | 9
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java | 1
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 32
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 24 -
Source/UBCS-WEB/src/const/code/mdmrule.js | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java | 13
/dev/null | 87 ----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java | 53 --
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java | 231 +++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java | 19
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java | 121 -----
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 32
32 files changed, 637 insertions(+), 614 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/code/mdmrule.js b/Source/UBCS-WEB/src/api/code/mdmrule.js
index 3dac202..dc5b352 100644
--- a/Source/UBCS-WEB/src/api/code/mdmrule.js
+++ b/Source/UBCS-WEB/src/api/code/mdmrule.js
@@ -1,13 +1,13 @@
import request from '@/router/axios';
-export const gridCodeRule = (current, size, params) => {
+export const gridCodeRule = (page, limit, params) => {
return request({
url: '/api/ubcs-code/mdmRule/gridCodeRule',
method: 'get',
params: {
+ page,
+ limit,
...params,
- current,
- size,
}
})
}
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index d9e17d9..8e6bea6 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -14,7 +14,7 @@
destroy-on-close>
<div class="search-total">
<!-- 澶撮儴鎸夐挳鍖哄煙 -->
- <div class="dialog-search-button">
+ <div slot="title" class="dialog-search-button">
<el-button
type="primary"
size="small"
@@ -55,7 +55,6 @@
<el-option
v-for="condition in item.fieldType=='text' ? searchConditions:switchSearchConditions"
:key="condition.value"
-
:label="condition.label"
:value="condition.value">
</el-option>
@@ -64,8 +63,8 @@
</el-col>
<el-col :span="12">
<div class="grid-content">
- <el-input v-show="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="璇疯緭鍏�"></el-input>
- <el-select v-show="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨">
+ <el-input v-if="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="璇疯緭鍏�"></el-input>
+ <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨">
<el-option
v-for="option in item.data"
:key="option.value"
@@ -73,7 +72,7 @@
:value="option.value">
</el-option>
</el-select>
- <el-switch v-show="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
+ <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
</div>
</el-col>
<el-col :span="2">
@@ -88,6 +87,7 @@
</template>
<script>
+import { getDictionary } from "@/api/omd/enum";
export default {
name: "advancedQuery",
props: {
@@ -101,10 +101,6 @@
type: "Object",
default: {},
},
- conditionMapParams: {
- type: "Object",
- default: {},
- },
},
data() {
return {
@@ -114,33 +110,37 @@
// 瀛楁鏄緭鍏ユ绫诲瀷鐨勬潯浠舵暟缁�
searchConditions: [
{
- value: "=",
+ value: "_equal",
label: "绛変簬",
},{
- value: "like",
- label: "鍖呭惈",
- },{
- value: "!=",
+ value: "_notequal",
label: "涓嶇瓑浜�",
},{
- value: ">",
- label: "澶т簬",
+ value: "_like",
+ label: "鍖呭惈",
},{
- value: "<",
+ value: "_notlike",
+ label: "涓嶅寘鍚�",
+ },{
+ value: "_ge", //澶т簬锛岄粯璁や负澶т簬绛変簬
+ label: "澶т簬",
+ },{
+ value: "_le", //灏忎簬锛岄粯璁や负灏忎簬绛変簬
label: "灏忎簬",
},
],
// 瀛楁鏄崟閫夋垨涓嬫媺妗嗙被鍨嬬殑鏉′欢鏁扮粍
switchSearchConditions: [
{
- value: "=",
+ value: "_equal",
label: "绛変簬",
},{
- value: "!=",
+ value: "_notequal",
label: "涓嶇瓑浜�",
- },
+ }
],
searchFormArrays: [],
+ fieldValue: '',
}
},
watch: {
@@ -153,12 +153,19 @@
// 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
const data = JSON.stringify(this.options);
this.initOptions = JSON.parse(data);
- // console.log(this.initOptions);
+ //console.log(this.initOptions);
this.initOptions.forEach((item,index) => {
+ if(item.fieldType==='combox') {
+
+ this.getEnum(item.comboxKey).then(res=>{
+ console.log(res.data);
+ })
+ //item.data =
+ }
let add = {
queryField: String(item.queryField),
- condition: item.fieldType=='text' ? String("like"):String("="),
- fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
+ condition: item.fieldType==='text' ? String("_like"):String("_equal"),
+ fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(""),
}
this.searchFormArrays.push(add)
});
@@ -169,6 +176,17 @@
},
methods: {
+
+ async getEnum(enumText){
+ let enumParam = '';
+ await getDictionary({code: enumText}).then(res=>{
+ enumParam = res.data.data;
+ // console.log(res.data);
+ })
+ //console.log(enumParam);
+ return enumParam;
+ },
+
// 绉婚櫎鎼滅储妗�
removeInput(index){
//console.log(this.initOptions);
@@ -183,7 +201,7 @@
this.initOptions.forEach((item,index) => {
let add = {
queryField: String(item.queryField),
- condition:item.fieldType=='text' ? String("like"):String("="),
+ condition:item.fieldType=='text' ? String("_like"):String("_equal"),
fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
}
array.push(add)
@@ -203,22 +221,21 @@
const searchConditions = this.searchFormArrays;
for(let index = 0; index < searchConditions.length; index++) {
//console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' == 'undefined');
- if(searchConditions[index].fieldValue != '' || searchConditions[index].fieldValue+''==='false') {
+ if(searchConditions[index].fieldValue.trim() != '' || searchConditions[index].fieldValue+''==='false') {
// 瀛樺湪鐩稿悓鐨勬煡璇㈡潯浠�
if(condtionParam['conditionMap['+searchConditions[index].queryField+']']+''.trim() != 'undefined' ) {
this.$message.warning("瀛樺湪閲嶅鏌ヨ鏉′欢锛岃浠旂粏鏍稿!");
return false;
}
- condtionParam['conditionMap['+searchConditions[index].queryField+']'] = searchConditions[index].fieldValue;
+ //鎷兼帴鎴恗ap瀵硅薄锛屽皢鏌ヨ瀵硅薄鍜宑ondition鎷兼帴鍦ㄤ竴璧凤紝缁勬垚楂樼骇鏌ヨmap鐨刱ey
+ condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = searchConditions[index].fieldValue;
}
}
- //鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝浼犻�掔粰鐖剁粍浠�
- //console.log(condtionParam);
- // if(){
-
- // }
- this.$emit('echoContion',condtionParam)
- },
+ // 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝浼犻�掔粰鐖剁粍浠�
+ // console.log(condtionParam);
+ this.$emit('echoContion',condtionParam)
+ this.isShowDialog = false;
+ },
}
}
</script>
@@ -240,7 +257,8 @@
position: fixed;
display: block;
background-color: #fff;
- top: 90px;
+ // top: 10%;
+ margin-top: -30px;
width: 50%;
z-index: 1000;
}
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index 6a91563..8800bad 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -413,21 +413,21 @@
type: "select",
cell: true,
clearable: false,
- dicData: [{
- value: 'like', label: '鍖呭惈'
- }, {
- value: '=', label: '绛変簬'
- }, {
- value: '>', label: '澶т簬'
- }, {
- value: '<', label: '灏忎簬'
- }, {
- value: '!=', label: '涓嶇瓑浜�'
- }, {
- value: '>=', label: '澶т簬绛変簬'
- }, {
- value: '<=', label: '灏忎簬绛変簬'
- }]
+ dicData: [
+ {
+ value: '_like', label: '鍖呭惈'
+ },{
+ value: "_notlike", label: "涓嶅寘鍚�",
+ }, {
+ value: 'equal', label: '绛変簬'
+ }, {
+ value: '_notequal', label: '涓嶇瓑浜�'
+ }, {
+ value: '_ge', label: '澶т簬'
+ }, {
+ value: '_le', label: '灏忎簬'
+ }
+ ]
},{
label: "绛涢�夊��",
prop: "filterValue",
@@ -1193,7 +1193,7 @@
this.form.codeSrchCondConfigVOS.push(
{
filterField: item.id,
- filterType: '=',
+ filterType: 'equal',
filterTypeText: item.name,
filterValue: '',
$cellEdit: false
diff --git a/Source/UBCS-WEB/src/const/code/mdmrule.js b/Source/UBCS-WEB/src/const/code/mdmrule.js
index 3fb66a1..8793588 100644
--- a/Source/UBCS-WEB/src/const/code/mdmrule.js
+++ b/Source/UBCS-WEB/src/const/code/mdmrule.js
@@ -53,12 +53,12 @@
},
{
label: "鐘舵��",
- prop: "lcStatusText",
+ prop: "lcStatus",
+ value: "0",
search: true,
searchLabelWidth: 45,
searchSpan: 5,
type: 'select',
- //鐢变簬杩欎釜鎺ュ彛杩樺湪璋冭瘯鎵�浠ヨ绛夎皟濂戒簡鎵嶈兘璋冪敤
dicUrl: "/api/ubcs-omd/enum/dictionary?code=codeSearchLCStatus",
props: {
label: "itemName",
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 5e3a4ec..aaeef02 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -63,40 +63,46 @@
@click="handleDelete">
鍒� 闄�
</el-button>
- <el-button size="small"
+ <el-button type="primary"
+ size="small"
+ icon="el-icon-search"
+ plain
+ @click="openAdvancedQuery('codeRule')">
+ 楂樼骇鏌ヨ
+ </el-button>
+ <el-button
+ size="small"
icon="icon-kelong"
plain
@click="openCodeRuleDialog">
鍏� 闅�
</el-button>
- <el-button size="small"
+ <el-button
+ size="small"
icon="icon-lianjiekelong"
style="font-size: 12px;"
plain
@click="openOtherCodeRuleDialog">
浠庡叾浠栬鍒欎腑鍏嬮殕鐮佹
</el-button>
- <el-button size="small"
+ <el-button
+ size="small"
icon="el-icon-s-help"
plain
@click="handleRange">
浣跨敤鑼冨洿
</el-button>
- <el-button size="small"
+ <el-button
+ size="small"
icon="icon-qingkong"
plain
@click="clearAllCodeSec">
娓呯┖鐮佸��
</el-button>
- <el-button size="small"
- icon="el-icon-search"
- plain
- @click="openAdvancedQuery">
- 楂樼骇鏌ヨ
- </el-button>
</template>
</avue-crud>
</basic-container>
+
<!-- 楂樼骇鏌ヨ瀵硅瘽妗� -->
<advanced-query
:ref="advancedQueryParam.ref"
@@ -104,6 +110,7 @@
:visible.sync="advancedQueryParam.advancedQuerySettingBox"
@echoContion="echoSeniorContionMap">
</advanced-query>
+
<!-- 缂栫爜瑙勫垯鐩稿叧瀵硅瘽妗� -->
<el-dialog title="缂栫爜瑙勫垯浣跨敤鑼冨洿"
append-to-body
@@ -117,6 +124,7 @@
@refresh-change="refreshUseRangeChange">
</avue-crud>
</el-dialog>
+
<!-- 缂栫爜瑙勫垯,鍏嬮殕瀵硅瘽妗� -->
<el-dialog title="鍏嬮殕缂栫爜瑙勫垯"
append-to-body
@@ -170,6 +178,7 @@
<el-button @click="cloneSettingBox = false">鍙� 娑�</el-button>
</div>
</el-dialog>
+
<!-- 缂栫爜瑙勫垯,浠庡叾浠栬鍒欏厠闅嗗璇濇 -->
<el-dialog title="鍏嬮殕缂栫爜瑙勫垯鐨勫熀纭�淇℃伅"
append-to-body
@@ -286,6 +295,13 @@
plain
@click="deleteBasicCode(scope.row)">
鍒� 闄�
+ </el-button>
+ <el-button type="primary"
+ size="small"
+ icon="el-icon-search"
+ plain
+ @click="openAdvancedQuery('codeBasicSec')">
+ 楂樼骇鏌ヨ
</el-button>
</template>
@@ -1052,7 +1068,7 @@
advancedQueryParam: {
ref: 'advancedQuery',
advancedQuerySettingBox: false,
- options: {},
+ options: [],
//conditionMapParams: {},
},
@@ -1069,47 +1085,16 @@
};
},
},
- created() {
- MasterTable({
- codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3",
- functionId: 5,
- }).then(res=>{
- console.log(res.data.tableDefineVO.seniorQueryColumns);
- this.advancedQueryParam.options = res.data.tableDefineVO.seniorQueryColumns;
- })
- // this.advancedQueryParam.options = [
- // {
- // data: [],
- // title: '缂栧彿',
- // fieldType: 'text',
- // queryField: 'id',
- // },{
- // data: [],
- // title: '鍚嶇О',
- // fieldType: 'text',
- // queryField: 'name',
- // },{
- // data: [],
- // title: '鎻忚堪',
- // fieldType: 'text',
- // queryField: 'description',
- // }, {
- // data: [],
- // title: '鐘舵��',
- // fieldType: 'text',
- // queryField: 'description',
- // }
- // ]
- },
watch:{
},
methods: {
- /** 楂樼骇鏌ヨ瀵硅瘽妗嗙粍浠�,缁勪欢杩斿洖鐨勫�兼槸condtionMap[field]褰㈠紡鐨勬煡璇㈡潯浠讹紝淇濈暀鍜屼箣鍓嶄竴鏍� */
+ /** 楂樼骇鏌ヨ瀵硅瘽妗嗙粍浠�,缁勪欢杩斿洖鐨勫�兼槸condtionMap[field]褰㈠紡鐨勬煡璇㈡潯浠讹紝淇濈暀浜嗗拰涔嬪墠涓�鏍风殑鏂瑰紡 */
echoSeniorContionMap(conditionMaps){
- console.log(conditionMaps);
-
+ // console.log(conditionMaps);
+ this.query = conditionMaps;
+ this.onLoad(this.page);
},
/* 鍏紡缂栬緫妗嗗唴瀹规敼鍙�,瀛愮粍浠剁紪杈戝畬鍏紡涔嬪悗鍐呭鍥炴樉鏃惰皟鐢� */
@@ -2005,8 +1990,78 @@
/** 缂栫爜瑙勫垯鐩稿叧鏂规硶 */
// 鎵撳紑楂樼骇鏌ヨ绐楀彛
- openAdvancedQuery(){
- this.advancedQueryParam.advancedQuerySettingBox = !this.advancedQueryParam.advancedQuerySettingBox;
+ openAdvancedQuery(condition){
+ // MasterTable({
+ // codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3",
+ // functionId: 5,
+ // }).then(res=>{
+ // console.log(res.data.tableDefineVO.seniorQueryColumns);
+ // })
+ if(condition=='codeRule'){
+ this.advancedQueryParam.options = [
+ {
+ data: [],
+ title: '缂栧彿',
+ fieldType: 'text',
+ queryField: 'id',
+ },{
+ data: [],
+ title: '鍚嶇О',
+ fieldType: 'text',
+ queryField: 'name',
+ },{
+ data: [],
+ title: '鎻忚堪',
+ fieldType: 'text',
+ queryField: 'description',
+ },{
+ data: [
+ // {
+ // key: '缂栬緫涓�',
+ // value: 'Editing',
+ // },
+ // {
+ // key: '宸插彂甯�',
+ // value: 'Released',
+ // },
+ // {
+ // key: '鍋滅敤',
+ // value: 'Disabled',
+ // },
+ ],
+ title: '鐘舵��',
+ fieldType: 'combox',
+ queryField: 'lcStatus',
+ comboxKey: 'Eummaterialtype',
+ }
+ ]
+ }else {
+ this.advancedQueryParam.options = [
+ {
+ data: [],
+ title: '鐮佹缂栧彿',
+ fieldType: 'text',
+ queryField: 'id',
+ },{
+ data: [],
+ title: '鐮佹鍚嶇О',
+ fieldType: 'text',
+ queryField: 'name',
+ },{
+ data: [],
+ title: '鎻忚堪',
+ fieldType: 'text',
+ queryField: 'description',
+ },{
+ data: [],
+ title: '鐮佹绫诲瀷',
+ fieldType: 'combox',
+ queryField: 'secType',
+ comboxKey: 'codeSecType',
+ }
+ ]
+ }
+ this.advancedQueryParam.advancedQuerySettingBox = true;
},
// 鏌ヨ浣跨敤鑼冨洿
handleRange(){
@@ -2275,16 +2330,22 @@
this.onLoad(this.page);
},
searchChange(params, done) {
- this.query = params;
this.page.currentPage = 1;
- this.onLoad(this.page, params);
+ // 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
+ if(params){
+ Object.keys(params).forEach(key=>{
+ this.query['conditionMap['+key+'_like]'] = params[key];
+ });
+ }
+ console.log(this.query);
+ this.onLoad(this.page);
done();
},
// 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�
selectionChange(list) {
this.selectionList = list;
this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
- //褰撳墠閫変腑琛屼负绌虹殑鏃跺�欏氨灏嗙爜娈电鐞嗚〃鏍兼暟鎹疆绌�
+ //褰撳墠閫変腑琛屼负绌虹殑鏃跺�欏氨灏嗙爜娈电鐞嗚〃鏍兼暟鎹疆绌�,骞剁鐢ㄧ浉鍏冲姛鑳�
if(list == ''){
this.basicData = [];
this.hideBasicTable(false);
@@ -2308,14 +2369,25 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
- onLoad(page, params = {}) {
+ onLoad(page,params={}) {
this.loading = true;
- gridCodeRule(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ gridCodeRule(
+ page.currentPage,
+ page.pageSize,
+ this.query
+ ).then(res => {
//console.log(res.data);
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ // 鏌ヨ鐨勫�间负绌烘椂锛岃灏嗙爜娈电鐞嗙浉鍏崇殑鍐呭绂佺敤
+ if(data.records.length <= 0) {
+ this.hideBasicTable(false);
+ this.selectionList = [];
+ this.basicData = [];
+ return;
+ }
this.loadBasic(this.data[0])
this.$nextTick(() => {
this.$refs.crud.toggleRowSelection(this.data[0]);
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
index a367691..bd06787 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
@@ -58,26 +58,6 @@
<artifactId>staxon</artifactId>
<version>1.3</version>
</dependency>-->
- <!-- poi -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>4.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>4.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
- <version>4.1.2</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- </dependency>
<dependency>
<groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-util-api</artifactId>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
index ae54b6f..beacef8 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
@@ -11,9 +11,6 @@
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
-import org.apache.commons.math3.util.Precision;
-import org.aspectj.weaver.ast.Not;
-import org.ietf.jgss.Oid;
import java.util.List;
@@ -151,15 +148,9 @@
private String referTypeName;
/**
-<<<<<<< Updated upstream
* 鏄惁寮�鍚叏灞�
*/
private String isOpenGlobal;
-=======
- * 鎵�灞為鍩�
- */
- private String doMain;
->>>>>>> Stashed changes
/**
* 鎺掑簭
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
index e7fae53..53d85f1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
@@ -16,6 +16,7 @@
*/
package com.vci.ubcs.code.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
index eafa258..1243815 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
@@ -8,15 +8,9 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.core.tool.utils.StringPool;
-<<<<<<< Updated upstream
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-=======
-
-import java.util.*;
-import java.util.stream.Collectors;
->>>>>>> Stashed changes
/**
* Description:
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MPJLambdaWrapperSqlKeyword.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MPJLambdaWrapperSqlKeyword.java
deleted file mode 100644
index cb34015..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MPJLambdaWrapperSqlKeyword.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.vci.ubcs.starter.util;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-
-import java.util.Map;
-
-public class MPJLambdaWrapperSqlKeyword {
-
- private static final String SQL_REGEX = "'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql";
- private static final String EQUAL = "_equal";
- private static final String NOT_EQUAL = "_notequal";
- private static final String LIKE = "_like";
- private static final String LIKE_LEFT = "_likeleft";
- private static final String LIKE_RIGHT = "_likeright";
- private static final String NOT_LIKE = "_notlike";
- private static final String GE = "_ge";
- private static final String LE = "_le";
- private static final String GT = "_gt";
- private static final String LT = "_lt";
- private static final String DATE_GE = "_datege";
- private static final String DATE_GT = "_dategt";
- private static final String DATE_EQUAL = "_dateequal";
- private static final String DATE_LT = "_datelt";
- private static final String DATE_LE = "_datele";
- private static final String IS_NULL = "_null";
- private static final String NOT_NULL = "_notnull";
- private static final String IGNORE = "_ignore";
-
- public MPJLambdaWrapperSqlKeyword() {
- }
-
- public static void buildCondition(Map<String, Object> query, MPJLambdaWrapper<?> qw) {
- if (!Func.isEmpty(query)) {
- query.forEach((k, v) -> {
- if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
- if (k.endsWith("_equal")) {
- qw.eq(getColumn(k, "_equal"), v);
- } else if (k.endsWith("_notequal")) {
- qw.ne(getColumn(k, "_notequal"), v);
- } else if (k.endsWith("_likeleft")) {
- qw.likeLeft(getColumn(k, "_likeleft"), v);
- } else if (k.endsWith("_likeright")) {
- qw.likeRight(getColumn(k, "_likeright"), v);
- } else if (k.endsWith("_notlike")) {
- qw.notLike(getColumn(k, "_notlike"), v);
- } else if (k.endsWith("_ge")) {
- qw.ge(getColumn(k, "_ge"), v);
- } else if (k.endsWith("_le")) {
- qw.le(getColumn(k, "_le"), v);
- } else if (k.endsWith("_gt")) {
- qw.gt(getColumn(k, "_gt"), v);
- } else if (k.endsWith("_lt")) {
- qw.lt(getColumn(k, "_lt"), v);
- } else if (k.endsWith("_datege")) {
- qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
- } else if (k.endsWith("_dategt")) {
- qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
- } else if (k.endsWith("_dateequal")) {
- qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
- } else if (k.endsWith("_datele")) {
- qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
- } else if (k.endsWith("_datelt")) {
- qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
- } else if (k.endsWith("_null")) {
- qw.isNull(getColumn(k, "_null"));
- } else if (k.endsWith("_notnull")) {
- qw.isNotNull(getColumn(k, "_notnull"));
- } else {
- qw.like(getColumn(k, "_like"), v);
- }
-
- }
- });
- }
- }
-
- public static void buildConditionByMapString(Map<String, String> query, MPJLambdaWrapper<?> qw) {
- if (!Func.isEmpty(query)) {
- query.forEach((k, v) -> {
- if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
- if (k.endsWith("_equal")) {
- qw.eq(getColumn(k, "_equal"), v);
- } else if (k.endsWith("_notequal")) {
- qw.ne(getColumn(k, "_notequal"), v);
- } else if (k.endsWith("_likeleft")) {
- qw.likeLeft(getColumn(k, "_likeleft"), v);
- } else if (k.endsWith("_likeright")) {
- qw.likeRight(getColumn(k, "_likeright"), v);
- } else if (k.endsWith("_notlike")) {
- qw.notLike(getColumn(k, "_notlike"), v);
- } else if (k.endsWith("_ge")) {
- qw.ge(getColumn(k, "_ge"), v);
- } else if (k.endsWith("_le")) {
- qw.le(getColumn(k, "_le"), v);
- } else if (k.endsWith("_gt")) {
- qw.gt(getColumn(k, "_gt"), v);
- } else if (k.endsWith("_lt")) {
- qw.lt(getColumn(k, "_lt"), v);
- } else if (k.endsWith("_datege")) {
- qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
- } else if (k.endsWith("_dategt")) {
- qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
- } else if (k.endsWith("_dateequal")) {
- qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
- } else if (k.endsWith("_datele")) {
- qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
- } else if (k.endsWith("_datelt")) {
- qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
- } else if (k.endsWith("_null")) {
- qw.isNull(getColumn(k, "_null"));
- } else if (k.endsWith("_notnull")) {
- qw.isNotNull(getColumn(k, "_notnull"));
- } else {
- qw.like(getColumn(k, "_like"), v);
- }
-
- }
- });
- }
- }
-
- private static String getColumn(String column, String keyword) {
- return StringUtil.humpToUnderline(StringUtil.removeSuffix(column, keyword));
- }
-
- public static String filter(String param) {
- return param == null ? null : param.replaceAll("(?i)'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql", "");
- }
-
-
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPJLambdaUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPJLambdaUtil.java
deleted file mode 100644
index 99e6480..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPJLambdaUtil.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.vci.ubcs.starter.util;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-
-import java.util.Map;
-
-public class Map2MPJLambdaUtil {
-
- public Map2MPJLambdaUtil() {
- }
-
- public static <T> IPage<T> getPage(Query query) {
- Page<T> page = new Page((long) Func.toInt(query.getCurrent(), 1), (long)Func.toInt(query.getSize(), 10));
- String[] ascArr = Func.toStrArray(query.getAscs());
- String[] descArr = ascArr;
- int var4 = ascArr.length;
-
- int var5;
- for(var5 = 0; var5 < var4; ++var5) {
- String asc = descArr[var5];
- page.addOrder(new OrderItem[]{OrderItem.asc(StringUtil.cleanIdentifier(asc))});
- }
-
- descArr = Func.toStrArray(query.getDescs());
- String[] var8 = descArr;
- var5 = descArr.length;
-
- for(int var9 = 0; var9 < var5; ++var9) {
- String desc = var8[var9];
- page.addOrder(new OrderItem[]{OrderItem.desc(StringUtil.cleanIdentifier(desc))});
- }
-
- return page;
- }
-
- public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(T entity) {
- return new MPJLambdaWrapper(entity);
- }
-
- public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(Map<String, Object> query, Class<T> clazz) {
- Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
- return getMPJLambdaWrapper(query, exclude, clazz);
- }
-
- public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapperByMapString(Map<String, String> query, Class<T> clazz) {
- Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
- return getMPJLambdaWrapperByMapString(query, exclude, clazz);
- }
-
- /**
- * map杞崲涓篗PJLambdaWrapper
- * @param query
- * @param exclude
- * @param clazz
- * @param <T>
- * @return
- */
- public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
- exclude.forEach((k, v) -> {
- query.remove(k);
- });
- MPJLambdaWrapper<T> qw = new MPJLambdaWrapper();
- qw.setEntity(BeanUtil.newInstance(clazz));
- MPJLambdaWrapperSqlKeyword.buildCondition(query, qw);
- return qw;
- }
-
- public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapperByMapString(Map<String, String> query, Map<String, Object> exclude, Class<T> clazz) {
- exclude.forEach((k, v) -> {
- query.remove(k);
- });
- MPJLambdaWrapper<T> qw = new MPJLambdaWrapper();
- qw.setEntity(BeanUtil.newInstance(clazz));
- MPJLambdaWrapperSqlKeyword.buildConditionByMapString(query, qw);
- return qw;
- }
-
-
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java
new file mode 100644
index 0000000..1f63213
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java
@@ -0,0 +1,136 @@
+package com.vci.ubcs.starter.util;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+
+import java.util.Map;
+
+/**
+ * map杞崟琛ㄦ煡璇㈠璞�
+ * 涓洪伩鍏岯ladeX妗嗘灦鑷甫鐨凪ap杞琖rapper鑷姩鏄犲皠椹煎嘲锛�
+ * 杩欒竟鍗曠嫭鍐欎竴涓互鍏嶆贩娣�
+ * @author ludc
+ * @date 2023/6/6 15:26
+ */
+public class UBCSCondition {
+
+ public UBCSCondition() {
+ }
+
+ public static <T> IPage<T> getPage(Query query) {
+ Page<T> page = new Page((long) Func.toInt(query.getCurrent(), 1), (long)Func.toInt(query.getSize(), 10));
+ String[] ascArr = Func.toStrArray(query.getAscs());
+ String[] descArr = ascArr;
+ int var4 = ascArr.length;
+
+ int var5;
+ for(var5 = 0; var5 < var4; ++var5) {
+ String asc = descArr[var5];
+ page.addOrder(new OrderItem[]{OrderItem.asc(StringUtil.cleanIdentifier(asc))});
+ }
+
+ descArr = Func.toStrArray(query.getDescs());
+ String[] var8 = descArr;
+ var5 = descArr.length;
+
+ for(int var9 = 0; var9 < var5; ++var9) {
+ String desc = var8[var9];
+ page.addOrder(new OrderItem[]{OrderItem.desc(StringUtil.cleanIdentifier(desc))});
+ }
+
+ return page;
+ }
+
+ public static <T> QueryWrapper<T> getQueryWrapper(T entity) {
+ return new QueryWrapper<T>(entity);
+ }
+
+ public static <T> QueryWrapper<T> getQueryWrapper(Map<String, Object> query, Class<T> clazz) {
+ Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
+ return getQueryWrapper(query, exclude, clazz);
+ }
+
+ public static <T> QueryWrapper<T> getQueryWrapperByMapString(Map<String, String> query, Class<T> clazz) {
+ Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
+ return getQueryWrapperByMapString(query, exclude, clazz);
+ }
+
+ /**
+ * map杞崲涓篞ueryWrapper
+ * @param query
+ * @param exclude
+ * @param clazz
+ * @param <T>
+ * @return
+ */
+ public static <T> QueryWrapper<T> getQueryWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
+ exclude.forEach((k, v) -> {
+ query.remove(k);
+ });
+ QueryWrapper<T> qw = new QueryWrapper();
+ qw.setEntity(BeanUtil.newInstance(clazz));
+ UBCSSqlKeyword.buildCondition(query, qw);
+ return qw;
+ }
+
+ public static <T> QueryWrapper<T> getQueryWrapperByMapString(Map<String, String> query, Map<String, Object> exclude, Class<T> clazz) {
+ exclude.forEach((k, v) -> {
+ query.remove(k);
+ });
+ QueryWrapper<T> qw = new QueryWrapper<>();
+ qw.setEntity(BeanUtil.newInstance(clazz));
+ UBCSSqlKeyword.buildConditionByMapString(query, qw);
+ return qw;
+ }
+
+ public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(T entity) {
+ return new MPJLambdaWrapper(entity);
+ }
+
+ public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(Map<String, Object> query, Class<T> clazz) {
+ Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
+ return getMPJLambdaWrapper(query, exclude, clazz);
+ }
+
+ public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapperByMapString(Map<String, String> query, Class<T> clazz) {
+ Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
+ return getMPJLambdaWrapperByMapString(query, exclude, clazz);
+ }
+
+ /**
+ * map杞崲涓篗PJLambdaWrapper
+ * @param query
+ * @param exclude
+ * @param clazz
+ * @param <T>
+ * @return
+ */
+ public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
+ exclude.forEach((k, v) -> {
+ query.remove(k);
+ });
+ MPJLambdaWrapper<T> qw = new MPJLambdaWrapper();
+ qw.setEntity(BeanUtil.newInstance(clazz));
+ UBCSSqlKeyword.buildCondition(query, qw);
+ return qw;
+ }
+
+ public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapperByMapString(Map<String, String> query, Map<String, Object> exclude, Class<T> clazz) {
+ exclude.forEach((k, v) -> {
+ query.remove(k);
+ });
+ MPJLambdaWrapper<T> qw = new MPJLambdaWrapper();
+ qw.setEntity(BeanUtil.newInstance(clazz));
+ UBCSSqlKeyword.buildConditionByMapString(query, qw);
+ return qw;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
new file mode 100644
index 0000000..f4016c1
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
@@ -0,0 +1,231 @@
+package com.vci.ubcs.starter.util;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * UBCSSqlKeyword
+ * map杞瑆rapper鏃剁敤鍒扮殑姣斿杞崲
+ * @author ludc
+ * @date 2023/06/06 10:01
+ */
+public class UBCSSqlKeyword {
+
+ private static final String SQL_REGEX = "'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql";
+ private static final String EQUAL = "_equal";
+ private static final String NOT_EQUAL = "_notequal";
+ private static final String LIKE = "_like";
+ private static final String LIKE_LEFT = "_likeleft";
+ private static final String LIKE_RIGHT = "_likeright";
+ private static final String NOT_LIKE = "_notlike";
+ private static final String GE = "_ge";
+ private static final String LE = "_le";
+ private static final String GT = "_gt";
+ private static final String LT = "_lt";
+ private static final String DATE_GE = "_datege";
+ private static final String DATE_GT = "_dategt";
+ private static final String DATE_EQUAL = "_dateequal";
+ private static final String DATE_LT = "_datelt";
+ private static final String DATE_LE = "_datele";
+ private static final String IS_NULL = "_null";
+ private static final String NOT_NULL = "_notnull";
+ private static final String IGNORE = "_ignore";
+
+ public UBCSSqlKeyword() {
+ }
+
+ public static void buildCondition(Map<String, Object> query, QueryWrapper<?> qw) {
+ if (!Func.isEmpty(query)) {
+ query.forEach((k, v) -> {
+ if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+ if (k.endsWith("_equal")) {
+ qw.eq(getColumn(k, "_equal"), v);
+ } else if (k.endsWith("_notequal")) {
+ qw.ne(getColumn(k, "_notequal"), v);
+ } else if (k.endsWith("_likeleft")) {
+ qw.likeLeft(getColumn(k, "_likeleft"), v);
+ } else if (k.endsWith("_likeright")) {
+ qw.likeRight(getColumn(k, "_likeright"), v);
+ } else if (k.endsWith("_notlike")) {
+ qw.notLike(getColumn(k, "_notlike"), v);
+ } else if (k.endsWith("_ge")) {
+ qw.ge(getColumn(k, "_ge"), v);
+ } else if (k.endsWith("_le")) {
+ qw.le(getColumn(k, "_le"), v);
+ } else if (k.endsWith("_gt")) {
+ qw.gt(getColumn(k, "_gt"), v);
+ } else if (k.endsWith("_lt")) {
+ qw.lt(getColumn(k, "_lt"), v);
+ } else if (k.endsWith("_datege")) {
+ qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_dategt")) {
+ qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_dateequal")) {
+ qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_datele")) {
+ qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_datelt")) {
+ qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_null")) {
+ qw.isNull(getColumn(k, "_null"));
+ } else if (k.endsWith("_notnull")) {
+ qw.isNotNull(getColumn(k, "_notnull"));
+ } else {
+ qw.like(getColumn(k, "_like"), v);
+ }
+
+ }
+ });
+ }
+ }
+
+ public static void buildCondition(Map<String, Object> query, MPJLambdaWrapper<?> qw) {
+ if (!Func.isEmpty(query)) {
+ query.forEach((k, v) -> {
+ if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+ if (k.endsWith("_equal")) {
+ qw.eq(getColumn(k, "_equal"), v);
+ } else if (k.endsWith("_notequal")) {
+ qw.ne(getColumn(k, "_notequal"), v);
+ } else if (k.endsWith("_likeleft")) {
+ qw.likeLeft(getColumn(k, "_likeleft"), v);
+ } else if (k.endsWith("_likeright")) {
+ qw.likeRight(getColumn(k, "_likeright"), v);
+ } else if (k.endsWith("_notlike")) {
+ qw.notLike(getColumn(k, "_notlike"), v);
+ } else if (k.endsWith("_ge")) {
+ qw.ge(getColumn(k, "_ge"), v);
+ } else if (k.endsWith("_le")) {
+ qw.le(getColumn(k, "_le"), v);
+ } else if (k.endsWith("_gt")) {
+ qw.gt(getColumn(k, "_gt"), v);
+ } else if (k.endsWith("_lt")) {
+ qw.lt(getColumn(k, "_lt"), v);
+ } else if (k.endsWith("_datege")) {
+ qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_dategt")) {
+ qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_dateequal")) {
+ qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_datele")) {
+ qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_datelt")) {
+ qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_null")) {
+ qw.isNull(getColumn(k, "_null"));
+ } else if (k.endsWith("_notnull")) {
+ qw.isNotNull(getColumn(k, "_notnull"));
+ } else {
+ qw.like(getColumn(k, "_like"), v);
+ }
+
+ }
+ });
+ }
+ }
+
+ public static void buildConditionByMapString(Map<String, String> query, MPJLambdaWrapper<?> qw) {
+ if (!Func.isEmpty(query)) {
+ query.forEach((k, v) -> {
+ if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+ if (k.endsWith("_equal")) {
+ qw.eq(getColumn(k, "_equal"), v);
+ } else if (k.endsWith("_notequal")) {
+ qw.ne(getColumn(k, "_notequal"), v);
+ } else if (k.endsWith("_likeleft")) {
+ qw.likeLeft(getColumn(k, "_likeleft"), v);
+ } else if (k.endsWith("_likeright")) {
+ qw.likeRight(getColumn(k, "_likeright"), v);
+ } else if (k.endsWith("_notlike")) {
+ qw.notLike(getColumn(k, "_notlike"), v);
+ } else if (k.endsWith("_ge")) {
+ qw.ge(getColumn(k, "_ge"), v);
+ } else if (k.endsWith("_le")) {
+ qw.le(getColumn(k, "_le"), v);
+ } else if (k.endsWith("_gt")) {
+ qw.gt(getColumn(k, "_gt"), v);
+ } else if (k.endsWith("_lt")) {
+ qw.lt(getColumn(k, "_lt"), v);
+ } else if (k.endsWith("_datege")) {
+ qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_dategt")) {
+ qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_dateequal")) {
+ qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_datele")) {
+ qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_datelt")) {
+ qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_null")) {
+ qw.isNull(getColumn(k, "_null"));
+ } else if (k.endsWith("_notnull")) {
+ qw.isNotNull(getColumn(k, "_notnull"));
+ } else {
+ qw.like(getColumn(k, "_like"), v);
+ }
+
+ }
+ });
+ }
+ }
+
+ public static void buildConditionByMapString(Map<String, String> query, QueryWrapper<?> qw) {
+ if (!Func.isEmpty(query)) {
+ query.forEach((k, v) -> {
+ if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+ if (k.endsWith("_equal")) {
+ qw.eq(getColumn(k, "_equal"), v);
+ } else if (k.endsWith("_notequal")) {
+ qw.ne(getColumn(k, "_notequal"), v);
+ } else if (k.endsWith("_likeleft")) {
+ qw.likeLeft(getColumn(k, "_likeleft"), v);
+ } else if (k.endsWith("_likeright")) {
+ qw.likeRight(getColumn(k, "_likeright"), v);
+ } else if (k.endsWith("_notlike")) {
+ qw.notLike(getColumn(k, "_notlike"), v);
+ } else if (k.endsWith("_ge")) {
+ qw.ge(getColumn(k, "_ge"), v);
+ } else if (k.endsWith("_le")) {
+ qw.le(getColumn(k, "_le"), v);
+ } else if (k.endsWith("_gt")) {
+ qw.gt(getColumn(k, "_gt"), v);
+ } else if (k.endsWith("_lt")) {
+ qw.lt(getColumn(k, "_lt"), v);
+ } else if (k.endsWith("_datege")) {
+ qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_dategt")) {
+ qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_dateequal")) {
+ qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_datele")) {
+ qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_datelt")) {
+ qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+ } else if (k.endsWith("_null")) {
+ qw.isNull(getColumn(k, "_null"));
+ } else if (k.endsWith("_notnull")) {
+ qw.isNotNull(getColumn(k, "_notnull"));
+ } else {
+ qw.like(getColumn(k, "_like"), v);
+ }
+
+ }
+ });
+ }
+ }
+
+ private static String getColumn(String column, String keyword) {
+ //娌℃湁杞笅鍒掔嚎鏄犲皠
+ return StringUtil.removeSuffix(column, keyword).toLowerCase(Locale.ROOT);
+ }
+
+ public static String filter(String param) {
+ return param == null ? null : param.replaceAll("(?i)'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql", "");
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index c885818..369d597 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -80,6 +80,7 @@
<scope>compile</scope>
</dependency>-->
</dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
index 6618060..0af732b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
@@ -2,12 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.dto.CodeReferConfigDTO;
-<<<<<<< Updated upstream
import com.vci.ubcs.code.service.ICodeReferConfigService;
-=======
-import com.vci.ubcs.code.entity.CodeReferConfig;
-import com.vci.ubcs.code.service.CodeReferConfigService;
->>>>>>> Stashed changes
import com.vci.ubcs.code.vo.CodeReferConfigVO;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import org.springblade.core.tool.api.R;
@@ -15,10 +10,6 @@
import javax.annotation.Resource;
import java.util.List;
-<<<<<<< Updated upstream
-=======
-import java.util.Map;
->>>>>>> Stashed changes
/**
* 鍙傜収閰嶇疆琛�(CodeReferConfig)琛ㄦ帶鍒跺眰
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
index 0540298..425b65a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
@@ -25,6 +25,8 @@
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -66,24 +68,14 @@
}
/**
- * 缂栫爜瑙勫垯 鍒嗛〉
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeRuleVO")
- public R<IPage<CodeRuleVO>> list(CodeRule codeRule, Query query) {
- IPage<CodeRule> pages = codeRuleService.page(Condition.getPage(query), Condition.getQueryWrapper(codeRule));
- return R.data(CodeRuleWrapper.build().pageVO(pages));
- }
-
- /**
* 缂栫爜瑙勫垯 鑷畾涔夊垎椤�
+ * @return baseQueryObject
*/
@GetMapping("/gridCodeRule")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeRule")
- public R<IPage<CodeRuleVO>> gridCodeRule(CodeRuleVO CodeRule, Query query) {
- IPage<CodeRuleVO> pages = codeRuleService.gridCodeRule(Condition.getPage(query.setDescs("CREATETIME")), CodeRule);
+ public R<IPage<CodeRuleVO>> gridCodeRule(BladeQueryObject bladeQueryObject) {
+ IPage<CodeRuleVO> pages = codeRuleService.gridCodeRule(bladeQueryObject.getQuery().setDescs("CREATETIME"), bladeQueryObject.getConditionMap());
return R.data(pages);
}
@@ -151,15 +143,14 @@
/**
* 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
- * @param CodeRule
- * @param query
+ * @param bladeQueryObject
* @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
*/
@GetMapping("/refDataGrid")
@ApiOperationSupport(order = 10)
@ApiOperation(value = "鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�", notes = "浼犲叆oids")
- public R<IPage<CodeRuleVO>> refDataGridCodeRule(CodeRuleVO CodeRule, Query query){
- return R.data(codeRuleService.refDataGridCodeRule(Condition.getPage(query),CodeRule));
+ public R<IPage<CodeRuleVO>> refDataGridCodeRule(BladeQueryObject bladeQueryObject){
+ return R.data(codeRuleService.refDataGridCodeRule(bladeQueryObject));
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java
index f408ad9..631095d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java
@@ -24,7 +24,7 @@
* @param codeRule
* @return
*/
- List<CodeRule> selectCodeRulePage(IPage page,@Param("codeRule") CodeRuleVO codeRule);
+// List<CodeRule> selectCodeRulePage(IPage page,@Param("codeRule") CodeRuleVO codeRule);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
index ac9a4ae..3095155 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
@@ -24,9 +24,13 @@
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
+import org.apache.commons.codec.net.QCodec;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import java.util.Collection;
+import java.util.Map;
/**
* 缂栫爜瑙勫垯 鏈嶅姟绫�
@@ -39,11 +43,11 @@
/**
* 鑷畾涔夊垎椤�
*
- * @param page
- * @param codeRule
+ * @param query
+ * @param condtionMap
* @return
*/
- IPage<CodeRuleVO> gridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule);
+ IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> condtionMap);
/**
* 鏍￠獙缂栫爜瑙勫垯鐨勭姸鎬佹槸鍚﹀彲浠ョ紪杈戞垨鍒犻櫎
@@ -106,12 +110,11 @@
/**
* 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
- * @param codeRule 鏌ヨ鏉′欢
- * @param page 鍒嗛〉鍜屾帓搴�
+ * @param bladeQueryObject 鏌ヨ鏉′欢
* @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
- IPage<CodeRuleVO> refDataGridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule) throws VciBaseException;
+ IPage<CodeRuleVO> refDataGridCodeRule(BladeQueryObject bladeQueryObject) throws VciBaseException;
/**
* 鍋滅敤涓庡惎鐢ㄧ紪鐮佽鍒�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
index 606d401..db048a4 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
@@ -24,7 +24,6 @@
import com.vci.ubcs.code.service.ICodeAllCodeService;
import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 31ea7b7..e7cfe03 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -19,14 +19,10 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-<<<<<<< Updated upstream
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
-=======
-import com.vci.ubcs.omd.feign.IBtmTypeClient;
->>>>>>> Stashed changes
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.bo.WriteExcelData;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -37,11 +33,9 @@
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
-import com.vci.ubcs.starter.util.BladeTreeQueryObject;
import com.vci.ubcs.starter.util.LocalFileUtil;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
@@ -57,7 +51,6 @@
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.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -81,19 +74,7 @@
private ICodeRuleService codeRuleService;
@Resource
-<<<<<<< Updated upstream
private IBtmTypeClient btmTypeClient;
-=======
- private CodeOsbtmtypeMapper codeOsbtmtypeMapper;
-
- @Resource
- private CodeOsbtmtypeattributeMapper codeOsbtmtypeattributeMapper;
-
- @Resource
- private IBtmTypeClient btmTypeClient;
-
-
->>>>>>> Stashed changes
/**
* 鏃ュ織
@@ -1073,7 +1054,6 @@
if(Func.isEmpty(btmTypeVOS) || Func.isEmpty(trees)){
return null;
}
-<<<<<<< Updated upstream
List<Tree> treeList = trees.stream().filter(tree -> !CollectionUtils.isEmpty(btmTypeVOS.stream().filter(btmType -> {
if(Objects.equals(tree.getAttributes().get("id"), btmType.getId())){
tree.getAttributes().put("btmTypeOid",btmType.getOid());
@@ -1082,10 +1062,6 @@
return false;
}).collect(Collectors.toList())))
.collect(Collectors.toList());
-=======
- List<Tree> treeList = trees.stream().filter(tree -> btmTypeVOS.stream().
- anyMatch(btmType -> Objects.equals(tree.getAttributes().get("id"), btmType.getId()))).collect(Collectors.toList());
->>>>>>> Stashed changes
return treeList;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index b8aa484..7f6b022 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -24,9 +24,9 @@
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.PatternUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.*;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -135,7 +135,7 @@
if(conditionMap == null){
conditionMap = new HashMap<String, String>();
}
- return gridCodeClassifyTemplateAttr(Map2MPJLambdaUtil.getMPJLambdaWrapperByMapString(conditionMap, CodeClassifyTemplateAttr.class),pageHelper);
+ return gridCodeClassifyTemplateAttr(UBCSCondition.getMPJLambdaWrapperByMapString(conditionMap, CodeClassifyTemplateAttr.class),pageHelper);
}
@Override
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
index f9223cb..94a54f1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
@@ -36,7 +36,7 @@
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -286,7 +286,7 @@
CodeClassifyTemplateButton codeClassifyTemplateButton = new CodeClassifyTemplateButton();
BeanMap beanMap = BeanMap.create(codeClassifyTemplateButton);
beanMap.putAll(conditionMap);
- MPJLambdaWrapper<CodeClassifyTemplateButton> mpjLambdaWrapper = Map2MPJLambdaUtil.getMPJLambdaWrapper(codeClassifyTemplateButton)
+ MPJLambdaWrapper<CodeClassifyTemplateButton> mpjLambdaWrapper = UBCSCondition.getMPJLambdaWrapper(codeClassifyTemplateButton)
.selectAll(CodeClassifyTemplateButton.class)
.selectAs(CodeButton::getName, CodeClassifyTemplateButton::getClassifyButtonOidName)
.selectAs(CodeButton::getId, CodeClassifyTemplateButton::getClassifyButtonId)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
index 8e6dcf0..ba2ca81 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-<<<<<<< Updated upstream
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -15,68 +14,26 @@
import com.vci.ubcs.code.service.ICodeReferConfigService;
import com.vci.ubcs.code.service.ICodeShowFieldConfigService;
import com.vci.ubcs.code.service.ICodeSrchCondConfigService;
-=======
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
-import com.vci.ubcs.code.dto.CodeReferConfigDTO;
-import com.vci.ubcs.code.entity.*;
-import com.vci.ubcs.code.mapper.CodeReferConfigMapper;
-import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
-import com.vci.ubcs.code.service.CodeReferConfigService;
-import com.vci.ubcs.code.service.CodeShowFieldConfigService;
-import com.vci.ubcs.code.service.CodeSrchCondConfigService;
->>>>>>> Stashed changes
import com.vci.ubcs.code.vo.CodeReferConfigVO;
-import com.vci.ubcs.code.wrapper.CodeClassifyProcessTempWrapper;
import com.vci.ubcs.code.wrapper.CodeReferConfigWraper;
-<<<<<<< Updated upstream
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-=======
-import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
-import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
-import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
-import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
->>>>>>> Stashed changes
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
-<<<<<<< Updated upstream
import org.springblade.core.tool.utils.Func;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.stereotype.Service;
-=======
-import org.springframework.cglib.beans.BeanMap;
-import org.springframework.stereotype.Service;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
->>>>>>> Stashed changes
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
-<<<<<<< Updated upstream
-=======
-import java.util.Objects;
->>>>>>> Stashed changes
import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.TS_NOT_PROCESS;
@@ -87,27 +44,16 @@
* @since 2023-05-19 17:48:02
*/
@Service("CodeReferconfigService")
-<<<<<<< Updated upstream
public class CodeReferConfigServiceImpl extends MPJBaseServiceImpl<CodeReferConfigMapper,CodeReferConfig> implements ICodeReferConfigService {
-=======
-public class CodeReferConfigServiceImpl extends MPJBaseServiceImpl<CodeReferConfigMapper,CodeReferConfig> implements CodeReferConfigService {
->>>>>>> Stashed changes
@Resource
private CodeReferConfigMapper codeReferconfigMapper;
@Resource
-<<<<<<< Updated upstream
private ICodeShowFieldConfigService ICodeShowFieldConfigService;
@Resource
private ICodeSrchCondConfigService ICodeSrchCondConfigService;
-=======
- private CodeShowFieldConfigService codeShowFieldConfigService;
-
- @Resource
- private CodeSrchCondConfigService codeSrchCondConfigService;
->>>>>>> Stashed changes
/**
* 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
@@ -121,27 +67,20 @@
return CodeReferConfigWraper.build().entityVO(codeReferConfig);
}
-<<<<<<< Updated upstream
/**
* 鍒嗛〉鏌ヨ
*
* @param bladeQueryObject 绛涢�夋潯浠�
* @return 鏌ヨ缁撴灉
*/
-=======
->>>>>>> Stashed changes
@Override
public IPage<CodeReferConfigVO> queryByJoinPage(BladeQueryObject bladeQueryObject) {
CodeReferConfig codeReferConfig = new CodeReferConfig();
// 鏍规嵁绉熸埛杩涜鍖哄垎瀵瑰簲鐨勫弬鐓ч厤缃�
Map<String, Object> conditionMap = bladeQueryObject.getConditionMap();
-<<<<<<< Updated upstream
// 鏌ヨ鎵�灞炵鎴蜂笅鐨勫拰寮�鍚叏灞�鐨勫弬鐓ч厤缃俊鎭�
conditionMap.put("tenantId",AuthUtil.getTenantId());
conditionMap.put("isOpenGlobal","true");
-=======
- conditionMap.put("tenantId",AuthUtil.getTenantId());
->>>>>>> Stashed changes
BeanMap beanMap = BeanMap.create(codeReferConfig);
beanMap.putAll(conditionMap);
// 娣诲姞榛樿鎺掑簭瀛楁,鏍规嵁鏃堕棿杩涜鎺掑簭
@@ -151,19 +90,10 @@
return CodeReferConfigWraper.build().pageVO(codeReferConfigs);
}
-<<<<<<< Updated upstream
-=======
- /**
- * 鍒嗛〉鏌ヨ
- *
- * @param codeReferConfigVO 绛涢�夋潯浠�
- * @return 鏌ヨ缁撴灉
- */
->>>>>>> Stashed changes
@Override
public List<CodeReferConfigVO> queryByList(CodeReferConfigVO codeReferConfigVO) {
codeReferConfigVO.setTenantId(AuthUtil.getTenantId());
- //MPJLambdaWrapper<CodeReferConfig> mpjLambdaWrapper = Map2MPJLambdaUtil.getMPJLambdaWrapper(bladeQueryObject.getConditionMap(), CodeReferConfig.class)
+ //MPJLambdaWrapper<CodeReferConfig> mpjLambdaWrapper = UBCSCondition.getMPJLambdaWrapper(bladeQueryObject.getConditionMap(), CodeReferConfig.class)
MPJLambdaWrapper<CodeReferConfig> mpjLambdaWrapper = getMPJLambdaWrapper()
.setEntity(codeReferConfigVO)
.orderBy(true, true, CodeReferConfig::getCreateTime);
@@ -184,7 +114,6 @@
if (StringUtils.isBlank(codeReferConfigVO.getReferType())){
throw new VciBaseException("鍙傜収閰嶇疆涓嶈兘涓虹┖");
}
-<<<<<<< Updated upstream
// Long count = countCodeReferConfig(codeReferConfigVO);
// if(count > 0){
// throw new VciBaseException("宸插瓨鍦ㄧ浉鍚岀殑鍙傜収閰嶇疆");
@@ -204,20 +133,6 @@
if(Func.isNotEmpty(codeReferConfig.getCodeSrchCondConfigs())){
ICodeSrchCondConfigService.insertBatch(codeReferConfigVO.getCodeSrchCondConfigVOS(),codeReferConfig.getOid());
}
-=======
- Long count = countCodeReferConfig(codeReferConfigVO);
- if(count > 0){
- throw new VciBaseException("宸插瓨鍦ㄧ浉鍚岀殑鍙傜収閰嶇疆");
- }
-
- CodeReferConfig CodeReferConfig = Objects.requireNonNull(BeanUtil.copy(codeReferConfigVO, CodeReferConfig.class));
- boolean resInsertReferConfig = this.codeReferconfigMapper.insert(CodeReferConfig) > 0;
- if (!resInsertReferConfig) {
- return R.fail("鏂板鍙傜収閰嶇疆澶辫触锛�");
- }
- codeShowFieldConfigService.insertBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
- codeSrchCondConfigService.insertBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
->>>>>>> Stashed changes
return R.data(codeReferConfigVO);
}
@@ -228,7 +143,6 @@
*/
private Long countCodeReferConfig(CodeReferConfigVO codeReferConfigVO) {
String templateName = codeReferConfigVO.getName();
-<<<<<<< Updated upstream
String templateId = codeReferConfigVO.getId();
if (StringUtils.isBlank(templateName) && StringUtils.isBlank(templateId)){
throw new VciBaseException("鍙傜収閰嶇疆缂栧彿鍜屽悕绉颁笉鑳戒负绌�");
@@ -240,14 +154,6 @@
.eq(CodeReferConfig::getIsOpenGlobal,"true") // 鏌ヨ寮�鍚叏灞�鐨勫弬鐓ч厤缃�
.eq(CodeReferConfig::getId,templateId)
.eq(CodeReferConfig::getName,templateName);
-=======
- if (StringUtils.isBlank(templateName)){
- throw new VciBaseException("鍙傜収閰嶇疆鍚嶇О涓嶈兘涓虹┖");
- }
- LambdaQueryWrapper<CodeReferConfig> wrapper = Wrappers.<CodeReferConfig>query()
- .lambda().eq(CodeReferConfig::getId, codeReferConfigVO.getId())
- .eq(CodeReferConfig::getTenantId, codeReferConfigVO.getTenantId());
->>>>>>> Stashed changes
Long count = codeReferconfigMapper.selectCount(wrapper);
return count;
}
@@ -259,7 +165,6 @@
private MPJLambdaWrapper<CodeReferConfig> getMPJLambdaWrapper(){
MPJLambdaWrapper<CodeReferConfig> mpjLambdaWrapper = new MPJLambdaWrapper<>(CodeReferConfig.class)
.selectAll(CodeReferConfig.class)
-<<<<<<< Updated upstream
// .select(CodeShowFieldConfig::getField
// ,CodeShowFieldConfig::getTitle
// ,CodeShowFieldConfig::getFieldType
@@ -272,20 +177,6 @@
// CodeSrchCondConfig::getFilterType,
// CodeSrchCondConfig::getFilterField,
// CodeSrchCondConfig::getFilterValue)
-=======
- // .select(CodeShowFieldConfig::getField
-// ,CodeShowFieldConfig::getTitle
-// ,CodeShowFieldConfig::getFieldType
-// ,CodeShowFieldConfig::getSort
-// ,CodeShowFieldConfig::getAttrSortField
-// ,CodeShowFieldConfig::getWidth
-// ,CodeShowFieldConfig::getFixedPosition
-// ,CodeShowFieldConfig::getTemplet)
-// .select(
-// CodeSrchCondConfig::getFilterType,
-// CodeSrchCondConfig::getFilterField,
-// CodeSrchCondConfig::getFilterValue)
->>>>>>> Stashed changes
.selectCollection(CodeShowFieldConfig.class, CodeReferConfig::getCodeShowFieldConfigs)
.selectCollection(CodeSrchCondConfig.class, CodeReferConfig::getCodeSrchCondConfigs)
.leftJoin(CodeShowFieldConfig.class, CodeShowFieldConfig::getReferConfigOid,CodeReferConfig::getOid)
@@ -306,13 +197,8 @@
if (!resUpdateReferConfig) {
return R.fail("鍙傜収閰嶇疆淇敼澶辫触锛�");
}
-<<<<<<< Updated upstream
this.ICodeShowFieldConfigService.updateBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
this.ICodeSrchCondConfigService.updateBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
-=======
- this.codeShowFieldConfigService.updateBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
- this.codeSrchCondConfigService.updateBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
->>>>>>> Stashed changes
return R.data(codeReferConfigVO);
}
@@ -336,13 +222,8 @@
if (!resDeleteReferConfig) {
return R.fail("鍙傜収閰嶇疆鍒犻櫎澶辫触锛�");
}
-<<<<<<< Updated upstream
this.ICodeShowFieldConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
this.ICodeSrchCondConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
-=======
- this.codeShowFieldConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
- this.codeSrchCondConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
->>>>>>> Stashed changes
return R.status(resDeleteReferConfig);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index a990d5f..870a915 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -17,10 +17,13 @@
package com.vci.ubcs.code.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
import com.vci.ubcs.code.dto.CodeRuleDTO;
@@ -40,10 +43,14 @@
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
@@ -96,15 +103,17 @@
@Resource
private RevisionModelUtil revisionModelUtil;
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @param conditionMap
+ * @return
+ */
@Override
- public IPage<CodeRuleVO> gridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule) {
- //瀵圭敓鍛藉懆鏈熺殑鏋氫妇杩涜杞崲
- if(!StringUtils.isEmpty(codeRule.getLcStatusText())){
- codeRule.setLcStatus(CodeRuleLC.getValueByText(codeRule.getLcStatusText()));
- }
- List<CodeRule> codeRulePage = codeRuleMapper.selectCodeRulePage(page, codeRule);
+ public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conditionMap) {
+ IPage<CodeRule> codeRuleIPage = this.codeRuleMapper.selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapper(conditionMap, CodeRule.class));
//do杞瑅o鍚屾椂setLcStatusText鐢熷懡鍛ㄦ湡鍊硷紝骞跺寘瑁呮垚鍒嗛〉瀵硅薄杩斿洖
- return page.setRecords(CodeRuleWrapper.build().listVO(codeRulePage));
+ return CodeRuleWrapper.build().pageVO(codeRuleIPage);
}
/**
@@ -278,7 +287,7 @@
*/
@Override
public Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) {
- List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().eq("codeRuleOid", oid));
+ List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getCodeRuleOid, oid));
return CodeClassifyWrapper.build().listVO(codeClassifies);
}
@@ -332,14 +341,13 @@
/**
* 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
*
- * @param codeRule 鏌ヨ鏉′欢
- * @param page 鍒嗛〉鍜屾帓搴�
+ * @param bladeQueryObject 鏌ヨ鏉′欢
* @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
* @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public IPage<CodeRuleVO> refDataGridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule) throws VciBaseException {
- return gridCodeRule(page, codeRule);
+ public IPage<CodeRuleVO> refDataGridCodeRule(BladeQueryObject bladeQueryObject) throws VciBaseException {
+ return gridCodeRule(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap());
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
index f779e61..577f289 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
@@ -1,29 +1,14 @@
package com.vci.ubcs.code.service.impl;
-<<<<<<< Updated upstream
-=======
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
->>>>>>> Stashed changes
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
-<<<<<<< Updated upstream
import com.vci.ubcs.code.service.ICodeShowFieldConfigService;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
import org.springframework.stereotype.Service;
-=======
-import com.vci.ubcs.code.service.CodeShowFieldConfigService;
-import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
-import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
-import org.springblade.core.mp.support.Query;
-import org.springframework.stereotype.Service;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
->>>>>>> Stashed changes
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -36,30 +21,12 @@
* @since 2023-05-19 17:58:56
*/
@Service("CodeShowFieldConfigService")
-<<<<<<< Updated upstream
public class CodeShowFieldConfigServiceImpl extends ServiceImpl<CodeShowFieldConfigMapper,CodeShowFieldConfig> implements ICodeShowFieldConfigService {
-=======
-public class CodeShowFieldConfigServiceImpl extends ServiceImpl<CodeShowFieldConfigMapper,CodeShowFieldConfig> implements CodeShowFieldConfigService {
->>>>>>> Stashed changes
@Resource
private CodeShowFieldConfigMapper codeShowFieldConfigMapper;
/**
-<<<<<<< Updated upstream
-=======
- * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
- *
- * @param oid 涓婚敭
- * @return 瀹炰緥瀵硅薄
- */
- @Override
- public CodeShowFieldConfig queryById(String oid) {
- return this.codeShowFieldConfigMapper.queryById(oid);
- }
-
- /**
->>>>>>> Stashed changes
* 鏂板鏁版嵁
*
* @param codeShowFieldConfig 瀹炰緥瀵硅薄
@@ -72,31 +39,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
-<<<<<<< Updated upstream
public boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS, String oid) {
List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS,oid);
boolean b = this.saveOrUpdateBatch(codeShowFieldConfigs);
return b;
}
-=======
- public boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
- List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS);
- boolean b = this.saveOrUpdateBatch(codeShowFieldConfigs);
- return b;
- }
-
- /**
- * 淇敼鏁版嵁
- *
- * @param codeShowFieldConfig 瀹炰緥瀵硅薄
- * @return 瀹炰緥瀵硅薄
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public boolean update(CodeShowFieldConfig codeShowFieldConfig) {
- return this.codeShowFieldConfigMapper.update(codeShowFieldConfig)>0;
- }
->>>>>>> Stashed changes
@Override
public boolean updateBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
index 274b050..31082d8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
@@ -1,42 +1,18 @@
package com.vci.ubcs.code.service.impl;
-<<<<<<< Updated upstream
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-=======
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.CodeShowFieldConfig;
->>>>>>> Stashed changes
import com.vci.ubcs.code.entity.CodeSrchCondConfig;
-import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
import com.vci.ubcs.code.mapper.CodeSrchCondConfigMapper;
-<<<<<<< Updated upstream
import com.vci.ubcs.code.service.ICodeSrchCondConfigService;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
-=======
-import com.vci.ubcs.code.service.CodeSrchCondConfigService;
-import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
-import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
-import org.apache.cxf.endpoint.ServerImpl;
->>>>>>> Stashed changes
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-<<<<<<< Updated upstream
import java.util.List;
-=======
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
->>>>>>> Stashed changes
/**
* 寮曠敤鐮佹锛屽弬鐓ч厤缃晫闈紝鏌ヨ鏉′欢閰嶇疆琛�(CodeSrchCondConfigService)琛ㄦ湇鍔″疄鐜扮被
@@ -45,11 +21,7 @@
* @since 2023-05-19 17:58:56
*/
@Service("CodeSrchCondConfigService")
-<<<<<<< Updated upstream
public class CodeSrchCondConfigServiceImpl extends ServiceImpl<CodeSrchCondConfigMapper, CodeSrchCondConfig> implements ICodeSrchCondConfigService {
-=======
-public class CodeSrchCondConfigServiceImpl extends ServiceImpl<CodeSrchCondConfigMapper, CodeSrchCondConfig> implements CodeSrchCondConfigService {
->>>>>>> Stashed changes
@Resource
private CodeSrchCondConfigMapper codeSrchcondconfigMapper;
@@ -66,29 +38,11 @@
}
@Override
-<<<<<<< Updated upstream
@Transactional(rollbackFor = Exception.class)
public boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS, String oid) {
List<CodeSrchCondConfig> codeSrchCondConfigs = CodeSrchCondConfigWraper.build().listDO(codeSrchCondConfigVOS,oid);
return this.saveOrUpdateBatch(codeSrchCondConfigs);
}
-=======
- public boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS) {
- List<CodeSrchCondConfig> codeSrchCondConfigs = CodeSrchCondConfigWraper.build().listDO(codeSrchCondConfigVOS);
- return this.saveOrUpdateBatch(codeSrchCondConfigs);
- }
-
- /**
- * 淇敼鏁版嵁
- *
- * @param codeSrchcondconfig 瀹炰緥瀵硅薄
- * @return 瀹炰緥瀵硅薄
- */
- @Override
- public boolean update(CodeSrchCondConfig codeSrchcondconfig) {
- return this.codeSrchcondconfigMapper.update(codeSrchcondconfig)>0;
- }
->>>>>>> Stashed changes
@Override
public boolean updateBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java
index 2e28e85..71efccf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java
@@ -1,17 +1,11 @@
package com.vci.ubcs.code.wrapper;
-<<<<<<< Updated upstream
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeReferConfig;
import com.vci.ubcs.code.enumpack.CodeReferConfigTypeEnum;
import com.vci.ubcs.code.vo.CodeReferConfigVO;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
-=======
-import com.vci.ubcs.code.entity.CodeReferConfig;
-import com.vci.ubcs.code.enumpack.CodeReferConfigTypeEnum;
-import com.vci.ubcs.code.vo.CodeReferConfigVO;
->>>>>>> Stashed changes
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
@@ -35,13 +29,9 @@
@Override
public CodeReferConfigVO entityVO(CodeReferConfig codeReferConfig) {
CodeReferConfigVO codeReferConfigVO = Objects.requireNonNull(BeanUtil.copy(codeReferConfig, CodeReferConfigVO.class));
-<<<<<<< Updated upstream
if(StringUtils.isNotBlank(codeReferConfig.getType())){
codeReferConfigVO.setTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_TYPE,codeReferConfig.getType()));
}
-=======
- codeReferConfigVO.setTypeText(CodeReferConfigTypeEnum.getTextByValue(codeReferConfig.getType()));
->>>>>>> Stashed changes
if(Func.isNotEmpty(codeReferConfig.getCodeSrchCondConfigs())){
codeReferConfigVO.setCodeSrchCondConfigVOS(CodeSrchCondConfigWraper.build().listVO(codeReferConfig.getCodeSrchCondConfigs()));
}
@@ -53,7 +43,6 @@
return codeReferConfigVO;
}
-<<<<<<< Updated upstream
public CodeReferConfig entityDO(CodeReferConfigVO codeReferConfigVO) {
CodeReferConfig codeReferConfig = Objects.requireNonNull(BeanUtil.copy(codeReferConfigVO, CodeReferConfig.class));
//codeReferConfig.setType(CodeReferConfigTypeEnum.getValueByText(codeReferConfigVO.getTypeText()));
@@ -68,6 +57,4 @@
return codeReferConfig;
}
-=======
->>>>>>> Stashed changes
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
index 5889ca9..5ecbcf5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
@@ -1,9 +1,6 @@
package com.vci.ubcs.code.wrapper;
-<<<<<<< Updated upstream
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-=======
->>>>>>> Stashed changes
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.entity.CodeSrchCondConfig;
import com.vci.ubcs.code.enumpack.CodeReferConfigFieldTypeEnum;
@@ -11,11 +8,8 @@
import com.vci.ubcs.code.vo.CodeReferConfigVO;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
-<<<<<<< Updated upstream
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
-=======
->>>>>>> Stashed changes
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -36,7 +30,6 @@
@Override
public CodeShowFieldConfigVO entityVO(CodeShowFieldConfig codeShowFieldConfig) {
CodeShowFieldConfigVO codeShowFieldConfigVO = Objects.requireNonNull(BeanUtil.copy(codeShowFieldConfig, CodeShowFieldConfigVO.class));
-<<<<<<< Updated upstream
if(StringUtils.isNotBlank(codeShowFieldConfig.getFixedPosition())){
codeShowFieldConfigVO.setFixedPositionText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FIXED,codeShowFieldConfig.getFixedPosition()));
}
@@ -50,17 +43,10 @@
CodeShowFieldConfig codeShowFieldConfig = entityDO(codeShowFieldConfigVO);
codeShowFieldConfig.setReferConfigOid(oid);
return codeShowFieldConfig;
-=======
- codeShowFieldConfigVO.setFieldTypeText(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfig.getField()));
- codeShowFieldConfigVO.setFixedPositionText(CodeReferConfigFixedEnum.getTextByValue(codeShowFieldConfig.getFixedPosition()));
-
- return codeShowFieldConfigVO;
->>>>>>> Stashed changes
}
public CodeShowFieldConfig entityDO(CodeShowFieldConfigVO codeShowFieldConfigVO) {
CodeShowFieldConfig codeShowFieldConfig = Objects.requireNonNull(BeanUtil.copy(codeShowFieldConfigVO, CodeShowFieldConfig.class));
-<<<<<<< Updated upstream
if(StringUtils.isNotBlank(codeShowFieldConfigVO.getFieldTypeText())){
codeShowFieldConfig.setFieldType(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFieldTypeText()));
}
@@ -77,13 +63,6 @@
return (List)codeShowFieldConfigVOS.stream().map(item->entityDOsetReferConfigOid(item,oid)).collect(Collectors.toList());
}
-=======
- codeShowFieldConfig.setFieldType(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFieldTypeText()));
- codeShowFieldConfig.setFixedPosition(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFixedPositionText()));
- return codeShowFieldConfig;
- }
-
->>>>>>> Stashed changes
public List<CodeShowFieldConfig> listDO(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
return (List)codeShowFieldConfigVOS.stream().map(this::entityDO).collect(Collectors.toList());
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
index 01e36ad..1ab477f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
@@ -1,9 +1,6 @@
package com.vci.ubcs.code.wrapper;
-<<<<<<< Updated upstream
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-=======
->>>>>>> Stashed changes
import com.vci.ubcs.code.entity.CodeReferConfig;
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.entity.CodeSrchCondConfig;
@@ -12,11 +9,8 @@
import com.vci.ubcs.code.vo.CodeReferConfigVO;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
-<<<<<<< Updated upstream
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
-=======
->>>>>>> Stashed changes
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -37,7 +31,6 @@
@Override
public CodeSrchCondConfigVO entityVO(CodeSrchCondConfig codeSrchCondConfig) {
CodeSrchCondConfigVO codeSrchCondConfigVO = Objects.requireNonNull(BeanUtil.copy(codeSrchCondConfig, CodeSrchCondConfigVO.class));
-<<<<<<< Updated upstream
if(StringUtils.isNotBlank(codeSrchCondConfigVO.getFilterType())){
codeSrchCondConfigVO.setFilterTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FILTER_TYPE,codeSrchCondConfig.getFilterType()));
}
@@ -56,15 +49,6 @@
codeSrchCondConfig.setFilterType(CodeReferConfigFieldTypeEnum.getTextByValue(codeSrchCondConfigVO.getFilterTypeText()));
}
codeSrchCondConfig.setReferConfigOid(codeSrchCondConfigVO.getOid());
-=======
- codeSrchCondConfigVO.setFilterTypeText(CodeReferConfigFilterTypeEnum.getTextByValue(codeSrchCondConfig.getFilterType()));
- return codeSrchCondConfigVO;
- }
-
- public CodeSrchCondConfig entityDO(CodeSrchCondConfigVO codeSrchCondConfigVO) {
- CodeSrchCondConfig codeSrchCondConfig = Objects.requireNonNull(BeanUtil.copy(codeSrchCondConfigVO, CodeSrchCondConfig.class));
- codeSrchCondConfig.setFilterType(CodeReferConfigFieldTypeEnum.getTextByValue(codeSrchCondConfigVO.getFilterTypeText()));
->>>>>>> Stashed changes
return codeSrchCondConfig;
}
@@ -72,11 +56,8 @@
return (List)codeSrchCondConfigVOS.stream().map(this::entityDO).collect(Collectors.toList());
}
-<<<<<<< Updated upstream
public List<CodeSrchCondConfig> listDO(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS,String oid) {
return (List)codeSrchCondConfigVOS.stream().map(item->entityDOsetReferConfigOid(item,oid)).collect(Collectors.toList());
}
-=======
->>>>>>> Stashed changes
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
index 67e62cf..7ea9a51 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
@@ -13,6 +13,7 @@
configuration:
map-underscore-to-camel-case: false
+
######搴旂敤鍩烘湰閰嶇疆
#app:
# name: web
@@ -73,5 +74,4 @@
# system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
# #MPM鏋氫妇鍊煎睘鎬ф槧灏�
# mpmEnumMap: {partType: [{enumValue: 1,enumText: 浜у搧},{enumValue: 2,enumText: 浜у搧},{'enumValue': 3,enumText: 鏍囧噯浠秨,{'enumValue': 7,enumText: 鏉愭枡}]}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
index abccd66..676ea36 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
@@ -115,24 +115,18 @@
<!--鏌ヨ鎸囧畾琛屾暟鎹�-->
<select id="selectJoinPage" resultMap="CodeReferconfigMap">
SELECT
- PCR.*
+ PCR.*
FROM PL_CODE_REFERCONFIG PCR
<where>
<if test="codeReferConfig.tenantId != null and codeReferConfig.tenantId != ''">
PCR.TENANTID = #{codeReferConfig.tenantId}
</if>
-<<<<<<< Updated upstream
<if test="codeReferConfig.isOpenGlobal != null and codeReferConfig.isOpenGlobal != ''">
OR PCR.ISOPENGLOBAL = #{codeReferConfig.isOpenGlobal}
</if>
<if test="codeReferConfig.name != null and codeReferConfig.name != ''">
and NAME like CONCAT(CONCAT('%', #{codeReferConfig.name}), '%')
</if>
-=======
- <if test="codeReferConfig.name != null and codeReferConfig.name != ''">
- and NAME like CONCAT(CONCAT('%', #{codeReferConfig.name}), '%')
- </if>
->>>>>>> Stashed changes
<if test="codeReferConfig.id != null and codeReferConfig.id != ''">
and ID like CONCAT(CONCAT('%', #{codeReferConfig.id}), '%')
</if>
@@ -141,37 +135,33 @@
<select id="selectShowFieldByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeShowFieldConfig">
SELECT temp.* FROM (
- SELECT
- PCS.REFERCONFIGOID,
- PCS.FIELD,
- PCS.TITLE,
- PCS.FIELDTYPE,
- PCS.SORT,
- PCS.ATTRSORTFIELD,
- PCS.WIDTH,
- PCS.FIXEDPOSITION,
-<<<<<<< Updated upstream
- PCS.TEMPLET,
- PCS.ISQUERY
-=======
- PCS.TEMPLET
->>>>>>> Stashed changes
- FROM PL_CODE_REFERCONFIG PCR
- LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
- temp WHERE temp.REFERCONFIGOID = #{oid}
+ SELECT
+ PCS.REFERCONFIGOID,
+ PCS.FIELD,
+ PCS.TITLE,
+ PCS.FIELDTYPE,
+ PCS.SORT,
+ PCS.ATTRSORTFIELD,
+ PCS.WIDTH,
+ PCS.FIXEDPOSITION,
+ PCS.TEMPLET,
+ PCS.ISQUERY
+ FROM PL_CODE_REFERCONFIG PCR
+ LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
+ temp WHERE temp.REFERCONFIGOID = #{oid}
</select>
<select id="selectSrchCondByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeSrchCondConfig">
SELECT temp.*
- FROM
+ FROM
(SELECT
- PCSR.FILTERFIELD,
- PCSR.FILTERTYPE,
- PCSR.FILTERVALUE,
- PCSR.REFERCONFIGOID
- FROM PL_CODE_REFERCONFIG PCR
- LEFT JOIN PL_CODE_SRCHCONDCONFIG PCSR ON PCSR.REFERCONFIGOID = PCR.OID)
- temp WHERE temp.REFERCONFIGOID = #{oid}
+ PCSR.FILTERFIELD,
+ PCSR.FILTERTYPE,
+ PCSR.FILTERVALUE,
+ PCSR.REFERCONFIGOID
+ FROM PL_CODE_REFERCONFIG PCR
+ LEFT JOIN PL_CODE_SRCHCONDCONFIG PCSR ON PCSR.REFERCONFIGOID = PCR.OID)
+ temp WHERE temp.REFERCONFIGOID = #{oid}
</select>
</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
index 4b7a621..c5f1306 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
@@ -19,7 +19,6 @@
import com.vci.ubcs.omd.wrapper.AttributeWrapper;
import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
import com.vci.ubcs.starter.web.constant.OmdRegExpConstant;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
index 9741d8a..6bd5b0d 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
@@ -18,8 +18,8 @@
import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import com.vci.ubcs.omd.wrapper.RevisionRuleWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
import com.vci.ubcs.starter.util.MybatisParameterUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
@@ -382,7 +382,7 @@
//妫�鏌ヤ笟鍔＄被鍨�
Collection<Collection<String>> oidCollections = VciBaseUtil.switchCollectionForOracleIn(oidCollection);
for(Collection<String> oids : oidCollections) {
- MPJLambdaWrapper<BtmType> join = Map2MPJLambdaUtil.getMPJLambdaWrapper(new BtmType())
+ MPJLambdaWrapper<BtmType> join = UBCSCondition.getMPJLambdaWrapper(new BtmType())
.join("join", RevisionRule.class, RevisionRule::getId, BtmType::getRevisionRuleId)
.in(RevisionRule::getOid, oids);
Long count = btmTypeMapper.selectCount(join);
@@ -404,7 +404,7 @@
public List<BtmTypeVO> listRevisionRuleUsedInfo(String pkRevisionRule) throws VciBaseException {
VciBaseUtil.alertNotNull(pkRevisionRule,"鐗堟湰瑙勫垯瀵硅薄鐨勪富閿�");
List<BtmType> result = btmTypeMapper.selectList(
- Map2MPJLambdaUtil.getMPJLambdaWrapper(new BtmType())
+ UBCSCondition.getMPJLambdaWrapper(new BtmType())
.join("join", RevisionRule.class, RevisionRule::getId, BtmType::getRevisionRuleId)
.eq(RevisionRule::getOid, pkRevisionRule));
return BtmTypeWrapper.build().listEntityVO(result);
--
Gitblit v1.9.3