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

ke

2024-05-15 ab5c1c6cbcdeb98d84bdde3c111fe871466d3a5c

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java

@@ -5,6 +5,7 @@
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbDykeInvestigationService;
import cn.gistack.sm.sjztmd.service.ITbDykeInvestigationStateService;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsBar;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsParams;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
@@ -101,9 +102,9 @@
   @ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
   @PostMapping(value = "/submit")
   public R submit(@RequestBody TbDykeInvestigation tbDykeInvestigation) {
      if (tbDykeInvestigation.getGuid() == null) {
         tbDykeInvestigation.setCreateTime(new Date());
      }
//      if (tbDykeInvestigation.getGuid() == null) {
      tbDykeInvestigation.setCreateTime(new Date());
//      }
      return tbDykeInvestigationService.saveOrUpdateBy(tbDykeInvestigation);
   }

@@ -138,4 +139,10 @@
      return R.data(statisticsPie);
   }

   @GetMapping("/statisticsBar")
   public R statisticsBar(StatisticsParams statisticsParams){
      List<StatisticsBar> list = tbDykeInvestigationService.statisticsBar(statisticsParams);
      return R.data(list);
   }

}