地图定位功能实现

BJYSYBZ_C/src/utils/dicts.js

@@ -83,66 +83,5 @@ export const ydlxDicts = [{
 {
   label: '其他用地',
   value: 'Q',
-  children: [{
-    label: '行政办公用地',
-    value: 'A1'
-  }, {
-    label: '文化设施用地',
-    value: 'A2'
-  }, {
-    label: '体育用地',
-    value: 'A4'
-  }, {
-    label: '医疗卫生用地',
-    value: 'A5'
-  }, {
-    label: '社会福利设施用地',
-    value: 'A6'
-  }, {
-    label: '文物古迹用地',
-    value: 'A7'
-  }, {
-    label: '外事用地',
-    value: 'A8'
-  }, {
-    label: '宗教设施用地',
-    value: 'A9'
-  }, {
-    label: '一类物流仓储用地',
-    value: 'W1'
-  }, {
-    label: '二类物流仓储用地',
-    value: 'W2'
-  }, {
-    label: '二类物流仓储用地',
-    value: 'W3'
-  }, {
-    label: '城市道路用地',
-    value: 'S1'
-  }, {
-    label: '城市轨道交通用地',
-    value: 'S2'
-  }, {
-    label: '交通枢纽用地',
-    value: 'S3'
-  }, {
-    label: '交通场站用地',
-    value: 'S4'
-  }, {
-    label: '其它交通设施用地',
-    value: 'S9'
-  }, {
-    label: '供应设施用地',
-    value: 'U1'
-  }, {
-    label: '环境设施用地',
-    value: 'U2'
-  }, {
-    label: '安全设施用地',
-    value: 'U3'
-  }, {
-    label: '其它公用设施用地',
-    value: 'U4'
-  }]
 }
 ]

BJYSYBZ_C/src/views/KgView/components/FourContent.vue

@@ -61,11 +61,8 @@
               </td>
             </tr>
             <tr>
-              <th>批复时间</th>
-              <td>
-                <el-date-picker type="date" v-model="query.pfsj" placeholder="批复时间" style="width: 100%" clearable />
-              </td>
-              <td colspan="2">
+              <td colspan="3"></td>
+              <td style="text-align: right;">
                 <el-button size="medium" type="primary" @click="searchData()" icon="el-icon-search" style="margin-left: 10px;">查 询</el-button>
               </td>
             </tr>
@@ -136,7 +133,8 @@ export default {
         },
         total: 0
       },
