From d370c5b1f2c33f8599db7ece89b484613b594f60 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 15 九月 2023 08:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/docking/data.vue                                                                                      |    5 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java                     |    6 
 Source/UBCS-WEB/src/components/refer/vciWebRefer.vue                                                                            |    1 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java             |    5 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java                |   20 +-
 Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue                                                               |  147 +++---------------
 Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue                                                               |   47 +++++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java                 |    9 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java                        |   14 +
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue                                                                    |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java                     |   11 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml                                             |   10 +
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java |   18 +
 Source/UBCS-WEB/src/views/docking/task.vue                                                                                      |    5 
 Source/UBCS-WEB/src/views/docking/loge.vue                                                                                      |    8 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java                     |   11 +
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java                          |   46 +++++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java                       |    6 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java                  |   74 +++++++--
 Source/UBCS-WEB/src/api/docking/loge.js                                                                                         |    4 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java                  |    6 
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java                           |    3 
 22 files changed, 268 insertions(+), 190 deletions(-)

diff --git a/Source/UBCS-WEB/src/api/docking/loge.js b/Source/UBCS-WEB/src/api/docking/loge.js
index 3b758e6..4553623 100644
--- a/Source/UBCS-WEB/src/api/docking/loge.js
+++ b/Source/UBCS-WEB/src/api/docking/loge.js
@@ -1,13 +1,13 @@
 import request from '@/router/axios';
 
