Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztdw/service/impl/DwsResFormDiServiceImpl.java

@@ -42,6 +42,7 @@
   private IDsmSpgSpprmpService dsmSpgSpprmpService;

   @Override
   @Transactional
   public void importDbPersonData(List<DbExcel> data, String resGuid,String ch) {

      //获取行政区划
@@ -61,7 +62,7 @@
      List<DsmSpgSpqnmp> dsmSpgSpqnmpList = dsmSpgSpqnmpService.getList(paramSl);

      data.forEach(dbExcel->{

         dbExcel.setAvgValue(dbExcel.getAvgValue().replace("，",","));
         if (StringUtil.isBlank(dbExcel.getRz())){
            dbExcel.setRz("");
         }
@@ -200,6 +201,7 @@
            }
         }
      }catch (Exception e){
         e.printStackTrace();
         throw new RuntimeException("表格渗压数据个数超过当前水库断面测点个数");
      }