|
@@ -289,6 +289,17 @@ public class AppraiseRelaLogic {
|
|
|
|
|
|
// 有驳回可重诉人忽略申诉配置
|
|
|
if (superCount == 0) {
|
|
|
+ if (isAdd) {
|
|
|
+ // 新增时判断是否已申诉过
|
|
|
+ Integer count = pgAppraiseApplyService.lambdaQuery()
|
|
|
+ .eq(PgAppraiseApply::getIsSecond, false)
|
|
|
+ .eq(PgAppraiseApply::getOrderBaseId, bean.getOrderBaseId())
|
|
|
+ .count();
|
|
|
+ if (count > 0) {
|
|
|
+ throw new RemoteServiceException("已申诉, 提交失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
Date overTime = Objects.nonNull(orderBase.getOverTime()) ? orderBase.getOverTime() : orderBase.getWebsitOverTime();
|
|
|
DateTime endTime;
|
|
|
// 1、完工时间超过配置时间的,不可再提交;
|
|
@@ -310,17 +321,6 @@ public class AppraiseRelaLogic {
|
|
|
if (DateUtil.date().after(endTime)) {
|
|
|
throw new RemoteServiceException("已超" + str + "申诉时间, 提交失败");
|
|
|
}
|
|
|
-
|
|
|
- if (isAdd) {
|
|
|
- // 新增时判断是否已申诉过
|
|
|
- Integer count = pgAppraiseApplyService.lambdaQuery()
|
|
|
- .eq(PgAppraiseApply::getIsSecond, false)
|
|
|
- .eq(PgAppraiseApply::getOrderBaseId, bean.getOrderBaseId())
|
|
|
- .count();
|
|
|
- if (count > 0) {
|
|
|
- throw new RemoteServiceException("已申诉, 提交失败");
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
bean.setIsSecond(applyCount > 0);
|
|
|
|