部分查询，导入操作调整

zhongrj

2025-02-20 d93c3e0310ad88dbe4d09dcfe0e497356d27f40e

 src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java

@@ -65,9 +65,9 @@
      for (EmergencySuppliesExcel emergencySuppliesExcel : data) {
         EmergencySuppliesEntity emergencySuppliesEntity = Objects.requireNonNull(BeanUtil.copy(emergencySuppliesExcel, EmergencySuppliesEntity.class));
         // 物资类型转换
         if (!Strings.isBlank(emergencySuppliesExcel.getType())){
            emergencySuppliesEntity.setType(Integer.parseInt(emergencySuppliesExcel.getType()));
         }
//         if (!Strings.isBlank(emergencySuppliesExcel.getType())){
//            emergencySuppliesEntity.setType(Integer.parseInt(emergencySuppliesExcel.getType()));
//         }
         // 物资单位转换
         if (!Strings.isBlank(emergencySuppliesExcel.getUnit())){
            emergencySuppliesEntity.setUnit(Integer.parseInt(emergencySuppliesExcel.getUnit()));
@@ -135,7 +135,6 @@
      wrapper.eq("name",emergencySuppliesExcel.getSuppliesName())
         .eq("is_deleted",0);
      if (!emergencySuppliesExcel.getSuppliesName().contains("园区")
         && !emergencySuppliesExcel.getSuppliesName().contains("码头工业城")
         && !emergencySuppliesExcel.getSuppliesName().contains("环境局")
      ){
         wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());