-      isAllSelected: false
+      isAllSelected: false,
+      isOther: false
     }
   },
   mounted () {
@@ -151,8 +149,13 @@ export default {
         pageIndex: this.config.page.index,
         pageSize: this.config.page.count
       }
-      if (this.ydlx.length > 0) {
-        p['dlbms'] = this.isAllSelected ? [this.ydlx[0][0]] : this.ydlx.map(arr => arr[1])
+      p['isOther'] = this.isOther
+      if (this.isOther) {
+        p['dlbms'] = ydlxDicts.map((item) => item['value']);
+      } else {
+        if (this.ydlx.length > 0) {
+          p['dlbms'] = this.isAllSelected ? [this.ydlx[0][0]] : this.ydlx.map(arr => arr[1])
+        }
       }
       this.$ajax.post(urlApi, p, this, false).then((result) => {
         const data = result["data"] || {};
@@ -169,6 +172,29 @@ export default {
         this.dymcList = data;
       });
     },
+    queryDistinctDlbm() {
+      const urlApi = `/api/bj-kg/dlbm/distinct`;
+      let p = {
+        'dlbms': []
+      }
+      p['isOther'] = this.isOther
+      if (this.isOther) {
+        p['dlbms'] = ydlxDicts.map((item) => item['value']);
+      } else {
+        if (this.ydlx.length > 0) {
+          p['dlbms'] = this.isAllSelected ? [this.ydlx[0][0]] : this.ydlx.map(arr => arr[1])
+        }
+      }
+      return new Promise((resolve, reject) => {
+        if (this.ydlx.length > 0) {
+          this.$ajax.post(urlApi, p, this, false).then((result) => {
+            resolve(result)
+          })
+          return;
+        }
+        resolve({data: []})
+      })
+    },
     // 点击上一页、下一页以及指定页
     pageToMe (index) {
       this.config.page.index = index;
@@ -184,18 +210,68 @@ export default {
       this.$vm.$emit("getGdDetailData", item);
       this.$vm.$emit("location-feature-where", { layerId: 'bj-kg', where: `dkbh = '${item.dkbh}'`, setting: {outFields: 'dkbh,ssqx,ssjd,mj'} })
     },
-    searchData () {
+    async searchData () {
+      this.isOther = false;
       this.isAllSelected = false;
       if (this.ydlx.length > 0) {
-        const pBm = this.ydlx[0][0]
-        const selected = ydlxDicts.filter(item => item.value === pBm);
-        if (selected && selected.length > 0) {
-          if (selected[0]['children'].length === this.ydlx.length) {
-            this.isAllSelected = true;
+        const pBms = this.ydlx.filter(arr => arr[0] === 'Q');
+        const pBm = pBms[0][0] || ''
+        if (pBm !== 'Q') {
+          const selected = ydlxDicts.filter(item => item.value === pBm);
+          if (selected && selected.length > 0) {
+            if (selected[0]['children'].length === this.ydlx.length) {
+              this.isAllSelected = true;
+            }
           }
+        } else {
+          this.isAllSelected = true;
+          this.isOther = true;
         }
       }
       this.queryStatisticsAndListPage();
+      
+      let refreshP = "dkbh is not null";
+      if (this.query.dkbh) {
+        refreshP += ` and dkbh = '${this.query.dkbh}'`;
+      }
+      if (this.query.pfwh) {
+        refreshP + ` and pfwh = '${this.query.pfwh}'`;
+      }
+      if (this.query.dymc) {
+        refreshP += ` and dymc = '${this.query.dymc}'`
+      }
+      const result = await this.queryDistinctDlbm()
+      const resultData = result['data'] || []
+      if (resultData && resultData.length > 0) {
+        let pstr = '';
+        resultData.forEach((it,index) => {
+          pstr += "'"
+          pstr += it
+          if (index === resultData.length - 1) {
+            pstr += "'";
+          } else {
+            pstr += "',"
+          }
+        })
+        if (this.isOther) {
+          refreshP += ` and dlbm not in (${pstr})`
+        } else {
+           refreshP += ` and dlbm in (${pstr})`
+        }
+      }
+      setTimeout(() => {
+        this.$vm.$emit("updateLayer", { id: "bj-kg", param: refreshP, layerIdx: 'sde:ybz_bj_kg' })
+        this.$vm.$emit('change-layer')
+      }, 200)
+    },
+    dateTimeFormat(dateObj) {
+      const date = new Date(dateObj);
+      const year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+      month = month < 10 ? ("0" + month) : month;
+      day = day < 10 ? ("0" + day) : day;
+      return `${year}/${month}/${day}`;
     },
   }
 }

BJYSYBZ_C/src/views/WlydxqView/components/FourContent.vue

@@ -230,14 +230,12 @@ export default {
     return {
       mj: 0,
       zs: 0,
-      lx: [],
       ydlxDicts: ydlxDicts,
       query: {
         xzqmc: '',
         name: '',
         type: '',
         status: '',
-        lx: '',
         zqscqk: '',
         scsj: '',
         sfjd: ''
@@ -268,7 +266,8 @@ export default {
       ydlx: [],
       crjhs: [ '2023年', '2024年', '2025年','2026年','远期' ],
       foldShow: false,
-      isAllSelected: false
+      isAllSelected: false,
+      isOther: false
     }
   },
   mounted() {
@@ -284,6 +283,27 @@ export default {
         this.tdyts = data;
       });
     },
+    queryWlydZydxzList() {
+      const urlApi = `/api/ybz-bj/wlydZydxzList/query`;
+      let p = {}
+      p['isOther'] = this.isOther
+      if (this.isOther) {
+        p['dlbms'] = ydlxDicts.map((item) => item['value']);
+      } else {
+        if (this.ydlx.length > 0) {
+          p['dlbms'] = this.isAllSelected ? [this.ydlx[0][0]] : this.ydlx.map(arr => arr[1])
+        }
+      }
+      return new Promise((resolve, reject) => {
+        if (this.ydlx.length > 0) {
+          this.$ajax.get(urlApi, p, this, false).then((result) => {
+            resolve(result)
+          })
+          return;
+        }
+        resolve({data: []})
+      })
+    },
     getTsxzListData() {
       const urlApi = `/api/ybz-bj/wlydList`;
       let p = {
@@ -291,8 +311,13 @@ export default {
         pageIndex: this.config.page.index,
         pageSize: this.config.page.count
       }
-      if (this.ydlx.length > 0) {
-        p['dlbms'] = this.isAllSelected ? [this.ydlx[0][0]] : this.ydlx.map(arr => arr[1])
+      p['isOther'] = this.isOther
+      if (this.isOther) {
+        p['dlbms'] = ydlxDicts.map((item) => item['value']);
+      } else {
+        if (this.ydlx.length > 0) {
+          p['dlbms'] = this.isAllSelected ? [this.ydlx[0][0]] : this.ydlx.map(arr => arr[1])
+        }
       }
       this.$ajax.get(urlApi, p, this, false).then((result) => {
         const data = result["data"] || {};
@@ -323,20 +348,26 @@ export default {
       });
       window.open(routeUrl.href, '_blank');
     },
-    searchData() {
+    async searchData() {
+      this.isOther = false;
       this.isAllSelected = false;
       if (this.ydlx.length > 0) {
-        const pBm = this.ydlx[0][0]
-        const selected = ydlxDicts.filter(item => item.value === pBm);
-        if (selected && selected.length > 0) {
-          if (selected[0]['children'].length === this.ydlx.length) {
-            this.isAllSelected = true;
+        const pBms = this.ydlx.filter(arr => arr[0] === 'Q');
+        const pBm = pBms[0][0] || ''
+        if (pBm !== 'Q') {
+          const selected = ydlxDicts.filter(item => item.value === pBm);
+          if (selected && selected.length > 0) {
+            if (selected[0]['children'].length === this.ydlx.length) {
+              this.isAllSelected = true;
+            }
           }
+        } else {
+          this.isAllSelected = true;
+          this.isOther = true;
         }
       }
       this.initHZ()
       this.getTsxzListData();
-      return;
       let refreshP = "(sfygd is null or sfygd = '')"
       if (this.query.xzqmc) {
         refreshP += ` and ssjd = '${this.query.xzqmc}'`
@@ -344,16 +375,6 @@ export default {
       if (this.query.type) {
         refreshP += ` and ghdy = '${this.query.type}'`
       } 
-      if (this.lx.length) {
-        refreshP += ' and ('
-        this.lx.forEach((it, index) => {
-          if (index > 0) {
-            refreshP += ' or '
-          }
-          refreshP += `zydxz like '${it}%'`
-        })
-        refreshP += ')'
-      }
       if (this.query.status === '是') {
         refreshP += ` and sftb = '${this.query.status}'`
       } else if (this.query.status === '否') {
@@ -375,6 +396,25 @@ export default {
       if (this.query.name) {
         refreshP += ` and dkbh = '${this.query.name}'`
       }
+      const result = await this.queryWlydZydxzList();
+      const dataResult = result['data']
+      if (dataResult && dataResult.length > 0) { 
+        let pstr = '';
+        dataResult.forEach((it,index) => {
+          pstr += "'"
+          pstr += it
+          if (index === dataResult.length - 1) {
+            pstr += "'";
+          } else {
+            pstr += "',"
+          }
+        })
+        if (this.isOther) {
+          refreshP += ` and zydxz not in (${pstr})`
+        } else {
+          refreshP += ` and zydxz in (${pstr})`
+        }
+      }
       setTimeout(() => {
         this.$vm.$emit("updateLayer", { id: "bj-wlyd", param: refreshP, layerIdx: 'ysybz:bjwlyd2000' })
         this.$vm.$emit('change-layer')
@@ -384,8 +424,13 @@ export default {
       const p = {
         ...this.query
       }
-      if (this.ydlx.length > 0) {
-        p['dlbms'] = this.isAllSelected ? [this.ydlx[0][0]] : this.ydlx.map(arr => arr[1])
+      p['isOther'] = this.isOther
+      if (this.isOther) {
+        p['dlbms'] = ydlxDicts.map((item) => item['value']);
+      } else {
+        if (this.ydlx.length > 0) {
+          p['dlbms'] = this.isAllSelected ? [this.ydlx[0][0]] : this.ydlx.map(arr => arr[1])
+        }
       }
       const urlApi = `/api/ybz-bj/wlydTJ`;
       this.$ajax.get(urlApi, p, this, false).then(result=>{

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/controller/rest/BjkgController.java

@@ -7,6 +7,9 @@ import com.zjugis.ysgzybz.service.BjkgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/bj-kg")
 public class BjkgController extends BaseRestController {
@@ -14,6 +17,7 @@ public class BjkgController extends BaseRestController {
     @Autowired
     private BjkgService bjkgService;
 
+
     @PostMapping("/batch/add")
     public Object addBatch(@RequestBody BjKgReqVO bjKgReqVO){
         try{
@@ -34,6 +38,20 @@ public class BjkgController extends BaseRestController {
         }
     }
 
+    /**
+     * 滨江控规地类编码分组去重
+     * @param bjKgReqDTO
+     * **/
+    @PostMapping("/dlbm/distinct")
+    public Object distinctDlbm(@RequestBody BjKgReqDTO bjKgReqDTO){
+        try{
+            return result(bjkgService.distinctDlbm(bjKgReqDTO));
+        }catch (Exception err){
+            err.printStackTrace();
+            return error(err.getMessage(), ErrorCode.DEFAULT);
+        }
+    }
+
     /**
      * 滨江控规规划单元(dymc)汇总LIST查询
      * @return Map

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/controller/rest/YbzBJController.java

@@ -143,6 +143,18 @@ public class YbzBJController extends BaseRestController {
         }
     }
 
+    @GetMapping("/wlydZydxzList/query")
+    public Object queryWlydZydxzList(CommonDTO dto){
+        try {
+            List<String> obj = service.wlydZydxzList(dto);
+            return result(obj);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            logger.warn("/api/ybz-bj/wlydZydxzList/query 接口异常 -> " + ex.getMessage());
+            return error(ex.getMessage(), ErrorCode.DEFAULT);
+        }
+    }
+
     /**
      * Description: 未利用地分页数据
      * Author: WangConvey

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/dao/BjkgMapper.java

@@ -1,6 +1,8 @@
 package com.zjugis.ysgzybz.dao;
 
+import com.alibaba.druid.sql.visitor.functions.Right;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.enums.SqlLike;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.ysgzybz.domain.dto.BjKgReqDTO;
@@ -8,6 +10,7 @@ import com.zjugis.ysgzybz.domain.entity.BjKgDO;
 import com.zjugis.ysgzybz.domain.vo.BjKgBaseVO;
 import com.zjugis.ysgzybz.domain.vo.BjKgRespVO;
 import com.zjugis.ysgzybz.domain.vo.BjKgStatisticsRespVO;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.logging.log4j.util.Strings;
@@ -55,6 +58,26 @@ public interface BjkgMapper extends BaseMapper<BjKgDO> {
 
     List<BjKgDO> selectListAll();
 
+    default List<String> selectDistinctDlbm(BjKgReqDTO bjKgReqDTO){
+        List<String> dlbms = bjKgReqDTO.getDlbms();
+        QueryWrapper<BjKgDO> queryWrapper = new QueryWrapper<>();
+        if(bjKgReqDTO.getIsOther()){
+            return this.selectList(queryWrapper).stream()
+                    .filter((bjKgDO -> !isAnyMatchBool(bjKgReqDTO.getDlbms(), bjKgDO.getDlbm())))
+                    .map(BjKgDO::getDlbm).distinct().collect(Collectors.toList());
+        }
+        if(!ObjectUtils.isEmpty(dlbms) && dlbms.size() > 0) {
+            for (int i = 0; i < dlbms.size(); i++) {
+                if (i == 0) {
+                    queryWrapper.likeRight("dlbm", dlbms.get(i));
+                } else {
+                    queryWrapper.or().likeRight("dlbm", dlbms.get(i));
+                }
+            }
+            return this.selectList(queryWrapper).stream().map(BjKgDO::getDlbm).distinct().collect(Collectors.toList());
+        }
+        return null;
+    }
 
     default List<String> selectDymcList(){
         List<BjKgDO> lists = this.selectList(new QueryWrapper<BjKgDO>().select("dymc"));
@@ -69,7 +92,7 @@ public interface BjkgMapper extends BaseMapper<BjKgDO> {
                 .gyydArea(lists.stream().filter(bjKgDO -> bjKgDO.getDlbm().startsWith("M")).map(BjKgDO::getMj).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue())
                 .syydArea(lists.stream().filter(bjKgDO -> bjKgDO.getDlbm().startsWith("B")).map(BjKgDO::getMj).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue())
                 .zzydArea(lists.stream().filter(bjKgDO -> bjKgDO.getDlbm().startsWith("R")).map(BjKgDO::getMj).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue())
-                .jyydArea(lists.stream().filter(bjKgDO -> bjKgDO.getDlbm().startsWith("A")).map(BjKgDO::getMj).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue())
+                .jyydArea(lists.stream().filter(bjKgDO -> bjKgDO.getDlbm().startsWith("A3")).map(BjKgDO::getMj).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue())
                 .gylvArea(lists.stream().filter(bjKgDO -> bjKgDO.getDlbm().startsWith("G")).map(BjKgDO::getMj).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue())
                 .build();
     }
@@ -95,18 +118,16 @@ public interface BjkgMapper extends BaseMapper<BjKgDO> {
         queryWrapper.like(Strings.isNotBlank(bjKgReqDTO.getPfwh()),"pfwh", bjKgReqDTO.getPfwh());
         queryWrapper.like(Strings.isNotBlank(bjKgReqDTO.getDlmc()),"dlmc", bjKgReqDTO.getDlmc());
         queryWrapper.eq(!ObjectUtils.isEmpty(bjKgReqDTO.getPfsj()),"pfsj", bjKgReqDTO.getPfsj());
+        queryWrapper.select(BjKgDO.class, (bjkgDO)-> !bjkgDO.getColumn().equals("shape"));
+        List<BjKgDO> list = this.selectList(queryWrapper);
         if(!(ObjectUtils.isEmpty(bjKgReqDTO.getDlbms())) && bjKgReqDTO.getDlbms().size() > 0){
-            for(int i = 0; i < bjKgReqDTO.getDlbms().size();i++){
-                String dlbm = bjKgReqDTO.getDlbms().get(i);
-                if(i == 0){
-                    queryWrapper.nested((q)->q.likeRight("dlbm", dlbm));
-                }else{
-                    queryWrapper.or((q)->q.likeRight("dlbm", dlbm));
-                }
+            if(bjKgReqDTO.getIsOther()){
+                list = list.stream().filter(bjKgDO -> !isAnyMatchBool(bjKgReqDTO.getDlbms(), bjKgDO.getDlbm())).collect(Collectors.toList());;
+            }else{
+                list = list.stream().filter((bjKgDO)->isAnyMatchBool(bjKgReqDTO.getDlbms(), bjKgDO.getDlbm())).collect(Collectors.toList());
             }
         }
-        queryWrapper.select(BjKgDO.class, (bjkgDO)-> !bjkgDO.getColumn().equals("shape"));
-        List<BjKgDO> list = this.selectList(queryWrapper);
+
         return BjKgRespVO.builder()
                 .totalNum(list.size())
                 .totalArea(list.stream().map(BjKgDO::getMj).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue())
@@ -123,4 +144,9 @@ public interface BjkgMapper extends BaseMapper<BjKgDO> {
         queryWrapper.select(BjKgDO.class, (b)->!b.getColumn().equals("shape"));
         return selectOne(queryWrapper);
     }
+
+    default Boolean isAnyMatchBool(List<String> dlbms, String dlbm){
+        return dlbms.stream().anyMatch((str)->dlbm.startsWith(str));
+    }
+
 }

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/dao/YbzBJDao.java

@@ -26,6 +26,8 @@ public interface YbzBJDao {
     /** 导出未利用地excel **/
     List<WlydExcelDO> getWlydExcelList(CommonDTO dto);
 
+    List<String> wlydZydxzList(@Param("dto") CommonDTO dto);
+
     /** 未利用地分页数据 **/
     List<Map<String, Object>> wlydList(Page<Map> page, @Param("dto") CommonDTO dto);
 

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/dto/BjKgReqDTO.java

@@ -19,6 +19,8 @@ public class BjKgReqDTO extends PageDTO {
 
     private String dlmc;
 
+    private Boolean isOther;
+
     @DateTimeFormat(pattern = "YYYY-MM-DD HH:ii:ss")
     private Date pfsj;
 }

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/dto/CommonDTO.java

@@ -27,6 +27,7 @@ public class CommonDTO extends PageDTO {
     private String xzqmc;
     private String lxr;
     private String lx;
+    private Boolean isOther;    //判定是否是其他用地
     private List<String> dlbms;
     private String year;
     private String hydm;

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/BjkgService.java

@@ -16,6 +16,8 @@ public interface BjkgService extends IService<BjKgDO> {
 
     List<Long> updateSyyGSync();
 
+    List<String> distinctDlbm(BjKgReqDTO bjKgReqDTO);
+
     List<String> queryDymcList();
 
     BjKgStatisticsRespVO queryStatistics();

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/impl/BjkgServiceImpl.java

@@ -48,6 +48,11 @@ public class BjkgServiceImpl extends ServiceImpl<BjkgMapper, BjKgDO> implements
         return bjkgMapper.updateSyyGSync();
     }
 
+    @Override
+    public List<String> distinctDlbm(BjKgReqDTO bjKgReqDTO) {
+        return bjkgMapper.selectDistinctDlbm(bjKgReqDTO);
+    }
+
     @Override
     public List<String> queryDymcList() {
         return bjkgMapper.selectDymcList();

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/impl/YbzBJService.java

@@ -85,6 +85,10 @@ public class YbzBJService {
         }
     }
 
+    public List<String> wlydZydxzList(CommonDTO dto){
+        return dao.wlydZydxzList(dto);
+    }
+
     /** 未利用地分页数据 **/
     public Object wlydList(CommonDTO dto) {
         Map<String, Object> map = new HashMap<>();

BJYSYBZ_S/src/main/resources/mapper/YbzBJMapper.xml

@@ -100,6 +100,27 @@
         order by pfsj desc nulls last
     </select>
 
+    <select id="wlydZydxzList" resultType="string">
+        SELECT DISTINCT zydxz FROM
+        sde.bjwlyd2000
+        <where>
+            <if test="dto.dlbms != null and dto.dlbms.size > 0">
+                <choose>
+                    <when test="dto.isOther == true">
+                        <foreach collection="dto.dlbms" separator=" and " item="id" open="(" close=")">
+                            zydxz not like concat(#{id}, '%')
+                        </foreach>
+                    </when>
+                    <otherwise>
+                        <foreach collection="dto.dlbms" separator=" or " item="id" open="(" close=")">
+                            zydxz like concat(#{id}, '%')
+                        </foreach>
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
     <select id="wlydList" parameterType="com.zjugis.ysgzybz.domain.dto.CommonDTO" resultType="java.util.Map">
         select
         ghdy,pfsj,pfwh,dkbh,ydxz,ydxzmc,zydxz,round(mj * 15, 2) as mj,rjl,ldl,jzmd,jzxg,tdm,bz,ssqx,sffd,xmbh,jcmj,gkyq,ssjd,
@@ -112,9 +133,18 @@
         </if>
         <if test="dto.dlbms != null and dto.dlbms.size > 0">
             and
-            <foreach collection="dto.dlbms" separator=" or " item="id" open="(" close=")">
-                zydxz like concat(#{id}, '%')
-            </foreach>
+            <choose>
+                <when test="dto.isOther == true">
+                    <foreach collection="dto.dlbms" separator=" and " item="id" open="(" close=")">
+                        zydxz not like concat(#{id}, '%')
+                    </foreach>
+                </when>
+                <otherwise>
+                    <foreach collection="dto.dlbms" separator=" or " item="id" open="(" close=")">
+                        zydxz like concat(#{id}, '%')
+                    </foreach>
+                </otherwise>
+            </choose>
         </if>
         <if test="dto.status == '是'.toString()">
           and sftb = #{dto.status}
@@ -154,9 +184,18 @@
         </if>
         <if test="dlbms != null and dlbms.size > 0">
             and
-            <foreach collection="dlbms" separator=" or " item="id" open="(" close=")">
-                zydxz like concat(#{id}, '%')
-            </foreach>
+            <choose>
+                <when test="isOther == true">
+                    <foreach collection="dlbms" separator=" and " item="id" open="(" close=")">
+                        zydxz not like concat(#{id}, '%')
+                    </foreach>
+                </when>
+                <otherwise>
+                    <foreach collection="dlbms" separator=" or " item="id" open="(" close=")">
+                        zydxz like concat(#{id}, '%')
+                    </foreach>
+                </otherwise>
+            </choose>
         </if>
         <if test="status == '是'.toString()">
             and sftb = #{status}