zhongrj
2025-02-11 b1e8a099eb3117bcbd5f2e0c9a2eb0accabd8cbf
src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
@@ -76,16 +76,16 @@
         setFirm(emergencySuppliesExcel,emergencySuppliesEntity);
         setSupplies(emergencySuppliesExcel,emergencySuppliesEntity);
         // 查询是否已入库
         Long id = isSave(emergencySuppliesEntity);
//         Long id = isSave(emergencySuppliesEntity);
         // 已入库
         if (null!=id){
            if (isCovered){
               emergencySuppliesEntity.setId(id);
               // 覆盖-更新
               updateById(emergencySuppliesEntity);
               continue;
            }
         }
//         if (null!=id){
//            if (isCovered){
//               emergencySuppliesEntity.setId(id);
//                覆盖-更新
//               updateById(emergencySuppliesEntity);
//               continue;
//            }
//         }
         // 保存
         save(emergencySuppliesEntity);
      }
@@ -134,7 +134,10 @@
      QueryWrapper<SuppliesEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("name",emergencySuppliesExcel.getSuppliesName())
         .eq("is_deleted",0);
      if (!emergencySuppliesExcel.getSuppliesName().contains("园区")){
      if (!emergencySuppliesExcel.getSuppliesName().contains("园区")
         && !emergencySuppliesExcel.getSuppliesName().contains("码头工业城")
         && !emergencySuppliesExcel.getSuppliesName().contains("环境局")
      ){
         wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());
      }
      SuppliesEntity suppliesEntity = suppliesService.getOne(wrapper);
@@ -152,9 +155,7 @@
   public Map<String, Object> getEmergencySuppliesList(EmergencySuppliesVO emergencySupplies) {
      Map<String, Object> map = new HashMap<>();
      // 查询企业对应的应急物资信息
      QueryWrapper<EmergencySuppliesEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("firm_id",emergencySupplies.getFirmId()).eq("is_deleted",0);
      List<EmergencySuppliesEntity> list = list(wrapper);
      List<EmergencySuppliesVO> list = baseMapper.getEmergencySuppliesList(emergencySupplies);
      map.put("dataList",list);
      // 查询企业对应应急物资的图片
      QueryWrapper<YwAttachEntity> queryWrapper = new QueryWrapper<>();