From c6780a9fb66a3f01b4f8bc8681b37ec6dde5870d Mon Sep 17 00:00:00 2001 From: Lierbao Date: Mon, 30 Jan 2023 10:19:19 +0800 Subject: [PATCH] merge --- .../com/ningdatech/pmapi/common/constant/BizConst.java | 2 +- .../ningdatech/pmapi/common/constant/CommonConstant.java | 4 ++-- .../controller/OrganizationProcdefController.java | 6 +++--- .../pmapi/organization/manage/OrganizationManage.java | 2 ++ .../pmapi/schedule/task/BatchUpdateOrganizationTask.java | 14 ++++++++++++++ 5 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/schedule/task/BatchUpdateOrganizationTask.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BizConst.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BizConst.java index 8fa1ba8..8a3718c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BizConst.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BizConst.java @@ -19,7 +19,7 @@ public interface BizConst { */ String LIMIT_1 = "limit 1"; - String COOKIE_KEY = "ND_CAR_RENTAL_JSESSION"; + String COOKIE_KEY = "ND_PROJECT_MANAGEMENT_JSESSION"; /** * 一小时秒数 diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/CommonConstant.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/CommonConstant.java index 59becb4..599057a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/CommonConstant.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/CommonConstant.java @@ -9,9 +9,9 @@ public class CommonConstant { public static final String COOKIE_KEY = "ND_JSESSION"; - public static final Integer EXPORT_PAGE_NUMBER= 1; + public static final Integer EXPORT_PAGE_NUMBER = 1; - public static final Integer EXPORT_PAGE_SIZE= 100000; + public static final Integer EXPORT_PAGE_SIZE = 100000; public static final String CALL_STATUS = "status"; public static final String CALL_STATUS_OK_VALUE = "ok"; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java index 428f886..111036a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java @@ -35,8 +35,8 @@ public class OrganizationProcdefController { @ApiOperation(value = "单位流程配置列表", notes = "单位流程配置列表") @GetMapping("/list") public PageVo list(@RequestParam String orgCode, @RequestParam(defaultValue = "1") Integer pageNum, - @RequestParam(defaultValue = "10") Integer pageSize) { - return orgProcdefService.getOrgProcessByOrgCode(orgCode,pageNum,pageSize); + @RequestParam(defaultValue = "10") Integer pageSize) { + return orgProcdefService.getOrgProcessByOrgCode(orgCode, pageNum, pageSize); } @ApiOperation(value = "单位流程配置详情", notes = "单位流程配置详情") @@ -44,7 +44,7 @@ public class OrganizationProcdefController { public OrgProcdefVo detail(@PathVariable String procdefId) { WflowOrgModelHistorys lastVersionModel = orgProcessModelService.getLastVersionModel(procdefId); OrgProcdefVo vo = new OrgProcdefVo(); - BeanUtils.copyProperties(lastVersionModel,vo); + BeanUtils.copyProperties(lastVersionModel, vo); return vo; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java index a483337..f86003f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java @@ -10,4 +10,6 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class OrganizationManage { + + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/schedule/task/BatchUpdateOrganizationTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/schedule/task/BatchUpdateOrganizationTask.java new file mode 100644 index 0000000..5bb5c29 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/schedule/task/BatchUpdateOrganizationTask.java @@ -0,0 +1,14 @@ +package com.ningdatech.pmapi.schedule.task; + +import org.springframework.stereotype.Component; + +/** + * @author liuxinxin + * @date 2023/1/12 上午9:53 + * 批量获取/更新部门信息任务 + */ +@Component +public class BatchUpdateOrganizationTask { + + +}