2021/7/16 修复app转栏

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/controller/PigController.java

@@ -34,8 +34,6 @@ public class PigController {
     @Autowired
     private PigService pigService;
 
-    @Autowired
-    private HealthMedicalRecordDao healthMedicalRecordDao;
 
     /**
      * 获取猪健康状态信息

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

@@ -27,10 +27,8 @@ import org.springframework.stereotype.Service;
 import org.apache.commons.beanutils.BeanUtils;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.PageUtils;
@@ -354,6 +352,9 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         String username = user.getUsername();
 
         LambdaQueryWrapper<YearPigBaseEntity> queryWrapper = Wrappers.lambdaQuery();
+        if (CollUtil.isEmpty(Arrays.asList(earTagList))) {
+            throw new RRException("耳标参数为空,请检查!");
+        }
         for (String eatTag : earTagList) {
             queryWrapper.eq(YearPigBaseEntity::getEartag,eatTag);
             YearPigBaseEntity oldEntity = baseMapper.selectOne(queryWrapper);
@@ -387,6 +388,7 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
 
             yearPigBaseEntity.setId(oldEntity.getPigstyId());
             yearPigBaseEntity.setUnitId(unitId);
+            yearPigBaseEntity.setPigstyId(unitEntity.getPigstyId());
             yearPigBaseEntity.setPeriodId(unitEntity.getCurrentPeriodId());
             updateById(yearPigBaseEntity);
         }