|
|
@ -289,7 +289,7 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
if (!StringUtils.hasText(rollNo)) { |
|
|
if (!StringUtils.hasText(rollNo)) { |
|
|
throw new XJException(rowTag + "卷号不能为空"); |
|
|
throw new XJException(rowTag + "卷号不能为空"); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.hasText(mrbNo)) { |
|
|
|
|
|
|
|
|
if (!todoAuditContext && !StringUtils.hasText(mrbNo)) { |
|
|
throw new XJException(rowTag + "MRB不能为空"); |
|
|
throw new XJException(rowTag + "MRB不能为空"); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.hasText(processExceptionNo)) { |
|
|
if (!StringUtils.hasText(processExceptionNo)) { |
|
|
@ -3935,6 +3935,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
query.put("todoStatus", trimToEmpty(inData == null ? null : inData.get("todoStatus"))); |
|
|
query.put("todoStatus", trimToEmpty(inData == null ? null : inData.get("todoStatus"))); |
|
|
query.put("status", trimToEmpty(inData == null ? null : inData.get("status"))); |
|
|
query.put("status", trimToEmpty(inData == null ? null : inData.get("status"))); |
|
|
query.put("matchRoleOnly", trimToEmpty(inData == null ? null : inData.get("matchRoleOnly"))); |
|
|
query.put("matchRoleOnly", trimToEmpty(inData == null ? null : inData.get("matchRoleOnly"))); |
|
|
|
|
|
query.put("auditTimeStart", trimToEmpty(inData == null ? null : inData.get("auditTimeStart"))); |
|
|
|
|
|
query.put("auditTimeEnd", trimToEmpty(inData == null ? null : inData.get("auditTimeEnd"))); |
|
|
|
|
|
query.put("triggerTimeStart", trimToEmpty(inData == null ? null : inData.get("triggerTimeStart"))); |
|
|
|
|
|
query.put("triggerTimeEnd", trimToEmpty(inData == null ? null : inData.get("triggerTimeEnd"))); |
|
|
|
|
|
|
|
|
if (includePaging) { |
|
|
if (includePaging) { |
|
|
int pageNo = toPositiveInt(inData == null ? null : inData.get("page"), 1); |
|
|
int pageNo = toPositiveInt(inData == null ? null : inData.get("page"), 1); |
|
|
|