添加种猪查询

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

@@ -21,5 +21,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface UnitDao extends BaseMapper<UnitEntity> {
 
-    IPage<PigBaseVo> list(@Param("page")IPage<Object> page, @Param("ew")QueryWrapper<DrinkingWaterVo> queryWrapper);
+    IPage list(@Param("page")IPage page, @Param("ew")QueryWrapper<DrinkingWaterVo> queryWrapper);
 }

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

@@ -38,7 +38,7 @@ public class UnitVo {
     /**
      * 当前栏期
      */
-    private Integer currentPeriodId;
+    private Integer periodId;
 
     /**
      * 当前栏期

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

@@ -51,9 +51,9 @@ public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements
         }
 
         //栏期编号
-        String currentPeriodId = (String) params.get("currentPeriodId");
-        if (StringUtils.isNotBlank(currentPeriodId)) {
-            queryWrapper.eq("current_period_id", currentPeriodId);
+        String periodId = (String) params.get("periodId");
+        if (StringUtils.isNotBlank(periodId)) {
+            queryWrapper.eq("current_period_id", periodId);
         }
 
         //猪舍编号

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

@@ -19,7 +19,7 @@
             unit.id,
             unit.number,
             unit.pigsty_id,
-            unit.current_period_id,
+            unit.current_period_id periodId,
             pigsty.number pigstyName,
             period.number period
         FROM