Browse Source

no message

FengChaoYu 4 months ago
parent
commit
c68c9edd1f

+ 10 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/AppraiseRelaLogic.java

@@ -503,7 +503,7 @@ public class AppraiseRelaLogic {
                 .in(PgAppraiseApply::getId, ids)
                 .list();
 
-        final Integer count = pgAppraiseApplyService.lambdaQuery()
+        Integer count = pgAppraiseApplyService.lambdaQuery()
                 .in(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.WAIT.getKey(), AppraiseApplyStatusEnum.WAIT_CENTER.getKey())
                 .in(PgAppraiseApply::getId, ids)
                 .count();
@@ -512,6 +512,15 @@ public class AppraiseRelaLogic {
             throw new RemoteServiceException("有“待申诉”或“待中心审核”申诉记录,不能操作“驳回可再申诉”");
         }
 
+        count = pgAppraiseApplyService.lambdaQuery()
+                .isNotNull(PgAppraiseApply::getCloseTime)
+                .in(PgAppraiseApply::getId, ids)
+                .count();
+
+        if (count > 0) {
+            throw new RemoteServiceException("有“驳回不可再申诉信息”申诉记录,不能操作“驳回可再申诉”");
+        }
+
         for (PgAppraiseApply apply : applyList) {
             if (Objects.nonNull(apply.getRejectTime())) {
                 throw new RemoteServiceException(apply.getOrderBaseId() + "工单编号的申诉记录有“驳回可重申诉信息”,不能操作“驳回可再申诉”");