From 42d85bb4b6bf8eddc91d0999350323e96ea253af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 13 Oct 2020 17:54:47 +0800 Subject: [PATCH] fix --- .../{ => controller}/EvaluationGroupController.java | 2 +- .../{ => controller}/EvaluationStartStaffController.java | 2 +- .../{ => controller}/FlowApprovalRoleController.java | 2 +- .../performance/{ => controller}/FlowChangeController.java | 2 +- .../performance/{ => controller}/FlowChartController.java | 2 +- .../performance/{ => controller}/FlowStartController.java | 2 +- .../performance/{ => controller}/ResultModelController.java | 2 +- .../performance/{ => controller}/ResultScoreController.java | 2 +- .../modules/performance/{ => controller}/TaskController.java | 4 +++- 9 files changed, 11 insertions(+), 9 deletions(-) rename src/main/java/com/lz/modules/performance/{ => controller}/EvaluationGroupController.java (97%) rename src/main/java/com/lz/modules/performance/{ => controller}/EvaluationStartStaffController.java (97%) rename src/main/java/com/lz/modules/performance/{ => controller}/FlowApprovalRoleController.java (97%) rename src/main/java/com/lz/modules/performance/{ => controller}/FlowChangeController.java (96%) rename src/main/java/com/lz/modules/performance/{ => controller}/FlowChartController.java (97%) rename src/main/java/com/lz/modules/performance/{ => controller}/FlowStartController.java (96%) rename src/main/java/com/lz/modules/performance/{ => controller}/ResultModelController.java (96%) rename src/main/java/com/lz/modules/performance/{ => controller}/ResultScoreController.java (96%) rename src/main/java/com/lz/modules/performance/{ => controller}/TaskController.java (93%) diff --git a/src/main/java/com/lz/modules/performance/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java similarity index 97% rename from src/main/java/com/lz/modules/performance/EvaluationGroupController.java rename to src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java index 423e4282..20c40a12 100644 --- a/src/main/java/com/lz/modules/performance/EvaluationGroupController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/EvaluationStartStaffController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationStartStaffController.java similarity index 97% rename from src/main/java/com/lz/modules/performance/EvaluationStartStaffController.java rename to src/main/java/com/lz/modules/performance/controller/EvaluationStartStaffController.java index bfcb8c89..5b59a2fd 100644 --- a/src/main/java/com/lz/modules/performance/EvaluationStartStaffController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationStartStaffController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/FlowApprovalRoleController.java b/src/main/java/com/lz/modules/performance/controller/FlowApprovalRoleController.java similarity index 97% rename from src/main/java/com/lz/modules/performance/FlowApprovalRoleController.java rename to src/main/java/com/lz/modules/performance/controller/FlowApprovalRoleController.java index a7af7657..936e64bd 100644 --- a/src/main/java/com/lz/modules/performance/FlowApprovalRoleController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowApprovalRoleController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/FlowChangeController.java b/src/main/java/com/lz/modules/performance/controller/FlowChangeController.java similarity index 96% rename from src/main/java/com/lz/modules/performance/FlowChangeController.java rename to src/main/java/com/lz/modules/performance/controller/FlowChangeController.java index 851e0f83..f0a25d71 100644 --- a/src/main/java/com/lz/modules/performance/FlowChangeController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChangeController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/FlowChartController.java b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java similarity index 97% rename from src/main/java/com/lz/modules/performance/FlowChartController.java rename to src/main/java/com/lz/modules/performance/controller/FlowChartController.java index 73708fcb..ee0d8e74 100644 --- a/src/main/java/com/lz/modules/performance/FlowChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowChartController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/FlowStartController.java b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java similarity index 96% rename from src/main/java/com/lz/modules/performance/FlowStartController.java rename to src/main/java/com/lz/modules/performance/controller/FlowStartController.java index ea84debe..7d660770 100644 --- a/src/main/java/com/lz/modules/performance/FlowStartController.java +++ b/src/main/java/com/lz/modules/performance/controller/FlowStartController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/ResultModelController.java b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java similarity index 96% rename from src/main/java/com/lz/modules/performance/ResultModelController.java rename to src/main/java/com/lz/modules/performance/controller/ResultModelController.java index c38349bf..7ca7cf1d 100644 --- a/src/main/java/com/lz/modules/performance/ResultModelController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/ResultScoreController.java b/src/main/java/com/lz/modules/performance/controller/ResultScoreController.java similarity index 96% rename from src/main/java/com/lz/modules/performance/ResultScoreController.java rename to src/main/java/com/lz/modules/performance/controller/ResultScoreController.java index 43e829e4..4a6a5167 100644 --- a/src/main/java/com/lz/modules/performance/ResultScoreController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultScoreController.java @@ -1,4 +1,4 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/lz/modules/performance/TaskController.java b/src/main/java/com/lz/modules/performance/controller/TaskController.java similarity index 93% rename from src/main/java/com/lz/modules/performance/TaskController.java rename to src/main/java/com/lz/modules/performance/controller/TaskController.java index d1acd373..f4eda336 100644 --- a/src/main/java/com/lz/modules/performance/TaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/TaskController.java @@ -1,10 +1,11 @@ -package com.lz.modules.performance; +package com.lz.modules.performance.controller; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.entity.FlowRecord; +import com.lz.modules.flow.service.FlowChangeService; import com.lz.modules.flow.service.FlowRecordService; import com.lz.modules.performance.res.TaskListRes; import com.lz.modules.sys.controller.AbstractController; @@ -33,6 +34,7 @@ public class TaskController extends AbstractController{ private FlowRecordService flowRecordService; private ResultRecordService resultRecordService; private StaffService staffService; + private FlowChangeService flowChangeService; @RequestMapping("task/list") public R list(){