更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断

guoshilong

2022-09-26 2648880bec1583ce4fe1886de65300f0a22638d0

 src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java

@@ -33,6 +33,7 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.farm.entity.FarmingRecord;
import org.springblade.modules.farm.service.FarmingRecordService;
import org.springblade.modules.farmplant.entity.FarmPlant;
@@ -226,9 +227,8 @@
         }
         record.setLandId(farmPlant.getLandId());
         record.setOperator(farmPlant.getCreateUser());
         if (farmPlant.getVarieties().equals("")){
         if (StringUtil.isBlank(farmPlant.getVarieties())){
            record.setContent("品种: " + strain.getStrainName());

         }else {
            record.setContent("品种: " + strain.getStrainName()+"-"+farmPlant.getVarieties());
         }