|
|
@@ -95,6 +95,11 @@ public class EnforceSuperviseController {
|
|
|
@ApiOperation(value = "检查超期列表(分页)")
|
|
|
@GetMapping("/enforcement/timeout/joblist")
|
|
|
public TableInfo<EnforceJobTimeoutDto> getEnforcementJobTimeOutList(EnforcementJobProcessQuery query) {
|
|
|
+ if (ObjectUtils.isNotEmpty(query.getJobType())) {
|
|
|
+ query.setJobTypes(Arrays.asList(query.getJobType().split(",")));
|
|
|
+ query.setJobType(null);
|
|
|
+ }
|
|
|
+ query.setEnforceOrgId(null);
|
|
|
getOrgIds(query);
|
|
|
startPage();
|
|
|
List<EnforceJobTimeoutDto> list = enforceSuperviseMapper.getEnforcementJobTimeOutList(query);
|
|
|
@@ -104,6 +109,10 @@ public class EnforceSuperviseController {
|
|
|
@ApiOperation(value = "检查超期列表导出")
|
|
|
@GetMapping(value = "/enforcement/timeout/joblist/export")
|
|
|
public void getEnforcementJobTimeOutListExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
|
|
|
+ if (ObjectUtils.isNotEmpty(query.getJobType())) {
|
|
|
+ query.setJobTypes(Arrays.asList(query.getJobType().split(",")));
|
|
|
+ query.setJobType(null);
|
|
|
+ }
|
|
|
getOrgIds(query);
|
|
|
List<EnforceJobTimeoutDto> list = enforceSuperviseMapper.getEnforcementJobTimeOutList(query);
|
|
|
if (com.zfjg.common.core.utils.StringUtils.isEmpty(list)) {
|
|
|
@@ -265,6 +274,9 @@ public class EnforceSuperviseController {
|
|
|
|
|
|
|
|
|
public static boolean getTime(EnforcementJobProcessQuery query) {
|
|
|
+// if (ObjectUtils.isNotEmpty(query.getRelate()) && query.getRelate()) {//已关联
|
|
|
+// return true;
|
|
|
+// }
|
|
|
if (Objects.equals("evaluate", query.getEntrace())) {
|
|
|
// 定义时间格式
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
@@ -281,9 +293,6 @@ public class EnforceSuperviseController {
|
|
|
return false;
|
|
|
}
|
|
|
query.setProcess(true);
|
|
|
- if (ObjectUtils.isNotEmpty(query.getRelate())) {
|
|
|
- query.setRelate(false);//未关联
|
|
|
- }
|
|
|
|
|
|
query.setStartDate(null);
|
|
|
query.setEndDate(null);
|
