年猪基本信息添加牧场字段

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

@@ -103,4 +103,15 @@ public class YearPigBaseController {
         return R.ok();
     }
 
+    @RequestMapping("/such")
+    public R such(@RequestBody YearPigBaseEntity yearPigBase){
+
+        for (String eartage : yearPigBase.getEartag().split(",")) {
+            yearPigBase.setEartag(eartage);
+            yearPigBaseService.save(yearPigBase);
+        }
+
+        return R.ok();
+    }
+
 }

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

@@ -75,6 +75,11 @@ public class YearPigBaseEntity implements Serializable {
     private String originPlace;
 
     /**
+     * 牧场id
+     */
+    private Integer farmId;
+
+    /**
      * 豬舍id
      */
     private Integer pigstyId;

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

@@ -25,6 +25,10 @@ public class HealthIsolationRecordServiceImpl extends ServiceImpl<HealthIsolatio
 
         QueryWrapper<HealthIsolationRecordEntity> wrapper = new QueryWrapper<HealthIsolationRecordEntity>();
         wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
+
+       String eartag = (String)params.get("eartag");
+       wrapper.like("pig_id",eartag);
+
         IPage<HealthIsolationRecordEntity> page = this.page(
                 new Query<HealthIsolationRecordEntity>().getPage(params),
                 wrapper

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

@@ -23,28 +23,34 @@ public class HealthMedicalRecordServiceImpl extends ServiceImpl<HealthMedicalRec
 
         //根据牧场查询
         String farmId = (String) params.get("farmId");
-
         QueryWrapper<HealthMedicalRecordEntity> wrapper = new QueryWrapper<HealthMedicalRecordEntity>();
         wrapper.eq(StringUtils.isNotBlank(farmId),"farm_id",farmId);
 
+        //耳标
         String pigId = (String) params.get("eartag");
         wrapper.like(StringUtils.isNotBlank(pigId),"farm_id",pigId);
 
+        //疾病名称
         String diseaseName = (String) params.get("diseaseName");
         wrapper.eq(StringUtils.isNotBlank(diseaseName),"disease_name",diseaseName);
 
+        //病因
         String causeName = (String) params.get("causeName");
         wrapper.eq(StringUtils.isNotBlank(causeName),"cause_name",causeName);
 
+        //症状
         String symptomName = (String) params.get("symptomName");
         wrapper.eq(StringUtils.isNotBlank(symptomName),"symptom_name",symptomName);
 
+        //兽医姓名
         String doctor = (String) params.get("doctor");
         wrapper.eq(StringUtils.isNotBlank(doctor),"doctor",doctor);
 
+        //治疗方案
         String treatmentPlan = (String) params.get("treatmentPlan");
         wrapper.eq(StringUtils.isNotBlank(treatmentPlan),"treatment_plan",treatmentPlan);
 
+        //治疗结果
         String result = (String) params.get("result");
         wrapper.eq(StringUtils.isNotBlank(result),"result",result);