2021/6/21 转栏管理

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

@@ -6,6 +6,7 @@ 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 com.huimv.management.entity.vo.UnitVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -21,5 +22,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface UnitDao extends BaseMapper<UnitEntity> {
 
-    IPage list(@Param("page")IPage page, @Param("ew")QueryWrapper<DrinkingWaterVo> queryWrapper);
+    IPage<UnitVo> list(@Param("page")IPage page, @Param("ew")QueryWrapper<DrinkingWaterVo> queryWrapper);
 }

huimv-smart-management/src/main/java/com/huimv/management/entity/BreedParentsEntity.java

@@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 
@@ -44,6 +47,7 @@ public class BreedParentsEntity implements Serializable {
 	/**
 	 * 出生日期
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	private Date birthDate;
 	/**
 	 * 血统(种类)

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

@@ -27,7 +27,7 @@ public class UnitVo {
     private Integer  pigstyId;
 
     /**
-     * 猪舍id
+     * 猪舍名称
      */
     private String  pigstyName;
     /**

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

@@ -19,8 +19,7 @@ public class BreedParentsServiceImpl extends ServiceImpl<BreedParentsDao, BreedP
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-
-        String farmId = (String)params.get("farmId");
+        String farmId = (String)params.get("formFarmId");
 
         QueryWrapper<BreedParentsEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_id",farmId);

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

@@ -9,6 +9,7 @@ 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 com.huimv.management.entity.vo.UnitVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,29 +41,29 @@ public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements
         String formFarmId = (String) params.get("formFarmId");
         System.out.println(formFarmId);
         if (StringUtils.isNotBlank(formFarmId)) {
-            queryWrapper.eq("farm_id", Integer.parseInt(formFarmId));
+            queryWrapper.eq("unit.farm_id", Integer.parseInt(formFarmId));
         }
 
         //单元编号
         String keywords = (String) params.get("keyword");
         if (StringUtils.isNotBlank(keywords)) {
 
-            queryWrapper.like("number", keywords);
+            queryWrapper.like("unit.number", keywords);
         }
 
         //栏期编号
         String periodId = (String) params.get("periodId");
         if (StringUtils.isNotBlank(periodId)) {
-            queryWrapper.eq("current_period_id", periodId);
+            queryWrapper.eq("unit.current_period_id", periodId);
         }
 
         //猪舍编号
         String pigstyId = (String) params.get("pigstyId");
         if (StringUtils.isNotBlank(pigstyId)) {
-            queryWrapper.eq("pigsty_id", pigstyId);
+            queryWrapper.eq("unit.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<UnitVo> page = unitDao.list(new Query<>().getPage(params),queryWrapper);
 
 
         return new PageUtils(page);

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

@@ -320,7 +320,7 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
                 throw new RRException("查不到id为" + pigId + "的猪的信息,请检查参数!",1001);
             }
             if (oldEntity.getUnitId().equals(unitId)) {
-                throw new RRException("所转单元不能和原单元相同!",1001);
+                throw new RRException(oldEntity.getEartag() + "所转单元不能和原单元相同!",1001);
             }
             Integer oldPeriodId = oldEntity.getPeriodId();
             String oldPeriodName = periodDao.selectById(oldPeriodId).getNumber();
@@ -346,6 +346,7 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
             logEntityList.add(entity);
 
             yearPigBaseEntity.setId(pigId);
+            yearPigBaseEntity.setUnitId(unitId);
             yearPigBaseEntity.setPeriodId(unitEntity.getCurrentPeriodId());
             updateById(yearPigBaseEntity);
         }

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

@@ -20,9 +20,10 @@
             unit.number,
             unit.pigsty_id,
             unit.current_period_id periodId,
+            unit.farm_id,
 
             pigsty.number pigstyName,
-            period.number period
+            period.number periodName
         FROM
             mgt_unit unit
         JOIN mgt_pigsty pigsty ON pigsty.id = unit.pigsty_id