Prechádzať zdrojové kódy

fix:
1.考勤打卡查询可查卡sop更改(通派单下查询异常),扫描阅卷时间考勤和sop不一致更改

caozixuan 11 mesiacov pred
rodič
commit
765dd1e2c3

+ 2 - 4
sop-api/src/main/java/com/qmth/sop/server/api/TBDingController.java

@@ -266,11 +266,9 @@ public class TBDingController {
                         }
                         }
                         sopInfo.add(result);
                         sopInfo.add(result);
                     }
                     }
-                    if (CollectionUtils.isNotEmpty(sopInfo)) {
-                        cell.setSopInfo(sopInfo);
-                    }
                 }
                 }
-                if (CollectionUtils.isNotEmpty(cell.getSopInfo())) {
+                if (CollectionUtils.isNotEmpty(sopInfo)) {
+                    cell.setSopInfo(sopInfo);
                     resultList.add(cell);
                     resultList.add(cell);
                 }
                 }
             }
             }

+ 1 - 1
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -1329,9 +1329,9 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
         if (!tbDingSubmitService.canUpdateDingSetting(tbSopInfo.getSopNo())) {
         if (!tbDingSubmitService.canUpdateDingSetting(tbSopInfo.getSopNo())) {
             throw ExceptionResultEnum.ERROR.exception("考勤已提交,不能修改时间");
             throw ExceptionResultEnum.ERROR.exception("考勤已提交,不能修改时间");
         }
         }
-        tbDingService.resetDingExceptionBySopNo(tbSopInfo.getSopNo());
         tbCrmDetail.updateInfo(sysUser.getId());
         tbCrmDetail.updateInfo(sysUser.getId());
         tbCrmDetailService.updateById(tbCrmDetail);
         tbCrmDetailService.updateById(tbCrmDetail);
+        tbDingService.resetDingExceptionBySopNo(tbSopInfo.getSopNo());
         return tfCustomFlowEntityService.updateById(tfCustomFlowEntity);
         return tfCustomFlowEntityService.updateById(tfCustomFlowEntity);
     }
     }