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

guoshilong

2023-11-28 ae37e30dcf71113f69d11fbe7cfef389a1fb9a01

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

@@ -60,9 +60,9 @@
      // 修改
      int i = addOrUpdateByGuid(detail,tbAttResProjectUtilize);
      if (i>0){
         if (!edit) {
            tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(), 0);
         }
//         if (!edit) {
//            tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(), 0);
//         }
         return true;
      }
      return false;
@@ -93,8 +93,11 @@
      if (tbAttResProjectUtilize.getCheckState()==3){
         tbAttResProjectUtilize.setCheckState(0);
      }

      detail.setCheckState(tbAttResProjectUtilize.getCheckState());

      // 更新数据
      int i = baseMapper.updateById(tbAttResProjectUtilize);
      int i = baseMapper.updateById(detail);
      if (i>0){
         if (!edit) {
            tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(), tbAttResProjectUtilize.getCheckState());
@@ -115,6 +118,7 @@
         tbAttResProjectUtilize.setGuid(oldAbAttResBase.getGuid());
         // 更新
         i = baseMapper.updateById(tbAttResProjectUtilize);
         tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(),tbAttResProjectUtilize.getCheckState());
      }else {
         tbAttResProjectUtilize.setCreateTime(new Date());
         i = baseMapper.insert(tbAttResProjectUtilize);