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

shenyijian

2024-09-26 b6673e839cde1597511e56b154e2fe02ee54ed63

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java

@@ -68,7 +68,7 @@
      QueryWrapper queryWrapper = new QueryWrapper();
      queryWrapper.eq("\"dyke_guid\"",entity.getDykeGuid());
      queryWrapper.eq("\"tb_year\"",entity.getTbYear());
//      queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
      queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
      TbDykeInvestigationState state = tbDykeInvestigationStateService.getOne(queryWrapper);
      if (null == state) {
         state = new TbDykeInvestigationState();
@@ -78,7 +78,7 @@
         state.setCreateTime(entity.getCreateTime());
         state.setCreateUser(entity.getCreateUser());
      } else {
         if (state.getCheckState() == 1 || state.getCheckState() == 2) {
         if (state.getCheckState() > 1) {
            return R.fail(entity.getDykeName() + "本年度已经普查完成，不能在提交了。");
         }
      }
@@ -100,6 +100,7 @@
         QueryWrapper qw = new QueryWrapper();
         qw.eq("\"dyke_guid\"",entity.getDykeGuid());
         qw.eq("\"unit\"",entity.getUnit());
         qw.eq("\"tb_quarter\"",entity.getTbQuarter());
         long count = count(qw);
         if (count > 0) {
            entity.setDangerLength(0D);
@@ -120,6 +121,7 @@
      QueryWrapper queryWrapper = new QueryWrapper();
      queryWrapper.eq("\"dyke_guid\"",entity.getDykeGuid());
      queryWrapper.eq("\"tb_year\"",entity.getTbYear());
      queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
      TbDykeInvestigationState state = tbDykeInvestigationStateService.getOne(queryWrapper);
      if (null == state) {
         //无填报状态记录则新建