修改耳标bug

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

@@ -84,10 +84,9 @@ public class HealthMedicalRecordController {
             throw new RRException("耳标号为：" + earTag + " 的耳标信息不存在，请检查输入的耳标号是否有误！");
         }
 
-        String eartag = healthMedicalRecord.getPigId();
         LambdaUpdateWrapper<YearPigBaseEntity> wrapper = Wrappers.lambdaUpdate();
 
-        wrapper.eq(YearPigBaseEntity::getEartag,eartag);
+        wrapper.eq(YearPigBaseEntity::getEartag,earTag);
         wrapper.set(YearPigBaseEntity::getHealthStatus,false);
         yearPigBaseService.update(wrapper);
 

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

@@ -122,6 +122,13 @@ public class YearPigBaseController {
             yearPigBase.setPeriodId(unitEntity.getCurrentPeriodId());
         }
         for (String eartage : yearPigBase.getEartag().split(",")) {
+            YearPigBaseEntity yearPigBaseEntity = yearPigBaseService.getOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, eartage));
+            if (yearPigBaseEntity == null) {
+                throw new RRException("耳标号为：" + eartage + " 的耳标信息不存在，请检查输入的耳标号是否有误！");
+            }
+        }
+
+        for (String eartage : yearPigBase.getEartag().split(",")) {
             yearPigBase.setEartag(eartage);
             yearPigBaseService.save(yearPigBase);
         }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -59,6 +61,7 @@ public class LairageRecordEntity implements Serializable {
 	/**
 	 * 出生日期
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
 	private Date birthday;
 	/**
 	 * 产地

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

@@ -24,8 +24,8 @@ public class BaseBloodlineServiceImpl extends ServiceImpl<BaseBloodlineDao, Base
         String keywords = (String) params.get("keyword");
         QueryWrapper<BaseBloodlineEntity> queryWrapper = new QueryWrapper<>();
 
-        queryWrapper.like(StringUtils.isNotBlank(keywords),"name",keywords);
-        queryWrapper.like(StringUtils.isNotBlank(keywords),"origin",keywords);
+        queryWrapper.like(StringUtils.isNotBlank(keywords),"name",keywords)
+                .or().like(StringUtils.isNotBlank(keywords),"origin",keywords);
 
         IPage<BaseBloodlineEntity> page = this.page(
                 new Query<BaseBloodlineEntity>().getPage(params),

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

@@ -435,7 +435,9 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
 
         //养殖状态
         String outFenceStatus = (String) params.get("outFenceStatus");
-        if (StringUtils.isNotEmpty(outFenceStatus)) {
+        if (StringUtils.isEmpty(outFenceStatus)) {
+            queryWrapper.eq("base.out_fence_status",0);
+        }else {
             queryWrapper.eq("base.out_fence_status",Integer.parseInt(outFenceStatus));
         }
 
@@ -461,8 +463,19 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         if (StringUtils.isNotEmpty(farmId)) {
             queryWrapper.eq("base.farm_id",Integer.parseInt(farmId));
         }
+        //日龄
+        String startDate = (String) params.get("startDate");
+        if (StringUtils.isNotEmpty(startDate)) {
+            queryWrapper.eq("base.day_age",startDate);
+        }
+        String endDate = (String) params.get("endDate");
+        if (StringUtils.isNotEmpty(endDate)) {
+            queryWrapper.eq("base.day_age",endDate);
+        }
+
+
         //排除逻辑删除
-        queryWrapper.apply(" base.deleted = 0  AND pigsty.deleted = 0 AND base.out_fence_status = 0 ");
+        queryWrapper.apply(" base.deleted = 0  AND pigsty.deleted = 0");
 
         IPage<PigBaseVo> page = pigBaseDao.fattenList(new Query<>().getPage(params),queryWrapper);
 

renren-generator/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     #MySQL配置
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.7:3306/huimv_smart_apiservice?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.7:3306/smart_eartag_data_platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     #oracle配置