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/TbResGeneralInvestigationController.java

@@ -9,6 +9,7 @@
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.statisticsVO.StatisticsTable;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.vo.TbResGeneralInvestigationParam;
import cn.gistack.sm.sjztmd.wrapper.AttResBaseWrapper;
@@ -103,9 +104,9 @@
   @ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
   @PostMapping(value = "/submit")
   public R submit(@RequestBody TbResGeneralInvestigation tbResGeneralInvestigation) {
      if (tbResGeneralInvestigation.getGuid() == null) {
         tbResGeneralInvestigation.setCreateTime(new Date());
      }
//      if (tbResGeneralInvestigation.getGuid() == null) {
      tbResGeneralInvestigation.setCreateTime(new Date());
//      }
      return tbResGeneralInvestigationService.saveOrUpdateBy(tbResGeneralInvestigation);
   }

@@ -142,9 +143,16 @@
   }

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


   @GetMapping("/statisticsTable")
   public R statisticsTable(StatisticsParams statisticsParams){
      List<StatisticsTable> list = tbResGeneralInvestigationService.statisticsTable(statisticsParams);
      return R.data(list);
   }

}