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

@@ -68,7 +68,7 @@
      QueryWrapper queryWrapper = new QueryWrapper();
      queryWrapper.eq("\"res_guid\"", entity.getResGuid());
      queryWrapper.eq("\"tb_year\"", entity.getTbYear());
//      queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
      queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
      TbResGeneralInvestigationState state = tbResGeneralInvestigationStateService.getOne(queryWrapper);
      if (null == state) {
         state = new TbResGeneralInvestigationState();
@@ -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.getResName() + "本年度已经普查完成，不能在提交了。");
         }
      }
@@ -108,6 +108,7 @@
      QueryWrapper queryWrapper = new QueryWrapper();
      queryWrapper.eq("\"res_guid\"", entity.getResGuid());
      queryWrapper.eq("\"tb_year\"", entity.getTbYear());
      queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
      TbResGeneralInvestigationState state = tbResGeneralInvestigationStateService.getOne(queryWrapper);
      if (null == state) {
         //无填报状态记录则新建
@@ -119,7 +120,7 @@
         state.setCreateUser(entity.getCreateUser());
      } else {
         //查看填报状态，只有0填报中才可以一直填报
         if (state.getCheckState() == 1 || state.getCheckState() == 2) {
         if (state.getCheckState() <= 3) {
            return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
         }
      }