Merge branch '20221110_sun老人长护险信息' of sckj/mz-cloud into master

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/IZwywBtglJgbtService.java

@@ -1,7 +1,6 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.ZwywBtglJgbt;
-import com.ruoyi.common.datasource.annotation.Slave;
 
 import java.util.List;
 
@@ -27,7 +26,7 @@ public interface IZwywBtglJgbtService
      * @param zwywBtglJgbt 机构补贴申请受理
      * @return 机构补贴申请受理集合
      */
-    @Slave
+//    @Slave
     public List<ZwywBtglJgbt> selectZwywBtglJgbtList(ZwywBtglJgbt zwywBtglJgbt);
 
     /*停发处理*/

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/IZwywBtglLrbtglService.java

@@ -1,7 +1,6 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.ZwywBtglLrbtgl;
-import com.ruoyi.common.datasource.annotation.Slave;
 
 import java.util.List;
 
@@ -29,8 +28,9 @@ public interface IZwywBtglLrbtglService
      */
     public List<ZwywBtglLrbtgl> selectZwywBtglLrbtglList(ZwywBtglLrbtgl zwywBtglLrbtgl);
 
+//    @Slave
     public List<ZwywBtglLrbtgl> selectZwywBtglLrbtglTfList(ZwywBtglLrbtgl zwywBtglLrbtgl);
-    @Slave
+
     public List<ZwywBtglLrbtgl> selectZwywBtglLrbtglSpList(ZwywBtglLrbtgl zwywBtglLrbtgl);
 
     /*老人核查*/

ruoyi-ui/src/views/search/xxcx/btxx/jgbt/index.vue

@@ -179,7 +179,7 @@
 </template>
 
 <script>
-import {getJgbt, selectJgbtSpList} from '@/api/search/xxcx/btxx/jgbt'
+import {getJgbt, listJgbtTf} from '@/api/search/xxcx/btxx/jgbt'
 import {chineseOne, idCard} from '@/utils/regular'
 import {mapGetters, mapState} from 'vuex'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
@@ -317,7 +317,7 @@ export default {
     /** 查询机构补贴申请受理列表 */
     getList() {
       this.loading = true
-      selectJgbtSpList({ ...this.queryParams, jgssqh: this.queryParams.jgssqh }).then((response) => {
+      listJgbtTf({ ...this.queryParams, jgssqh: this.queryParams.jgssqh }).then((response) => {
         this.jgbtList = response.rows
         this.total = response.total
         this.loading = false

ruoyi-ui/src/views/search/xxcx/btxx/lrbt/index.vue

@@ -233,7 +233,7 @@
 </template>
 
 <script>
-import {getLrbtgl, listLrbtsp} from '@/api/search/xxcx/btxx/lrbt'
+import {getLrbtgl, listLrbtglTf} from '@/api/search/xxcx/btxx/lrbt'
 import {chineseOne, idCard, Regular} from '@/utils/regular'
 import {Constant} from '@/utils/constant'
 import {mapGetters, mapState} from 'vuex'
@@ -354,7 +354,7 @@ export default {
     /** 查询老人补贴资金受理列表 */
     getList() {
       this.loading = true
-      listLrbtsp(this.queryParams).then((response) => {
+      listLrbtglTf(this.queryParams).then((response) => {
         this.lrbtglList = response.rows
         this.total = response.total
         this.loading = false