滨江驾驶舱地块资源列表接口调整

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

@@ -152,6 +152,10 @@
                 <span class="sssr-value">{{ item.mj }}</span>
                 <span class="sssr-unit">亩</span>
               </div>
+              <div class="bottom-xzq text-ellipsis">
+                <span class="sssr-title">最近巡查时间：</span>
+                <span class="sssr-value">{{ item.xcsj || '暂无' }}</span>
+              </div>
             </div>
           </div>
         </div>
@@ -317,7 +321,8 @@ export default {
       });
     },
     getTsxzListData() {
-      const urlApi = `/api/ybz-bj/manageList`;
+      // const urlApi = `/api/ybz-bj/manageList`;
+      const urlApi = `/app/xc/getXcryDkListByPage`;
       let p = {
         ...this.query,
         pageIndex: this.config.page.index,

BJYSYBZ_C/src/views/BjWlydManageView/components/YqxqMap.vue

@@ -149,7 +149,6 @@ export default {
 .TsxzMap {
   height: 100%;
   position: relative;
-
   .btn-close-wrapper {
     position: absolute;
     top: 7px;

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/controller/app/BjXcController.java

@@ -1,6 +1,7 @@
 package com.zjugis.ysgzybz.controller.app;
 
 import com.zjugis.ysgzybz.controller.BaseRestController;
+import com.zjugis.ysgzybz.domain.dto.CommonDTO;
 import com.zjugis.ysgzybz.domain.vo.BjxcjlCreateReqVO;
 import com.zjugis.ysgzybz.service.XcjlService;
 import com.zjugis.ysgzybz.service.XcryService;
@@ -48,6 +49,19 @@ public class BjXcController extends BaseRestController {
     }
 
 
+    @GetMapping("/getXcryDkListByPage")
+    public Object getXcryDkListByPage(CommonDTO dto) {
+        try {
+            logger.info("/app/xc/getXcryDkListByPage 接口调用~~~");
+            return result(xcryService.getXcryDkListByPage(dto));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            logger.warn("/app/xc/getXcryDkList 接口异常 -> " + ex.getMessage());
+            return error(ex.getMessage(), BaseRestController.ErrorCode.DEFAULT);
+        }
+    }
+
+
     @GetMapping("/getXcryDkDetailByDksyh")
     public Object getXcryDkDetailByDksyh(@RequestParam("dksyh") String dksyh) {
         try {

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

@@ -1,6 +1,8 @@
 package com.zjugis.ysgzybz.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zjugis.ysgzybz.domain.dto.CommonDTO;
 import com.zjugis.ysgzybz.domain.entity.Bjxcry;
 import com.zjugis.ysgzybz.domain.vo.BjXcryDkRespVO;
 import org.apache.ibatis.annotations.Param;
@@ -24,6 +26,8 @@ public interface XcryMapper extends BaseMapper<Bjxcry> {
 
     List<BjXcryDkRespVO> getXcryDk(@Param("dkIds")List<String> dkIds, @Param("gddw") String gddw, @Param("dkbh")String dkbh);
 
+    List<BjXcryDkRespVO> getXcryDkByPage(Page<Map> page, @Param("dto") CommonDTO dto);
+
     List<Bjxcry> getXcryByDksyh(@Param("dksyh")String dksyh);
 
     List<Map> listByAdmin();

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

@@ -1,6 +1,7 @@
 package com.zjugis.ysgzybz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zjugis.ysgzybz.domain.dto.CommonDTO;
 import com.zjugis.ysgzybz.domain.entity.Bjxcry;
 import com.zjugis.ysgzybz.domain.vo.BjXcryDkRespVO;
 
@@ -32,6 +33,8 @@ public interface XcryService extends IService<Bjxcry> {
      */
     List<BjXcryDkRespVO> getXcryDkList(String xcryId, String dkbh);
 
+    Object getXcryDkListByPage(CommonDTO dto);
+
     BjXcryDkRespVO getXcryDkDetailByDksyh(String dksyh);
     /**
      * 获取地块下的巡查人员

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

@@ -5,9 +5,11 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zjugis.ysgzybz.dao.XcryMapper;
 import com.zjugis.ysgzybz.dao.XcryWkflyMapper;
+import com.zjugis.ysgzybz.domain.dto.CommonDTO;
 import com.zjugis.ysgzybz.domain.entity.Bjxcry;
 import com.zjugis.ysgzybz.domain.entity.BjxcryWkfly;
 import com.zjugis.ysgzybz.domain.vo.BjXcryDkRespVO;
@@ -77,6 +79,16 @@ public class XcryServiceImpl extends ServiceImpl<XcryMapper, Bjxcry> implements
         return xcryMapper.getXcryDk(dkIds, null,dkbh);
     }
 
+    @Override
+    public Object getXcryDkListByPage(CommonDTO dto) {
+        Map<String, Object> map = new HashMap<>();
+        Page<Map> page = new Page(dto.getPageIndex(), dto.getPageSize());
+        List<BjXcryDkRespVO> list = xcryMapper.getXcryDkByPage(page, dto);
+        map.put("list", list);
+        map.put("total", page.getTotal());
+        return map;
+    }
+
     @Override
     public BjXcryDkRespVO getXcryDkDetailByDksyh(String dksyh) {
         ArrayList<String> dkIds = new ArrayList();

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

@@ -47,6 +47,32 @@
             </if>
         </where>
     </select>
+    <select id="getXcryDkByPage" resultType="com.zjugis.ysgzybz.domain.vo.BjXcryDkRespVO">
+        select
+        T1.dksyh,T1.dkbh,T1.dkmj,T1.dkwz,T1.mj,T1.dkxz,T1.gddw,T1.lxr,T1.lxdh,T1.bz,T1.szfw,T2.xcsj
+        from
+        sde.bjwkfly2000 T1
+        left join (select max(xcsj) xcsj,dksyh from sde.bjxcjl GROUP BY dksyh) T2 ON T1.dksyh = T2.dksyh
+        <where>
+            1=1
+            <if test="dto.xzqdm != null and dto.xzqdm !=''">
+                and T1.dkwz = #{dto.xzqdm}
+            </if>
+            <if test="dto.name != null and dto.name !=''">
+                and T1.dkbh like concat('%', concat(#{dto.name}, '%'))
+            </if>
+            <if test="dto.gddw != null and dto.gddw !=''">
+                and T1.gddw like concat('%', concat(#{dto.gddw}, '%'))
+            </if>
+            <if test="dto.big != null">
+                and T1.mj &lt;= ${dto.big}
+            </if>
+            <if test="dto.small != null">
+                and T1.mj &gt;= ${dto.small}
+            </if>
+        </where>
+        order by T2.xcsj desc nulls last
+    </select>
     <select id="getXcryByDksyh" resultType="com.zjugis.ysgzybz.domain.entity.Bjxcry">
         SELECT
             T1.*