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

gonglilong

2024-09-14 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java

@@ -97,9 +97,21 @@

      if(extremumDO!=null&&extremumDO.getId()!=null){
         return R.data(extremumService.updateById(extremumDO));
      }else {

         String type = extremumDO.getType();
         String skId = extremumDO.getSkId();
         ExtremumDO extremum = extremumService.getExtremum(type, skId);
         if(extremum!=null){
            extremumDO.setId(extremum.getId());
            return R.data(extremumService.updateById(extremumDO));
         }

         return R.data(extremumService.saveOrUpdate(extremumDO));
      }

      return R.data(extremumService.saveOrUpdate(extremumDO));


   }