-export const getList = (page, size, params) => {
+export const getList = (page, limit, params) => {
   return request({
     url: '/api/ubcs-code/dockingManagement/gridLoge',
     method: 'get',
     params: {
       ...params,
       page,
-      size
+      limit
     }
   })
 }
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 9de85e8..4eb070b 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -221,7 +221,7 @@
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
           value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
-            ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
+            (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           tip: formItem.tooltips,
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 652907c..0b17c75 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -60,7 +60,7 @@
 <!--      鍏敤妯″潡-->
 <!--      杈撳叆鍐呭-->
       <el-form-item size="small" v-if="shouldShowInput">
-        <el-input v-model="formInline.text" placeholder="璇疯緭鍏ュ唴瀹�" @keyup.enter.native="SaveHandler"></el-input>
+        <el-input v-model="formInline.text" placeholder="鎸変笅鍥炶溅閿繘琛屾煡璇紒" @keyup.enter.native="SaveHandler"></el-input>
       </el-form-item>
 <!--      鏌ヨ鎸夐挳-->
       <el-form-item size="small" v-if="shouldShowButton">
@@ -117,13 +117,50 @@
     },
     SaveHandler(){
       let name = this.SearchObject.searchData[this.formInline.type].prop;
-      getList(this.page.currentPage, this.page.pageSize, { [`conditionMap['${name}_like']`]: this.formInline.text}).then(res => {
+      getList(this.page.currentPage, this.page.pageSize, { [`conditionMap[${name}_like]`]: this.formInline.text}).then(res => {
         console.log(res);
       });
     },
-    handleSearch(){
-      let formattedDate = this.$moment(this.formInline.Date).format('YYYY-M-D');
-      console.log('formattedDate',formattedDate);
+    handleSearch() {
+      const { type, typeFlag, stateFlag, stateTaskDataFlag, dateFlag, lastDateFlag ,sendTypeFlga} = this.status;
+      const { currentPage, pageSize } = this.page;
+      const { cut, state, stateTask, Date, lastDate, taskCut } = this.formInline;
+      const requestParams = {};
+      // 闆嗘垚鏃ュ織绫诲瀷
+      if (type === 'loge' && typeFlag) {
+        requestParams['conditionMap[type_like]'] = cut;
+      }
+      // 闆嗘垚鏃ュ織鏄惁鎴愬姛
+      if (type === 'loge' && stateFlag) {
+        requestParams['conditionMap[interfaceStatus_like]'] = state;
+      }
+      // 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔�  闆嗘垚鏁版嵁  鏄惁鍒嗚В浠诲姟
+      if ((type === 'task' || type === 'data') && stateTaskDataFlag) {
+        requestParams['conditionMap[sendFlag_like]'] = stateTask;
+      }
+      // 闆嗘垚浠诲姟 鍒涘缓鏃ユ湡 鍜� 闆嗘垚鏃ュ織 璁板綍鏃堕棿
+      if ((type === 'loge' || type === 'task') && dateFlag) {
+        const formattedDate = this.$moment(Date).format('YYYY-M-D');
+        requestParams['conditionMap[createTime_like]'] = formattedDate;
+      }
+      // 闆嗘垚浠诲姟 鏈�鍚庢帹閫佹椂闂�
+      if (type === 'task' && lastDateFlag) {
+        const formattedDate = this.$moment(lastDate).format('YYYY-M-D');
+        requestParams['conditionMap[lastModifyTime_like]'] = formattedDate;
+      }
+      // 闆嗘垚浠诲姟 闆嗘垚鏁版嵁 鎺ㄩ�佺被鍨�
+      if ((type === 'task' || type === 'data') && sendTypeFlga) {
+        requestParams['conditionMap[sendType_like]'] = taskCut;
+      }
+      // 璇锋眰
+      getList(currentPage, pageSize, requestParams).then(res => {
+        if(!res.data.data.records){
+          this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�')
+        }else {
+          let Data=res.data.data.records;
+          this.$emit('getList',Data)
+        }
+      });
     }
   }
 }
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index fa4a1bd..7aab2aa 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -17,6 +17,7 @@
   components: {vciWebReferTree, vciWebReferTable, vciWebReferDefalut},
   data() {
     return {
+      reterTypeLeavl:'213',
       refertype: this.referConfig.options.type,
       emitData:{},
       title:'',
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index c556696..e249724 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -16,7 +16,7 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot-scope="scope" slot="menuLeft">
-        <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status"></vci-docking-search>
+        <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status" @getList="dockingGetList"></vci-docking-search>
       </template>
     </avue-crud>
   </basic-container>
@@ -189,6 +189,9 @@
     }
   },
   methods: {
+    dockingGetList(val){
+      this.data=val;
+    },
     async cellDbClick(row, column, cell, event) {
       for (const key in row) {
         if (key === column.property) {
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 37333e4..2de73b5 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -3,7 +3,7 @@
   <basic-container>
     <avue-crud :option="option"
                :table-loading="loading"
-               :data="data"
+               :data="data || getList"
                :page.sync="page"
                :permission="permissionList"
                ref="crud"
@@ -16,7 +16,7 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot-scope="scope" slot="menuLeft">
-        <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status"></vci-docking-search>
+        <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status" @getList="dockingGetList"></vci-docking-search>
       </template>
     </avue-crud>
   </basic-container>
@@ -218,6 +218,10 @@
     }
   },
   methods: {
+    dockingGetList(val){
+      console.log(val,'val')
+      this.data=val;
+    },
     async cellDbClick(row, column, cell, event) {
       for (const key in row) {
         if (key === column.property) {
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index fd99ef0..2d637e1 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -23,7 +23,7 @@
                      @click="handleSend">鎵嬪姩鎺ㄩ��
           </el-button>
         <div style="float: right;margin-left: 10px">
-          <vci-docking-search :formInline="formInline" :SearchObject="SearchObject" :page="page" :status="status"></vci-docking-search>
+          <vci-docking-search :formInline="formInline" :SearchObject="SearchObject" :page="page" :status="status" @getList="dockingGetList"></vci-docking-search>
         </div>
       </template>
     </avue-crud>
@@ -242,6 +242,9 @@
     }
   },
   methods: {
+    dockingGetList(val){
+      this.data=val;
+    },
     async cellDbClick(row, column, cell, event) {
       for (const key in row) {
         if (key === column.property) {
diff --git a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
index 64471d3..aa9b662 100644
--- a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
+++ b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
@@ -312,12 +312,6 @@
       checkboxedit:"",
       // 鐢ㄤ簬鍒ゆ柇鏄惁鏄紪杈�
       editFlag:false
-    //  鑷充簬涓轰粈涔堟病鍦ㄧ敤鎴烽�夋嫨蹇呭~绉嶇被澶т簬缁勫悎鏂瑰紡鐨勬椂鍊欙紝缁欎笅鎷夎彍鍗曢�変腑鐨勬暟鎹竻绌轰簡锛岃繖鏍锋瘮缁欎簣寮圭獥鎻愰啋鏇村悎鐞�
-    //  鍘熷洜鏄壘浜嗗ソ涔呮病鎵惧埌avue妗嗘灦杩欎釜閫変腑鐨勫睘鎬ф樉绀哄湪椤甸潰鎬庝箞淇敼锛岀洿鎺ヤ慨鏀逛笅鎷夎彍鍗曟暟鎹殑value娌℃晥鏋滐紝鎵句笉鍒版槸浠�涔堟帶鍒惰繖椤甸潰鏄剧ず鐨勯�変腑鏁版嵁
-    //  鎴戝皾璇曞湪dicdata澶栭潰瀹氫箟value淇敼涓嬫媺鑿滃崟鏄剧ず鐨勯粯璁ゅ�间篃涓嶈锛岀劧鍚庡啀灏濊瘯璋冪敤avue鐨刢lose娓呴櫎鏂规硶锛屼絾鏄篃鏄彧鑳藉疄鐜板湪涓嬫媺鑿滃崟鍚庨潰鏄剧ず涓�涓猉鍙�
-    //  褰撶敤鎴锋墜鍔ㄧ偣鍑绘竻闄わ紝鎵嶅彲浠ユ妸鏁版嵁娓呴櫎锛屾�昏�岃█涔嬫壘浜嗗ソ涔咃紝娌℃壘鍒拌繖涓竻闄ゆ柟娉曪紝avue鐨勮鏄庢枃妗d篃娌℃槑纭爣鏄庤繖涓姛鑳界殑鍐呯疆鎿嶄綔鏂规硶
-    //  鎴戞兂鍒扮殑搴旇鍙互鐨勬柟娉曟槸锛岃垗寮僶ption閲岄潰鐨勭粍鍚堟柟寮忥紝鑷繁鎵嬪姩鍦ㄩ〉闈㈡坊鍔犳彃妲藉畾涔夌粍鍚堟柟寮忥紝鑷充簬鏄娇鐢╝vue杩樻槸element-ui鏉ュ啓锛岃繕瑕佺湅鍏蜂綋鐨勬楠�
-    //  鍥犱负涓�鏀瑰姩锛屾垜鐜板湪鍐欑殑閫昏緫姣斿涓嬫媺鑿滃崟绂佺敤鍜岀瓥鐣ラ獙璇佺瓑绛夎閲嶆柊姊崇悊锛屾垜杩欒竟鎬ョ潃璧跺璞″缓妯$殑杩涘害锛屾墍浠ュ厛鐢ㄨ繖绉嶆柟寮忔潵澶勭悊锛屽鏋滄垜鍥炲ご鏈夋椂闂存垜鍐嶆潵缁х画鏀癸紝灏辨病鏈夎繖鏉℃敞閲婁簡銆�
     }
 
   },
@@ -336,125 +330,36 @@
       //   console.log("澶т簬")
       // }
     },
-    handleCheckboxChange(val){
-      const arr=this.option.column[5];
-      this.checkboxlength=val.value;
-      //娣诲姞鐨勬椂鍊檆heckboxlength鏄竴涓暟缁勶紝鍒颁簡缂栬緫浠栧氨鏄竴涓瓧绗︿覆锛屽鏋滄垜鎴戠洿鎺ヨ浆鎹负鏁扮粍锛屽洜涓烘湰鏉ュ氨鏄暟缁勬墍浠ョ偣鍑绘坊鍔犵殑鏃跺�欎細鎶ラ敊
-      //濡傛灉鎴戝彉鎴愬瓧绗︿覆鍚庡啀杞暟缁�,娣诲姞涓嶄細鎶ラ敊浜�,浣嗘槸缂栬緫鐨勬椂鍊欏氨鍙堜細鎶ラ敊浜�,鏈潵灏辨槸瀛楃涓插張璧颁簡涓�閬峵ostring
-      this.checkboxedit=this.checkboxlength.toString().split(",")
-      if(val.value != undefined && val.value != null){
-        if(this.checkboxlist == val.value){
-        //  鍒ゆ柇鐩哥瓑鍒欎笉鎿嶄綔锛屼笉绛夊垯閲嶆柊鎵ц銆傚姞杩欏眰鍒ゆ柇鏄洜涓篶hange浜嬩欢瑙﹀彂涓ゆ锛屼細鍑虹幇涓や釜娑堟伅鎻愮ず妗�
-        //  瀹氫箟checkboxlist鍙橀噺,瀛樺偍鐨勬敼鍙樼殑鍊�,濡傛灉鍊兼敼鍙樺拰鍙橀噺鐩哥瓑鍒欎笉闇�瑕佷换浣曟搷浣�
-        }else {
-          this.checkboxlist=val.value
-          if( this.selectlength.value >= val.value.length && val.value.length > 0 ){
-            this.$message({
-              message: '蹇呭~绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�',
-              type: 'warning',
-              showClose: true,
-            });
-          }else if(this.selectlength.value >= this.checkboxedit.length  && this.checkboxedit.length > 0 ){
-            this.$message({
-              message: '蹇呭~绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�',
-              type: 'warning',
-              showClose: true,
-            });
+    handleCheckboxChange(val) {
+      const arr = this.option.column[5];
+      this.checkboxlength = val.value;
+      this.checkboxedit = this.checkboxlength.toString().split(",");
+
+      if (val.value != undefined && val.value != null) {
+        if (this.checkboxlist == val.value) {
+        } else {
+          this.checkboxlist = val.value;
+          if (
+            this.selectlength.value >= val.value.length &&
+            val.value.length > 0
+          ) {
+            this.showMessage("蹇呭~绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�");
+          } else if (
+            this.selectlength.value >= this.checkboxedit.length &&
+            this.checkboxedit.length > 0
+          ) {
+            this.showMessage("蹇呭~绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�");
           }
         }
-          // if(this.checkboxeditlist == val.value){
-          // //  tong
-          // }else {
-          //   this.checkboxeditlist=val.value
-          //   if(this.selectlength.value >= this.checkboxedit.length  && this.checkboxedit.length > 0){
-          //     this.$message({
-          //       message: '蹇呭~绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�',
-          //       type: 'warning',
-          //       showClose: true,
-          //     });
-          //   }
-          // }
-        //  if(this.selectlength.value >= this.checkboxedit.length  && this.checkboxedit.length > 0){
-        //   this.$message({
-        //     message: '蹇呭~绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�',
-        //     type: 'warning',
-        //     showClose: true,
-        //   });
-        // }
       }
-      // 杩欓噷涓�鐩存姤length鐨勯敊璇�
-      // arr.forEach((item,index)=>{
-      //   console.log(item,index)
-      //   if(val.value != undefined && val.value != null && val.value.length==0){
-      //     item.disabled=false
-      //   }
-      //   if(val.value != undefined && val.value != null && val.value.length>=1){
-      //
-      //    }
-      // })
-      // if(val.value != undefined && val.value != null && val.value.length >= 0){
-      //   arr.dicData[val.value.length-1].disabled=true
-      // }
-      // }else if(val.value != undefined && val.value != null && val.value.length ==0){
-      //   arr.dicData.disabled=false
-      // }
-      if(val.value != undefined && val.value != null && val.value.length == 1){
-        arr.dicData[0].disabled=false
-        arr.dicData[1].disabled=true
-        arr.dicData[2].disabled=true
-        arr.dicData[3].disabled=true
-      }else if(val.value != undefined && val.value != null && val.value.length ==2){
-        arr.dicData[0].disabled=false
-        arr.dicData[1].disabled=false
-        arr.dicData[2].disabled=true
-        arr.dicData[3].disabled=true
-      }else if(val.value != undefined && val.value != null && val.value.length ==3){
-        arr.dicData[0].disabled=false
-        arr.dicData[1].disabled=false
-        arr.dicData[2].disabled=false
-        arr.dicData[3].disabled=true
-      }else if(val.value != undefined && val.value != null && val.value.length==4){
-        arr.dicData[0].disabled=false
-        arr.dicData[1].disabled=false
-        arr.dicData[2].disabled=false
-        arr.dicData[3].disabled=false
-      }else if(val.value != undefined && val.value != null && val.value.length==0  ){
-         arr.dicData[0].disabled=true
-         arr.dicData[1].disabled=true
-         arr.dicData[2].disabled=true
-         arr.dicData[3].disabled=true
-      }else if(this.checkboxNumber.length!=0){
-        arr.dicData[0].disabled=false
-        arr.dicData[1].disabled=false
-        arr.dicData[2].disabled=false
-        arr.dicData[3].disabled=false
+      const disabledCount = Math.min(this.checkboxedit.length, 4);
+      for (let i = 0; i < arr.dicData.length; i++) {
+        arr.dicData[i].disabled = i >= disabledCount;
       }
-      if(this.editFlag == true){
-        if(this.checkboxedit.length == 1){
-          arr.dicData[0].disabled=false
-          arr.dicData[1].disabled=true
-          arr.dicData[2].disabled=true
-          arr.dicData[3].disabled=true
-        }else if(this.checkboxedit.length == 2){
-          arr.dicData[0].disabled=false
-          arr.dicData[1].disabled=false
-          arr.dicData[2].disabled=true
-          arr.dicData[3].disabled=true
-        }else if(this.checkboxedit.length ==3){
-          arr.dicData[0].disabled=false
-          arr.dicData[1].disabled=false
-          arr.dicData[2].disabled=false
-          arr.dicData[3].disabled=true
-        }else if(this.checkboxedit ==4){
-          arr.dicData[0].disabled=false
-          arr.dicData[1].disabled=false
-          arr.dicData[2].disabled=false
-          arr.dicData[3].disabled=false
-        }else if(this.checkboxedit.length ==0){
-          arr.dicData[0].disabled=true
-          arr.dicData[1].disabled=true
-          arr.dicData[2].disabled=true
-          arr.dicData[3].disabled=true
+      if (this.editFlag == true) {
+        const disabledCount = Math.min(this.checkboxedit.length, 4);
+        for (let i = 0; i < arr.dicData.length; i++) {
+          arr.dicData[i].disabled = i >= disabledCount;
         }
       }
     },
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
index 1f63213..64b0fc0 100644
--- 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
@@ -1,16 +1,19 @@
 package com.vci.ubcs.starter.util;
 
+import com.alibaba.cloud.commons.lang.StringUtils;
 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 com.vci.ubcs.starter.web.util.VciBaseUtil;
 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.HashMap;
 import java.util.Map;
 
 /**
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
index d755111..bc1eb1f 100644
--- 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
@@ -248,8 +248,52 @@
 			});
 		}
 	}
+	public static  MPJLambdaWrapper buildConditionByMapString(Map<String, String> query) {
+		MPJLambdaWrapper<?>qw=new MPJLambdaWrapper<>();
+		if (!Func.isEmpty(query)) {
+			query.forEach((k, v) -> {
+				if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+					if (k.endsWith("_like")) {
+						qw.like(getColumn(k, "_like"), 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.eq(getColumn(k, "_equal"), v);
+					}
 
-
+				}
+			});
+		};
+		return qw;
+	}
 	public static void buildConditionByMapString(Map<String, String> query, MPJLambdaWrapper<?> qw) {
 		if (!Func.isEmpty(query)) {
 			query.forEach((k, v) -> {
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
index 113b4af..49df7b6 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -7,6 +7,7 @@
 import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient;
 import com.vci.ubcs.code.applyjtcodeservice.service.*;
 import com.vci.ubcs.code.applyjtcodeservice.vo.*;
+import com.vci.ubcs.code.feign.IMdmEngineClient;
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
 import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
@@ -14,6 +15,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RestController;
@@ -62,7 +64,8 @@
 	 */
 	private final IGroupMdmInterService groupMdmInterService;
 
-
+	@Autowired(required = false)
+	private IMdmEngineClient mdmEngineClient;
 	/***
 	 * 鐢宠闆嗗洟缂栫爜
 	 * @return
@@ -81,7 +84,7 @@
 	@Override
 	public R receiveEditApply(String oids, String btmName) {
 		try {
-			return groupMdmInterService.applyGroupCode(oids,btmName);
+			return groupMdmInterService.receiveEditApply(oids,btmName);
 		}catch (Throwable e){
 			return R.fail("闆嗗洟鐮佹暟鎹慨鏀瑰け璐ワ細"+e.getMessage());
 		}
@@ -159,18 +162,23 @@
 				//杩斿洖缁撴灉淇℃伅
 				dockingPreApplyForm.setContent(jcontent.toJSONString());
 				dockingPreApplyFormList.add(dockingPreApplyForm);
+				String jdataid = dockingPreApplyForm.getDataOid();
+				String jdatabtmname = dockingPreApplyForm.getDataBtmName();
 				if (res) {
-					String jdataid = dockingPreApplyForm.getDataOid();
-					String jdatabtmname = dockingPreApplyForm.getDataBtmName();
+
 					//姝ゅ闇�瑕佹煡璇笟鍔℃暟鎹紝鍘绘洿鏀�
 					BaseModel baseModel = new BaseModel();
 					baseModel.setId(customCoding);
 					log.info("鐢宠鍗�:"+applyId+",闆嗗洟鐮侊細"+customCoding+"缂栫爜锛�"+baseModel.getId());
 					editObjectList.add(baseModel);
 				}
+				List<String> dataOidList=new ArrayList<>();
+				dataOidList.add(jdataid);
+				//璋冪敤涓绘暟鎹湇鍔℃壒閲忎繚瀛樻帴鍙�
+				mdmEngineClient.updateBatchByType(jdatabtmname,editObjectList);
 			}
 			dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
-			//璋冪敤涓绘暟鎹湇鍔℃壒閲忎繚瀛樻帴鍙�
+
 		}catch (Throwable e){
 			e.printStackTrace();
 			return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐�"+e);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
index 52d55bb..1e4f607 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -25,6 +25,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -240,12 +241,16 @@
 
 	/**
 	 * 闆嗗洟/浼佷笟鐮佹鍒ゆ柇
-	 * @param parameter 浼犲叆鏁版嵁 ,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣锛宱id锛氶�夋嫨鑺傜偣鐨刼id--锛宯owApplyCode锛氬綋鍓嶇敵璇风紪鐮佺殑鍒嗙被
+	 * @param classifyGroupCode 浼犲叆鏁版嵁 ,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣
+	 * @param oid 浼犲叆鏁版嵁 ,閫夋嫨鑺傜偣鐨刼id--锛宯owApplyCode锛氬綋鍓嶇敵璇风紪鐮佺殑鍒嗙被
 	 * @return 鎵ц缁撴灉
 	 */
 	@GetMapping("/checkGroupCode")
 	@VciBusinessLog(operateName = "闆嗗洟/浼佷笟鐮佹鍒ゆ柇")
-	public R checkGroupCode(Map<String,String> parameter) throws Exception {
-		return R.data(mdmEngineService.checkGroupCode(parameter));
+	public R checkGroupCode(String oid,String  classifyGroupCode) throws Exception {
+		Map<String,String> codtionMap=new HashMap<>();
+		codtionMap.put("oid",oid);
+		codtionMap.put("classifyGroupCode",classifyGroupCode);
+		return mdmEngineService.checkGroupCode(codtionMap);
 	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index 93fa594..e73f0da 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -1,7 +1,9 @@
 package com.vci.ubcs.code.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
 import com.vci.ubcs.code.dto.DockingSystemDTO;
 import com.vci.ubcs.code.dto.DockingTaskDTO;
@@ -11,6 +13,7 @@
 import com.vci.ubcs.code.vo.pagemodel.*;
 import com.vci.ubcs.code.wrapper.*;
 import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
 import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,8 +21,10 @@
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -53,14 +58,21 @@
 	private final 	ICodeDuckingSyncService codeDuckingSyncService;
 
 	/**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
-	 * @param dockingSystem 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 *@return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
 	 */
 	@GetMapping("/gridDockingSystem")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "鍒嗛〉", notes = "dockingSystem")
-	public R<IPage<DockingSystemVO>> page(DockingSystem dockingSystem, Query query) {
-		IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSystem));
+	@ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
+	public R<IPage<DockingSystemVO>> page(BaseQueryObject queryObject) {
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
+		IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
 		return R.data(DockingSystemWrapper.build().pageVO(pages));
 	}
 
@@ -104,14 +116,21 @@
 	}
 	/**
 	 * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
-	 * @param dockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridSystemConfig")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "dockingSystemConfig")
-	public R<IPage<DockingSystemConfigVO>> gridSystemConfig(DockingSystemConfig dockingSystemConfig, Query query){
-		IPage<DockingSystemConfigVO>  pages=dockingSystemConfigService.page(dockingSystemConfig,query);
+	public R<IPage<DockingSystemConfigVO>> gridSystemConfig(BaseQueryObject queryObject){
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
+		IPage<DockingSystemConfigVO>  pages=dockingSystemConfigService.page(condtionMap,query);
 		return R.data(pages);
 	}
 
@@ -180,41 +199,62 @@
 
 	/**
 	 * 寰呴泦鎴愭暟鎹�
-	 * @param dockingData 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridDockingData")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "DockingDataVO")
-	public R<IPage<DockingDataVO>> gridDockingData(DockingData dockingData, Query query){
-		IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(dockingData,query);
+	public R<IPage<DockingDataVO>> gridDockingData(BaseQueryObject queryObject){
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
+		IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query);
 		return R.data(pages);
 	}
 
 
 	/**
 	 * data鍒楄〃
-	 * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
 	 */
 	@GetMapping("/gridDockingTask")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "鍒嗛〉", notes = "DockingTaskVO")
-	public R<IPage<DockingTaskVO>> gridDockingTask(DockingTask dockingTask, Query query){
-		IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(dockingTask,query);
+	@ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
+	public R<IPage<DockingTaskVO>> gridDockingTask(BaseQueryObject queryObject){
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
+		IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(condtionMap,query);
 		return R.data(pages);
 	}
 
 	/**
 	 * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
-	 * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridLoge")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "DockingLogeVO")
-	public R<IPage<DockingLogeVO>> gridLoge(DockingLog dockingLog, Query query){
-		IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(dockingLog,query);
+	public R<IPage<DockingLogeVO>> gridLoge(BaseQueryObject queryObject){
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
+		IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
 		return R.data(pages);
 	}
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
index cb1190b..9f1c212 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
@@ -11,6 +11,8 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
+import java.util.Map;
+
 /***
  * 绯荤粺鎺ュ彛绠$悊-鎺ュ彛閰嶇疆鏈嶅姟
  * @author xiejun
@@ -21,10 +23,10 @@
 
 	/**
 	 * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
-	 * @param dockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
 	 */
-	IPage<DockingSystemConfigVO> page(DockingSystemConfig dockingSystemConfig, Query query);
+	IPage<DockingSystemConfigVO> page(Map<String,String> condtionMap, Query query);
 
 	/**
 	 * 澧炲姞 绯荤粺闆嗘垚鐨勬帴鍙g鐞嗕俊鎭�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
index aed6f9d..4441d42 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
@@ -5,31 +5,33 @@
 import com.vci.ubcs.code.vo.pagemodel.*;
 import org.springblade.core.mp.support.Query;
 
+import java.util.Map;
+
 /***
  * 绯荤当绠$悊鐩稿叧鏈嶅姟
  */
 public interface IDokingSysManaentService {
 	/**
 	 * data鍒楄〃
-	 * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
 	 */
-	IPage<DockingTaskVO>gridDockingTask(DockingTask dockingTask, Query query);
+	IPage<DockingTaskVO>gridDockingTask(Map<String,String> condtionMap, Query query);
 	/**
 	 * 寰呴泦鎴愭暟鎹�
-	 * @param dockingData 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
 	 */
-	IPage<DockingDataVO>gridDockingData(DockingData dockingData, Query query);
+	IPage<DockingDataVO>gridDockingData(Map<String,String> condtionMap, Query query);
 
 
 
 	/**
 	 * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
-	 * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
 	 */
-	IPage<DockingLogeVO>gridLoge(DockingLog dockingLog, Query query);
+	IPage<DockingLogeVO>gridLoge(Map<String,String> condtionMap, Query query);
 
 	/**
 	 * 鎺ュ彛param鍒楄〃
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
index 775c622..c3c5def 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -156,7 +156,6 @@
 	 */
 	private void initPushDataTaks(int type){
 		initSysadmin();
-
 		List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list(
 			Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true")
 				.eq(DockingSystemConfig::getPushType,type==2?"2":"1").eq(DockingSystemConfig::getDataFlowType, SysIntegrationDataFlowTypeEnum.PUSH.getValue()));//2鏄唬琛ㄥ垎绫绘帹閫侊紝1鏄唬琛ㄦ暟鎹帹閫�
@@ -322,7 +321,6 @@
 	 * 鍙戦�佺紪鐮佷富鏁版嵁
 	 */
 	private void sendpushDataForService (List<DockingTask> dockingTaskS){
-
 		//姣忎釜task渚濇鎵ц鎺ㄩ��
 		for (DockingTask dockingTask:dockingTaskS){
 			//姣忎釜task涓�涓簨鍔★紝寮�鍚�
@@ -369,6 +367,13 @@
 				}
 				if(isGroupCodeFlage){
 					code=data.getOrDefault("groupcode","");
+					if(StringUtils.isBlank(code)) {//濡傛灉鏄泦鍥㈢爜锛屾病鏈夐鍙栧埌闆嗗洟鐮佸垯浠诲姟涓嶇粨鏉熺瓑寰呴泦鍥㈢爜鐢宠鍚庡啀閫氳繃瀹氭椂鍣ㄨ皟鐢ㄩ泦鍥㈢爜娈�
+						dockingTask.setDescription("绛夊緟闆嗗洟鐢宠闆嗗洟鐮�");
+						dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_FALSE);
+						dockingTask.setLastModifyTime(new Date());
+						dockingTaskService.updateById(dockingTask);
+						continue;
+					}
 				}
 				String[] classCodeLeves = dockingTask.getClassifyId().split(",");
 				NodeJosnDTO nodeJosnDTO = new NodeJosnDTO();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
index 9c18cdd..7198dd1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -35,6 +35,7 @@
 import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
 import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
 import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
 import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
 import com.vci.ubcs.starter.web.pagemodel.PageHelper;
 import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -135,9 +136,9 @@
 	private IDockingLogeService dockingLogeService;
 
 	@Override
-	public IPage<DockingSystemConfigVO> page(DockingSystemConfig DockingSystemConfig, Query query) {
+	public IPage<DockingSystemConfigVO> page(Map<String,String>codtionMap, Query query) {
 
-		IPage<DockingSystemConfig> pages = page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig));
+		IPage<DockingSystemConfig> pages = page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(codtionMap));
 		List<DockingSystemConfig>  dockingSystemConfigList= pages.getRecords();
 		dockingSystemConfigList.stream().forEach(dockingSystemConfig -> {
 			dockingSystemConfig.setDataFlowTypeText(SysIntegrationDataFlowTypeEnum.getTextByValue(dockingSystemConfig.getDataFlowType()));
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
index 646d483..4073285 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -7,12 +7,15 @@
 import com.vci.ubcs.code.service.*;
 import com.vci.ubcs.code.vo.pagemodel.*;
 import com.vci.ubcs.code.wrapper.*;
+import com.vci.ubcs.starter.util.UBCSCondition;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Map;
 
 @Service
 public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService {
@@ -55,29 +58,30 @@
 	private  IDockingDataService dockingDataService;
 	/**
 	 * data鍒楄〃
-	 * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
 	 */
 	@Override
-	public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
-		IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
+	public IPage<DockingTaskVO> gridDockingTask(Map<String,String> condtionMap, Query query) {
+		IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
 		return DockingTaskWrapper.build().pageVO(pages);
 	}
 
 	@Override
-	public IPage<DockingDataVO> gridDockingData(DockingData dockingData, Query query) {
-		IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData));
+	public IPage<DockingDataVO> gridDockingData(Map<String,String> condtionMap, Query query) {
+		IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
 		return DockingDataWrapper.build().pageVO(pages);
 	}
 
 	/**
 	 * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
-	 * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@Override
-	public IPage<DockingLogeVO> gridLoge(DockingLog dockingLog, Query query) {
-		IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
+	public IPage<DockingLogeVO> gridLoge(Map<String,String> condtionMap, Query query) {
+		//IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
+		IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
 		return DockingLogeWrapper.build().pageVO(pages);
 	}
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 49e9865..389adc9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -466,7 +466,7 @@
                 if (!CodeLevelTypeEnum.MIN.getValue().equalsIgnoreCase(attrVO.getClassifyInvokeLevel()) && !"min".equalsIgnoreCase(attrVO.getClassifyInvokeLevel())) {
                     //鎸囧畾浜嗗眰绾х殑
                     //娉ㄦ剰锛屽洜涓烘煡璇笂绾у垎绫诲嚭鏉ョ殑灞傜骇鏄�掑簭鐨勶紝鍗抽《灞傝妭鐐规槸鏈�澶х殑鍊�
-                    List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
+                    List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> -o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
                     int level = VciBaseUtil.getInt(attrVO.getClassifyInvokeLevel());
                     if (classifyVOS.size() >= level && level > 0) {
                         classifyVO = classifyVOS.get(level - 1);
@@ -753,7 +753,7 @@
 	 */
 	@Override
 	public R checkGroupCode(Map<String, String> parameter) {
-		List<CodeClassify> codeClassifyList = classifyService.selectAllLevelParents(parameter.get("oid"));
+		List<CodeClassify> codeClassifyList = classifyService.selectAllLevelParentByOid(parameter.get("oid"));
 		Set<String> configGroupCode = Arrays.stream(parameter.get("classifyGroupCode").split("#")).collect(Collectors.toSet());
 //		Boolean checkGroupFlag = false;//鏄惁鏌ヨ鍒伴厤缃殑椤跺眰鍒嗙被涓�
 		for (int i = codeClassifyList.size()-1; i >= 0; i--) {
@@ -3697,7 +3697,7 @@
         //浣跨敤涓氬姟绫诲瀷鏌ヨ
         R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
         if (!allAttributeByBtmId.isSuccess()) {
-            throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
+            throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒;"+allAttributeByBtmId.getMsg());
         }
         if (Func.isEmpty(allAttributeByBtmId.getData())) {
             throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 4948270..98bbea7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -518,7 +518,7 @@
 						secValue = classifyFullInfoBO.getCurrentClassifyVO().getId();
 					} else {
 						//鎴戜滑闇�瑕佷粠椤跺眰寮�濮嬫壘鍒板綋鍓嶅垎绫讳负姝�
-						secValue = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining()) + classifyFullInfoBO.getCurrentClassifyVO().getId();
+						secValue = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> -o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining()) + classifyFullInfoBO.getCurrentClassifyVO().getId();
 					}
 				} else {
 					//鎸囧畾灞傦紝鎴戜滑闇�瑕侀�氳繃涓婄骇鐨勬潵鑾峰彇
@@ -527,7 +527,7 @@
 						secValue = classifyFullInfoBO.getCurrentClassifyVO().getId();
 					} else {
 						//杩欎釜鎴戜滑闇�瑕佺湅鐪�,灞傜骇鏄笉鏄ぇ浜庝簡鏈�澶у眰绾х殑鏁�
-						List<CodeClassifyVO> parentClassifyVOList = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).collect(Collectors.toList());
+						List<CodeClassifyVO> parentClassifyVOList = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> -o1.getDataLevel().compareTo(o2.getDataLevel()))).collect(Collectors.toList());
 						if (secVO.getCodeLevelValue() > (parentClassifyVOList.size() + 1)) {
 							//鎸囧畾鐨勫眰绾ф瘮褰撳墠鐨勫眰绾ц繕澶т簡锛屾墍浠ュ彧鑳借幏鍙栧綋鍓嶅眰绾т簡
 							if (CodeGetValueTypeEnum.CURRENT.getValue().equalsIgnoreCase(secVO.getCodeGetValueType())) {
@@ -544,7 +544,7 @@
 								}
 							} else {
 								//灏忎簬绛変簬鐨勫叏閮ㄦ嬁鍑烘潵
-								secValue = parentClassifyVOList.stream().filter(s -> s.getDataLevel().intValue() <= secVO.getCodeLevelValue().intValue()).sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining());
+								secValue = parentClassifyVOList.stream().filter(s -> s.getDataLevel().intValue() <= secVO.getCodeLevelValue().intValue()).sorted(((o1, o2) -> -o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining());
 							}
 						}
 					}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 28b5aa4..e91e46a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -1782,10 +1782,10 @@
 									}
 									log.info(libId);
 								}else if(secType.equals("codelevelsec")) {//灞傜骇鐮佹
-									int level = codeBasicSecVO.getCodeLevelValue();
 									CodeClassifyVO levelCodeClassifyVO = new CodeClassifyVO();
 									CodeClassifyFullInfoBO classifyFullInfoBO = this.classifyService.getClassifyFullInfo(codeClassifyDO.getOid());
 									if(codeBasicSecVO.getCodeLevelType().equals("code_level_special")){//鎸囧畾灞傜骇
+										int level = codeBasicSecVO.getCodeLevelValue();
 										List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
 										if (classifyVOS.size() >= level && level > 0) {
 											levelCodeClassifyVO = classifyVOS.get(level - 1);
@@ -2235,7 +2235,8 @@
 		if(StringUtils.isNotBlank(classOid)){
 			queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid);
 		}
-		List<DockingSystemConfig> dockingSystemConfigList=	dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
+		List<DockingSystemConfig> dockingSystemConfigList=new ArrayList<>();
+		dockingSystemConfigList=	dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
 		if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
 		 return	dockingSystemConfigList.get(0);
 		}else{
@@ -2243,6 +2244,10 @@
 				return checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid());
 			}
 		}
-		return dockingSystemConfigList.get(0);
+		if(dockingSystemConfigList.size()>0){
+			return dockingSystemConfigList.get(0);
+		}else{
+			return	new DockingSystemConfig();
+		}
 	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 4d6f43b..40dfb07 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -177,8 +177,14 @@
     </select>
 
     <select id="selectAllLevelParentByOid" resultType="java.util.HashMap">
-        select oid,
-               level from pl_code_classify start with oid= #{oid} connect by prior PARENTCODECLASSIFYOID = oid
+            select b.oid as oid,level from
+                pl_code_classify  b
+                    join (select oid
+                          from  pl_code_classify
+                                    start with oid = #{oid}
+                          connect by oid = prior PARENTCODECLASSIFYOID) a on b.oid = a.OID
+                start with b.PARENTCODECLASSIFYOID is null
+            connect by prior b.oid = b.PARENTCODECLASSIFYOID
     </select>
 
     <select id="getIdPathToNamePathByParentId"  resultMap="plCodeClassifyResultMap">

--
Gitblit v1.9.3