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

guoshilong

2023-09-11 b6a42ed2c7bb93651a9a026afb3ee83449ed8256

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

@@ -92,6 +92,7 @@
   private int addOrUpdateByGuid(TbAttResInformationProject oldAbAttResBase,TbAttResInformationProject tbAttResInformationProject){
      int i = 0;
      if (null!=oldAbAttResBase){
         tbAttResInformationProject.setGuid(oldAbAttResBase.getGuid());
         // 更新
         i = baseMapper.updateById(tbAttResInformationProject);
      }else {
@@ -113,7 +114,7 @@
         fillName = "审核";
      }
      if (newTbAttResInformationProject.getCheckState()==3){
         fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
//         fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
      }

      // 拼接
@@ -132,12 +133,12 @@
      // 判断是否存在
      if (null==oldAbAttResBase){
         // 填报
         newTbAttResInformationProject.setCheckLog(builder.toString());
//         newTbAttResInformationProject.setCheckLog(builder.toString());
      }else {
         StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
         stringBuilder.append(builder);
//         StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
//         stringBuilder.append(builder);
         // 填报
         newTbAttResInformationProject.setCheckLog(stringBuilder.toString());
//         newTbAttResInformationProject.setCheckLog(stringBuilder.toString());
      }
   }

@@ -158,7 +159,12 @@
         fillName = "审核";
      }
      if (newTbAttResInformationProject.getCheckState()==3){
         fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
//         fillName = "退回" + (null==newTbAttResInformationProject.getCheckLog()?"":":" + newTbAttResInformationProject.getCheckLog());
      }
      // 管理员编辑
      if (newTbAttResInformationProject.getCheckState()==4){
         fillName = "编辑";
         newTbAttResInformationProject.setCheckState(oldAbAttResBase.getCheckState());
      }

      // 拼接
@@ -177,12 +183,12 @@
      // 判断是否存在
      if (null==oldAbAttResBase){
         // 填报
         newTbAttResInformationProject.setLog(builder.toString());
//         newTbAttResInformationProject.setLog(builder.toString());
      }else {
         StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
         stringBuilder.append(builder);
//         StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
//         stringBuilder.append(builder);
         // 填报
         newTbAttResInformationProject.setLog(stringBuilder.toString());
//         newTbAttResInformationProject.setLog(stringBuilder.toString());
      }
   }
}