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

guoshilong

2023-10-31 ea5a71d924e0163f2fb7cae00fc390b5068c050b

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

@@ -333,7 +333,15 @@
         if (flag){
            tbAttResBase.setFinalState(1);
         }else {
            tbAttResBase.setFinalState(0);
            // 否则判断是否审核中
            flag = baseMapper.getFinalCheckStateCheckLoadingByGuid(resGuid);
            if (flag){
               // 设置为审核中
               tbAttResBase.setFinalState(2);
            }else {
               // 填写中
               tbAttResBase.setFinalState(0);
            }
         }
      }else {
         tbAttResBase.setFinalState(0);