添加种猪查询

huimv-smart-management/src/main/java/com/huimv/management/controller/UnitController.java

@@ -100,7 +100,6 @@ public class UnitController {
             if (count > 0){
                 return R.error("删除失败,栏期下有未清除的小猪");
             }
-
         }
 		unitService.removeByIds(Arrays.asList(ids));
 

huimv-smart-management/src/main/java/com/huimv/management/dao/UnitDao.java

@@ -1,8 +1,13 @@
 package com.huimv.management.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huimv.management.entity.UnitEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.management.entity.vo.DrinkingWaterVo;
+import com.huimv.management.entity.vo.PigBaseVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -15,5 +20,6 @@ import org.springframework.stereotype.Repository;
 @Mapper
 @Repository
 public interface UnitDao extends BaseMapper<UnitEntity> {
-	
+
+    IPage<PigBaseVo> list(@Param("page")IPage<Object> page, @Param("ew")QueryWrapper<DrinkingWaterVo> queryWrapper);
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/vo/UnitVo.java

@@ -0,0 +1,47 @@
+package com.huimv.management.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.management.entity.vo
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/6/21 0021 13:56
+ **/
+@Data
+public class UnitVo {
+
+    /**
+     * 单元id
+     */
+    private Integer id;
+    /**
+     * 单元编号
+     */
+    private String number;
+    /**
+     * 猪舍id
+     */
+    private Integer  pigstyId;
+
+    /**
+     * 猪舍id
+     */
+    private String  pigstyName;
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
+
+    /**
+     * 当前栏期
+     */
+    private Integer currentPeriodId;
+
+    /**
+     * 当前栏期
+     */
+    private String periodName;
+}

huimv-smart-management/src/main/java/com/huimv/management/service/impl/BreedParentsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.management.service.impl;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,10 +19,32 @@ public class BreedParentsServiceImpl extends ServiceImpl<BreedParentsDao, BreedP
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
         String farmId = (String)params.get("farmId");
 
         QueryWrapper<BreedParentsEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_id",farmId);
+
+        //耳标
+        String eartag = (String)params.get("eartag");
+        wrapper.like(StringUtils.isNotBlank(eartag),"eartag_no",eartag);
+
+        //类型
+        String type = (String)params.get("type");
+        wrapper.eq(StringUtils.isNotBlank(type),"type",type);
+
+        //性别
+        String gender = (String)params.get("gender");
+        wrapper.eq(StringUtils.isNotBlank(gender),"gender",gender);
+
+        //血统(种类)
+        String blood = (String)params.get("blood");
+        wrapper.eq(StringUtils.isNotBlank(blood),"blood",blood);
+
+        //原产地(来源)
+        String origin = (String)params.get("origin");
+        wrapper.eq(StringUtils.isNotBlank(origin),"origin",origin);
+
         IPage<BreedParentsEntity> page = this.page(
                 new Query<BreedParentsEntity>().getPage(params),
                 wrapper

huimv-smart-management/src/main/java/com/huimv/management/service/impl/UnitServiceImpl.java

@@ -7,6 +7,8 @@ import com.huimv.management.dao.PigstyDao;
 import com.huimv.management.entity.UnitEntity;
 import com.huimv.management.entity.UnitEntity;
 import com.huimv.management.entity.UnitEntity;
+import com.huimv.management.entity.vo.DrinkingWaterVo;
+import com.huimv.management.entity.vo.PigBaseVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,37 +34,37 @@ public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        LambdaQueryWrapper<UnitEntity> lambdaQuery = Wrappers.lambdaQuery();
+        //构建条件查询wrapper
+        QueryWrapper<DrinkingWaterVo> queryWrapper = new QueryWrapper<>();
 
         String formFarmId = (String) params.get("formFarmId");
         System.out.println(formFarmId);
         if (StringUtils.isNotBlank(formFarmId)) {
-            lambdaQuery.eq(UnitEntity::getFarmId, Integer.parseInt(formFarmId));
+            queryWrapper.eq("farm_id", Integer.parseInt(formFarmId));
         }
 
         //单元编号
-        String keywords = (String) params.get("keywords");
+        String keywords = (String) params.get("keyword");
         if (StringUtils.isNotBlank(keywords)) {
 
-            lambdaQuery.like(UnitEntity::getNumber, keywords);
+            queryWrapper.like("number", keywords);
         }
 
         //栏期编号
         String currentPeriodId = (String) params.get("currentPeriodId");
         if (StringUtils.isNotBlank(currentPeriodId)) {
-            lambdaQuery.eq(UnitEntity::getCurrentPeriodId, currentPeriodId);
+            queryWrapper.eq("current_period_id", currentPeriodId);
         }
 
         //猪舍编号
         String pigstyId = (String) params.get("pigstyId");
         if (StringUtils.isNotBlank(pigstyId)) {
-            lambdaQuery.eq(UnitEntity::getPigstyId, pigstyId);
+            queryWrapper.eq("pigsty_id", pigstyId);
         }
+        queryWrapper.apply("unit.deleted = 0  AND pigsty.deleted = 0 AND period.deleted = 0");
+        IPage<PigBaseVo> page = unitDao.list(new Query<>().getPage(params),queryWrapper);
 
 
-        IPage<UnitEntity> page = page(this.page(
-                new Query<UnitEntity>().getPage(params)
-        ), lambdaQuery);
         return new PageUtils(page);
     }
 

huimv-smart-management/src/main/resources/mapper/management/UnitDao.xml

@@ -14,6 +14,20 @@
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>
     </resultMap>
+    <select id="list" resultType="com.huimv.management.entity.vo.UnitVo">
+        SELECT
+            unit.id,
+            unit.number,
+            unit.pigsty_id,
+            unit.current_period_id,
+            pigsty.number pigstyName,
+            period.number period
+        FROM
+            mgt_unit unit
+        JOIN mgt_pigsty pigsty ON pigsty.id = unit.pigsty_id
+        JOIN mgt_period period ON  period.id = unit.current_period_id
+         ${ew.customSqlSegment}
+    </select>
 
 
 </mapper>