相关查询

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/TraceabilityBaseController.java

@@ -1,5 +1,6 @@
 package com.cjy.traceability.module.traceability.controller.admin.base;
 
+import com.cjy.traceability.module.traceability.service.block.BlockService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -37,7 +38,8 @@ public class TraceabilityBaseController {
 
     @Resource
     private TraceabilityBaseService baseService;
-
+    @Resource
+    private BlockService blockService;
     @PostMapping("/create")
     @Operation(summary = "创建基地信息")
     @PreAuthorize("@ss.hasPermission('traceability:base:create')")
@@ -76,6 +78,7 @@ public class TraceabilityBaseController {
     @PreAuthorize("@ss.hasPermission('traceability:base:query')")
     public CommonResult<PageResult<TraceabilityBaseRespVO>> getBasePage(@Valid TraceabilityBasePageReqVO pageReqVO) {
         PageResult<TraceabilityBaseDO> pageResult = baseService.getBasePage(pageReqVO);
+
         return success(BeanUtils.toBean(pageResult, TraceabilityBaseRespVO.class));
     }
 

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/vo/TraceabilityBaseRespVO.java

@@ -77,4 +77,5 @@ public class TraceabilityBaseRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    private  Integer blockNum;
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/base/TraceabilityBaseDO.java

@@ -1,14 +1,13 @@
 package com.cjy.traceability.module.traceability.dal.dataobject.base;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cjy.traceability.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
+
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.cjy.traceability.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 基地信息 DO
@@ -84,5 +83,6 @@ public class TraceabilityBaseDO extends BaseDO {
      * 基地图片
      */
     private String baseImage;
-
+    @TableField(value="blockNum",exist = false)
+    private Integer blockNum;
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/block/BlockDO.java

@@ -51,4 +51,6 @@ public class BlockDO extends BaseDO {
      */
     private String positionStr;
 
+    private Integer baseId;
+
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/base/TraceabilityBaseMapper.java

@@ -2,12 +2,16 @@ package com.cjy.traceability.module.traceability.dal.mysql.base;
 
 import java.util.*;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cjy.traceability.framework.common.pojo.PageResult;
 import com.cjy.traceability.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cjy.traceability.framework.mybatis.core.mapper.BaseMapperX;
+import com.cjy.traceability.module.traceability.controller.admin.block.vo.BlockCropPageReqVO;
 import com.cjy.traceability.module.traceability.dal.dataobject.base.TraceabilityBaseDO;
+import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.cjy.traceability.module.traceability.controller.admin.base.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 基地信息 Mapper
@@ -35,5 +39,5 @@ public interface TraceabilityBaseMapper extends BaseMapperX<TraceabilityBaseDO>
                 .betweenIfPresent(TraceabilityBaseDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(TraceabilityBaseDO::getId));
     }
-
+    public IPage<TraceabilityBaseDO> selectBaseBlockPage(IPage<TraceabilityBaseDO> page, @Param("reqVO") TraceabilityBasePageReqVO reqVO);
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cjy.traceability.framework.common.pojo.PageResult;
 import com.cjy.traceability.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cjy.traceability.framework.mybatis.core.mapper.BaseMapperX;
+import com.cjy.traceability.framework.mybatis.core.query.MPJLambdaWrapperX;
+import com.cjy.traceability.module.traceability.dal.dataobject.base.TraceabilityBaseDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockDO;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.cjy.traceability.module.traceability.controller.admin.block.vo.*;
 import org.apache.ibatis.annotations.Param;
@@ -31,4 +35,7 @@ public interface BlockMapper extends BaseMapperX<BlockDO> {
 
     public IPage<BlockCropDO> selectBlockCropPage(IPage<BlockCropDO> page, @Param("reqVO") BlockCropPageReqVO reqVO);
 
+    default  Long selectBlockNumBaseId(Integer baseId){
+        return  selectCount(BlockDO::getBaseId,baseId);
+    }
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseServiceImpl.java

@@ -1,5 +1,7 @@
 package com.cjy.traceability.module.traceability.service.base;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -68,7 +70,9 @@ public class TraceabilityBaseServiceImpl implements TraceabilityBaseService {
 
     @Override
     public PageResult<TraceabilityBaseDO> getBasePage(TraceabilityBasePageReqVO pageReqVO) {
-        return baseMapper.selectPage(pageReqVO);
+        IPage<TraceabilityBaseDO> page  = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        baseMapper.selectBaseBlockPage(page,pageReqVO);
+        return  new PageResult<>(page.getRecords(),page.getTotal());
     }
 
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockService.java

@@ -53,4 +53,10 @@ public interface BlockService {
 
     PageResult<BlockCropDO> getBlockCropPage(BlockCropPageReqVO pageReqVO);
 
+    /**
+     *  根据基地id 查询土地块数
+     * @param baseId
+     * @return
+     */
+    Long  selectBlockNuMbyBaseId(Integer baseId);
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockServiceImpl.java

@@ -81,4 +81,9 @@ public class BlockServiceImpl implements BlockService {
         return  new PageResult<>(pages.getRecords(),pages.getTotal());
     }
 
+    @Override
+    public Long selectBlockNuMbyBaseId(Integer baseId) {
+        return  blockMapper.selectBlockNumBaseId(baseId);
+    }
+
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/base/TraceabilityBaseMapper.xml

@@ -8,5 +8,30 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-
+    <resultMap id="BaseBlockResult" type="com.cjy.traceability.module.traceability.dal.dataobject.base.TraceabilityBaseDO">
+        <result column="id" property="id"/>
+        <result column="base_name" property="baseName"/>
+        <result column="province" property="province"/>
+        <result column="city" property="city"/>
+        <result column="district" property="district"/>
+        <result column="base_address" property="baseAddress"/>
+        <result column="latitude" property="latitude"/>
+        <result column="longitude" property="longitude"/>
+        <result column="base_area" property="baseArea"/>
+        <result column="base_leader" property="baseLeader"/>
+        <result column="base_status" property="baseStatus"/>
+        <result column="base_phone" property="basePhone"/>
+        <result column="base_description" property="baseDescription"/>
+        <result column="base_image" property="baseImage"/>
+        <result column="blockNum" property="blockNum"/>
+    </resultMap>
+    
+    <select id="selectBaseBlockPage" resultMap="BaseBlockResult">
+        select t1.id,t1.base_name,t1.province,t1.city,t1.district,t1.base_address,
+               t1.latitude,t1.longitude,t1.base_area,t1.base_leader,t1.base_status,t1.base_phone,
+               t1.base_description,t1.create_time,(select count(t2.id) from traceability_block t2 where t2.base_id = t1.id and t2.deleted is false ) as blockNum from traceability_base t1
+        <where>
+            <if test="reqVO.baseName !=null and reqVO.baseName !='' "> and t1.base_name like concat('%',#{reqVO.baseName},'%')</if>
+        </where>
+    </select>
 </mapper>