基本信息修改

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

@@ -146,4 +146,18 @@ public class YearPigBaseController {
         Map<String, Object> stringObjectMap = yearPigBaseService.queryPageByRelationship(params);
         return R.ok().put("Result", stringObjectMap);
     }
+
+    /*
+    * 出栏统计
+    */
+    //TODO
+    @RequestMapping("/suchStatistics")
+    public R suchStatistics(@RequestParam Map<String, Object> params){
+        String startTime = (String)params.get("startTime");
+        String endTime = (String)params.get("endTime");
+        String farmId = (String)params.get("formFarmId");
+
+
+        return R.ok();
+    }
 }

huimv-smart-management/src/main/java/com/huimv/management/dao/YearPigBaseDao.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.YearPigBaseEntity;
 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;
 
 /**
  * 年猪基本
@@ -18,4 +23,6 @@ public interface YearPigBaseDao extends BaseMapper<YearPigBaseEntity> {
 
 
     void such(Integer[] ids);
+
+    IPage<PigBaseVo> list(@Param("page")IPage page, @Param("ew") QueryWrapper<DrinkingWaterVo> queryWrapper);
 }

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

@@ -0,0 +1,56 @@
+package com.huimv.management.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.management.entity.vo
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/6/18 0018 13:55
+ **/
+@Data
+public class PigBaseVo implements Serializable {
+
+    private Integer id;
+
+    private String eartag;
+
+    private Integer dayAge;
+
+    private String unitName;
+
+    private Double weight;
+
+    private Integer fosterStatus;
+
+    private Integer healthStatus;
+
+    private String whereDidYouGo;
+
+    private String breed;
+
+    private String sex;
+
+    private Date birthday;
+
+    private String originPlace;
+
+    private String pigstyName;
+
+    private String periodName;
+
+    private Date inFenceTime;
+
+    private Date outFenceTime;
+
+    private Integer outFenceStatus;
+
+    private String motherEartag;
+
+    private String fatherEartag;
+
+}

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

@@ -1,9 +1,12 @@
 package com.huimv.management.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huimv.management.entity.YearPigBaseEntity;
+import com.huimv.management.entity.vo.DrinkingWaterVo;
+import com.huimv.management.entity.vo.PigBaseVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,64 +56,66 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
 
-        LambdaQueryWrapper<YearPigBaseEntity> lambdaQuery = Wrappers.lambdaQuery();
+        //构建条件查询wrapper
+        QueryWrapper<DrinkingWaterVo> queryWrapper = new QueryWrapper<>();
 
         //耳标
         String eartag = (String) params.get("eartag");
         if (StringUtils.isNotEmpty(eartag)) {
-            lambdaQuery.like(YearPigBaseEntity::getEartag,eartag);
+            queryWrapper.like("base.eartag",eartag);
         }
 
         //性别
         String sex = (String) params.get("sex");
         if (StringUtils.isNotEmpty(sex)) {
-           lambdaQuery.eq(YearPigBaseEntity::getSex,sex);
+            queryWrapper.eq("base.sex",sex);
         }
 
         //品种
         String breed = (String) params.get("breed");
         if (StringUtils.isNotEmpty(breed)) {
-            lambdaQuery.eq(YearPigBaseEntity::getBreed,breed);
+            queryWrapper.eq("base.breed",breed);
         }
 
         //健康状态
         String healthStatus = (String) params.get("healthStatus");
         if (StringUtils.isNotEmpty(healthStatus)) {
-            lambdaQuery.eq(YearPigBaseEntity::getHealthStatus,healthStatus);
+            queryWrapper.eq("base.health_status",Integer.parseInt(healthStatus));
         }
 
         //养殖状态
         String outFenceStatus = (String) params.get("outFenceStatus");
         if (StringUtils.isNotEmpty(outFenceStatus)) {
-            lambdaQuery.eq(YearPigBaseEntity::getOutFenceStatus,outFenceStatus);
+            queryWrapper.eq("base.out_fence_status",Integer.parseInt(outFenceStatus));
         }
 
         //栏期
         String periodId = (String) params.get("periodId");
         if (StringUtils.isNotEmpty(periodId)) {
-            lambdaQuery.eq(YearPigBaseEntity::getPeriodId,periodId);
+            queryWrapper.eq("base.period_id",Integer.parseInt(periodId));
         }
 
         //栋舍
         String pigstyId = (String) params.get("pigstyId");
         if (StringUtils.isNotEmpty(pigstyId)) {
-            lambdaQuery.eq(YearPigBaseEntity::getPigstyId,pigstyId);
+            queryWrapper.eq("base.pigsty_id",Integer.parseInt(pigstyId));
         }
         //单元
         String unitId = (String) params.get("unitId");
         if (StringUtils.isNotEmpty(unitId)) {
-            lambdaQuery.eq(YearPigBaseEntity::getUnitId,unitId);
+            queryWrapper.eq("base.unit_id",Integer.parseInt(unitId));
         }
 
-        //单元
+        //牧场
         String farmId = (String) params.get("formFarmId");
         if (StringUtils.isNotEmpty(farmId)) {
-            lambdaQuery.eq(YearPigBaseEntity::getFarmId,farmId);
+            queryWrapper.eq("base.farm_id",Integer.parseInt(farmId));
         }
+        //排除逻辑删除
+        queryWrapper.apply(" base.deleted = 0  AND pigsty.deleted = 0 AND period.deleted = 0");
+
+        IPage<PigBaseVo> page = pigBaseDao.list(new Query<>().getPage(params),queryWrapper);
 
-        IPage<YearPigBaseEntity> page = page(this.page(
-                new Query<YearPigBaseEntity>().getPage(params)
-        ), lambdaQuery);
 
 
         return new PageUtils(page);

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

@@ -31,5 +31,32 @@
       </foreach>
   </update>
 
+    <select id="list" resultType="com.huimv.management.entity.vo.PigBaseVo">
+        SELECT
+          base.id,
+          base.eartag,
+          base.day_age,
+          unit.number unit_name,
+          base.weight,
+          base.foster_status,
+          base.health_status,
+          base.where_did_you_go,
+          base.breed,
+          base.sex,
+          base.birthday,
+          pigsty.number pigsty_name,
+          period.number period_name,
+          base.in_fence_time,
+          base.out_fence_time,
+          base.mother_eartag,
+          base.father_eartag
+
+        from mgt_year_pig_base base
+        JOIN mgt_period period on period.id = base.period_id
+        JOIN mgt_pigsty pigsty on pigsty.id = base.pigsty_id
+        JOIN mgt_unit unit on unit.id = base.unit_id
+        ${ew.customSqlSegment}
+
+    </select>
 
 </mapper>