修复小猪修改等bug

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

@@ -33,6 +33,9 @@ public class YearPigBaseController {
     @Autowired
     private YearPigBaseService yearPigBaseService;
 
+
+     @Autowired
+     private UnitService unitService;
     /**
      * 列表
      */
@@ -74,12 +77,23 @@ public class YearPigBaseController {
         return R.ok();
     }
 
+
+
     /**
      * 修改
      */
     @RequestMapping("/update")
     public R update(@RequestBody YearPigBaseEntity yearPigBase){
-		yearPigBaseService.updateById(yearPigBase);
+        Integer unitId = yearPigBase.getUnitId();
+        if (unitId == null){
+            return R.error("请选择单元");
+        }
+        Integer currentPeriodId = unitService.getById(unitId).getCurrentPeriodId();
+        if (currentPeriodId == null){
+            return R.error("该单元暂无栏期");
+        }
+        yearPigBase.setPeriodId(currentPeriodId);
+        yearPigBaseService.updateById(yearPigBase);
 
         return R.ok();
     }
@@ -103,8 +117,7 @@ public class YearPigBaseController {
 
         return R.ok();
     } */
-    @Autowired
-    private UnitService unitService;
+
     //批量入栏
     @RequestMapping("/batchLairage")
     public R batchLairage(@RequestBody YearPigBaseEntity yearPigBase){

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

@@ -25,7 +25,7 @@ public class BreedParentsServiceImpl extends ServiceImpl<BreedParentsDao, BreedP
         wrapper.eq("farm_id",farmId);
 
         //耳标
-        String eartag = (String)params.get("eartag");
+        String eartag = (String)params.get("eartagNo");
         wrapper.like(StringUtils.isNotBlank(eartag),"eartag_no",eartag);
 
         //类型

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

@@ -106,7 +106,7 @@
         SELECT DATE_FORMAT(out_fence_time,"%Y-%m") DATE,COUNT(*) total
         FROM `mgt_year_pig_base`
         ${ew.customSqlSegment}
-         GROUP BY DATE HAVING     IS NOT NULL
+         GROUP BY DATE HAVING     DATE IS NOT NULL
 --         GROUP BY DATE_FORMAT(out_fence_time,"%Y-%m")
     </select>
 </mapper>