2021/6/22 猪基本信息修改

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

@@ -1,5 +1,6 @@
 package com.huimv.management.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,6 +16,8 @@ import java.util.Date;
 @Data
 public class PigBaseVo implements Serializable {
 
+    private static final long serialVersionUID = -5814552568680350545L;
+
     private Integer id;
 
     private String eartag;
@@ -35,6 +38,7 @@ public class PigBaseVo implements Serializable {
 
     private String sex;
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GTM+8")
     private Date birthday;
 
     private String originPlace;

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

@@ -62,7 +62,7 @@ public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements
         if (StringUtils.isNotBlank(pigstyId)) {
             queryWrapper.eq("unit.pigsty_id", pigstyId);
         }
-        queryWrapper.apply("unit.deleted = 0  AND pigsty.deleted = 0 AND period.deleted = 0");
+        queryWrapper.apply("unit.deleted = 0  AND pigsty.deleted = 0");
         IPage<UnitVo> page = unitDao.list(new Query<>().getPage(params),queryWrapper);
 
 

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

@@ -132,7 +132,7 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
             queryWrapper.eq("base.farm_id",Integer.parseInt(farmId));
         }
         //排除逻辑删除
-        queryWrapper.apply(" base.deleted = 0  AND pigsty.deleted = 0 AND period.deleted = 0");
+        queryWrapper.apply(" base.deleted = 0  AND pigsty.deleted = 0 ");
 
         IPage<PigBaseVo> page = pigBaseDao.list(new Query<>().getPage(params),queryWrapper);
 
@@ -358,7 +358,7 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     @Override
     public Integer countByPeriodId(Integer currentPeriodId) {
         QueryWrapper<YearPigBaseEntity> wrapper = new QueryWrapper<YearPigBaseEntity>();
-        wrapper.eq("current_period_id",currentPeriodId);
+        wrapper.eq("period_id",currentPeriodId);
         return baseMapper.selectCount(wrapper);
     }
 }

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

@@ -27,7 +27,7 @@
         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
+         LEFT JOIN mgt_period period ON  period.id = unit.current_period_id
          ${ew.customSqlSegment}
     </select>
 

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

@@ -52,7 +52,7 @@
           base.father_eartag
 
         from mgt_year_pig_base base
-        JOIN mgt_period period on period.id = base.period_id
+        LEFT 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}