Date: Tue, 17 Sep 2024 22:05:54 +0800
Subject: [PATCH 13/78] =?UTF-8?q?docs:=20=E5=8E=BB=E9=99=A4=E6=97=A0?=
=?UTF-8?q?=E7=94=A8=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/example/workflow/controller/DeptController.java | 3 ---
.../com/example/workflow/controller/PdfFilesController.java | 4 +---
.../java/com/example/workflow/controller/RoleController.java | 3 ---
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/main/java/com/example/workflow/controller/DeptController.java b/src/main/java/com/example/workflow/controller/DeptController.java
index e90f761..b041f1e 100644
--- a/src/main/java/com/example/workflow/controller/DeptController.java
+++ b/src/main/java/com/example/workflow/controller/DeptController.java
@@ -24,10 +24,7 @@ import java.util.List;
import java.util.Objects;
/**
- *
* 部门 前端控制器
- *
- *
* @author 黄历
* @since 2024-03-12
*/
diff --git a/src/main/java/com/example/workflow/controller/PdfFilesController.java b/src/main/java/com/example/workflow/controller/PdfFilesController.java
index dc4ed9c..dff6ea6 100644
--- a/src/main/java/com/example/workflow/controller/PdfFilesController.java
+++ b/src/main/java/com/example/workflow/controller/PdfFilesController.java
@@ -38,9 +38,7 @@ import java.time.LocalTime;
import java.util.List;
/**
- *
- * 前端控制器
- *
+ * pdf控制器
*
* @author 黄历
* @since 2024-03-14
diff --git a/src/main/java/com/example/workflow/controller/RoleController.java b/src/main/java/com/example/workflow/controller/RoleController.java
index d56894b..2d3f1f3 100644
--- a/src/main/java/com/example/workflow/controller/RoleController.java
+++ b/src/main/java/com/example/workflow/controller/RoleController.java
@@ -33,10 +33,7 @@ import java.util.List;
import java.util.Map;
/**
- *
* 角色信息 前端控制器
- *
- *
* @author 黄历
* @since 2024-03-12
*/
--
Gitee
From ca8f3743d14e94a130ab5bbe171bf00d0bd90664 Mon Sep 17 00:00:00 2001
From: hrc
Date: Thu, 7 Nov 2024 16:41:06 +0800
Subject: [PATCH 14/78] =?UTF-8?q?refactor:=E6=B7=BB=E5=8A=A0=E5=90=AF?=
=?UTF-8?q?=E5=8A=A8=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/example/workflow/Application.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/main/java/com/example/workflow/Application.java b/src/main/java/com/example/workflow/Application.java
index 62b8067..b47b7a4 100644
--- a/src/main/java/com/example/workflow/Application.java
+++ b/src/main/java/com/example/workflow/Application.java
@@ -17,6 +17,15 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
public class Application {
public static void main(String... args) {
SpringApplication.run(Application.class, args);
+ // http://patorjk.com/software/taag/?spm=5176.28103460.0.0.297c5d27o3B1lK 横幅内容生成
+ System.out.println(" _____ \n" +
+ "______ ____________/ ____\\___________ _____ _____ ____ ____ ____ \n" +
+ "\\____ \\_/ __ \\_ __ \\ __\\/ _ \\_ __ \\/ \\\\__ \\ / \\_/ ___\\/ __ \\ \n" +
+ "| |_> > ___/| | \\/| | ( <_> ) | \\/ Y Y \\/ __ \\| | \\ \\__\\ ___/ \n" +
+ "| __/ \\___ >__| |__| \\____/|__| |__|_| (____ /___| /\\___ >___ >\n" +
+ "|__| \\/ \\/ \\/ \\/ \\/ \\/" + '\n'
+ + "绩效管理系统后台服务启动成功");
+
}
}
\ No newline at end of file
--
Gitee
From 4c4d155f38bfcd3919f4dc5a9bb7fcabb69bcf24 Mon Sep 17 00:00:00 2001
From: hrc
Date: Thu, 7 Nov 2024 16:56:08 +0800
Subject: [PATCH 15/78] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E6=B3=A8?=
=?UTF-8?q?=E5=85=A5null=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../workflow/controller/FirstController.java | 128 +++++++++---------
1 file changed, 65 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/example/workflow/controller/FirstController.java b/src/main/java/com/example/workflow/controller/FirstController.java
index 1a1456a..ed9921c 100644
--- a/src/main/java/com/example/workflow/controller/FirstController.java
+++ b/src/main/java/com/example/workflow/controller/FirstController.java
@@ -14,15 +14,14 @@ import com.example.workflow.service.PieceRuleService;
import com.example.workflow.service.PositionAssessorViewService;
import com.example.workflow.service.RegionCoefficientService;
import com.example.workflow.service.ScoreRuleService;
+import com.example.workflow.utils.DateTimeUtils;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.time.LocalDate;
+import javax.annotation.Resource;
import java.time.LocalDateTime;
-import java.time.LocalTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,94 +30,97 @@ import java.util.Map;
@RestController
@RequestMapping("/first")
public class FirstController {
+ @Resource
+ private ScoreRuleService scoreRuleService;
+ @Resource
+ private PieceRuleService pieceRuleService;
+ @Resource
+ private KpiRuleService kpiRuleService;
+ @Resource
+ private RegionCoefficientService regionCoefficientService;
+ @Resource
+ private EmpCoefficientService empCoefficientService;
+ @Resource
+ private PositionAssessorViewService positionAssessorViewService;
- @Autowired
- private ScoreRuleService ScoreRuleService;
- @Autowired
- private PieceRuleService PieceRuleService;
- @Autowired
- private KpiRuleService KpiRuleService;
- @Autowired
- private RegionCoefficientService RegionCoefficientService;
- @Autowired
- private EmpCoefficientService EmpCoefficientService;
- @Autowired
- private PositionAssessorViewService PositionAssessorViewService;
-
- LocalDate today = LocalDate.now();
- LocalDateTime beginTime = LocalDateTime.of(today.withDayOfMonth(1), LocalTime.MIN);
- LocalDateTime endTime = LocalDateTime.of(today.withDayOfMonth(today.lengthOfMonth()), LocalTime.MAX);
@PostMapping("/check")
- private R> checkScore(){
- Map map=new HashMap<>();
- List list= ScoreRuleService.lambdaQuery()
- .apply(StringUtils.checkValNotNull(beginTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", beginTime)
- .apply(StringUtils.checkValNotNull(endTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", endTime)
+ public R> checkScore() {
+ LocalDateTime[] time = DateTimeUtils.getTheStartAndEndTimeOfMonth();
+ Map map = new HashMap<>(10);
+ List list = scoreRuleService.lambdaQuery()
+ .apply(StringUtils.checkValNotNull(time[0]),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[0])
+ .apply(StringUtils.checkValNotNull(time[1]),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[1])
.list();
- if(list.isEmpty())
+ if (list.isEmpty()) {
map.put("scoreRule",0);
- else
+ } else {
map.put("scoreRule",1);
+ }
- List list2= PieceRuleService.lambdaQuery()
- .apply(StringUtils.checkValNotNull(beginTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", beginTime)
- .apply(StringUtils.checkValNotNull(endTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", endTime)
+ List list2 = pieceRuleService.lambdaQuery()
+ .apply(StringUtils.checkValNotNull(time[0]),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[0])
+ .apply(StringUtils.checkValNotNull(time[1]),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[1])
.list();
- if(list2.isEmpty())
+ if (list2.isEmpty()) {
map.put("pieceRule",0);
- else
+ } else {
map.put("pieceRule",1);
+ }
- List list3= KpiRuleService.lambdaQuery()
- .apply(StringUtils.checkValNotNull(beginTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", beginTime)
- .apply(StringUtils.checkValNotNull(endTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", endTime)
+ List list3 = kpiRuleService.lambdaQuery()
+ .apply(StringUtils.checkValNotNull(time[0]),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[0])
+ .apply(StringUtils.checkValNotNull(time[1]),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[1])
.list();
- if(list3.isEmpty())
+ if (list3.isEmpty()) {
map.put("kpiRule",0);
- else
+ } else {
map.put("kpiRule",1);
+ }
- List list4=RegionCoefficientService.lambdaQuery()
+ List list4 = regionCoefficientService.lambdaQuery()
.eq(RegionCoefficient::getState,1)
- .apply(StringUtils.checkValNotNull(beginTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", beginTime)
- .apply(StringUtils.checkValNotNull(endTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", endTime)
+ .apply(StringUtils.checkValNotNull(time),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[0])
+ .apply(StringUtils.checkValNotNull(time[1]),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[1])
.list();
- if(list4.isEmpty())
+ if (list4.isEmpty()) {
map.put("region",0);
- else
+ } else {
map.put("region",1);
+ }
- List list5= EmpCoefficientService.lambdaQuery()
- .apply(StringUtils.checkValNotNull(beginTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", beginTime)
- .apply(StringUtils.checkValNotNull(endTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", endTime)
+ List list5 = empCoefficientService.lambdaQuery()
+ .apply(StringUtils.checkValNotNull(time),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[0])
+ .apply(StringUtils.checkValNotNull(time[1]),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[1])
.list();
- if(list5.isEmpty())
+ if (list5.isEmpty()) {
map.put("coe",0);
- else
+ } else {
map.put("coe",1);
+ }
- List list6=PositionAssessorViewService.lambdaQuery()
+ List list6 = positionAssessorViewService.lambdaQuery()
.eq(PositionAssessorView::getState,1)
- .apply(StringUtils.checkValNotNull(beginTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", beginTime)
- .apply(StringUtils.checkValNotNull(endTime),
- "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", endTime)
+ .apply(StringUtils.checkValNotNull(time),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') >= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[0])
+ .apply(StringUtils.checkValNotNull(time[1]),
+ "date_format (create_time,'%Y-%m-%d %H:%i:%s') <= date_format ({0},'%Y-%m-%d %H:%i:%s')", time[1])
.list();
- if(list6.isEmpty())
+ if (list6.isEmpty()) {
map.put("ass",0);
- else
+ } else {
map.put("ass",1);
+ }
return R.success(map);
}
--
Gitee
From 64b647f01acb009f53b5bcd6a2d70c201a009b73 Mon Sep 17 00:00:00 2001
From: hrc
Date: Fri, 8 Nov 2024 00:07:28 +0800
Subject: [PATCH 16/78] =?UTF-8?q?style:=20=E5=B0=86=E5=8F=98=E9=87=8F?=
=?UTF-8?q?=E5=90=8D=E5=8F=98=E4=B8=BA=E9=A9=BC=E5=B3=B0=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/ResultSecondExamineServiceImpl.java | 152 +++++++++---------
.../service/impl/ScoreRuleServiceImpl.java | 20 +--
2 files changed, 82 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/example/workflow/service/impl/ResultSecondExamineServiceImpl.java b/src/main/java/com/example/workflow/service/impl/ResultSecondExamineServiceImpl.java
index eb87fa1..1ebc298 100644
--- a/src/main/java/com/example/workflow/service/impl/ResultSecondExamineServiceImpl.java
+++ b/src/main/java/com/example/workflow/service/impl/ResultSecondExamineServiceImpl.java
@@ -38,132 +38,130 @@ public class ResultSecondExamineServiceImpl extends ServiceImpl list= EmployeePositionService
+ List list = employeePositionService
.lambdaQuery()
.eq(EmployeePosition::getPositionId,form.getString("positionId"))
.list();
list.forEach(x->{
- Map map = new HashMap<>();
+ Map map = new HashMap<>(10);
map.put("wageEmp",empId.toString());
identityService.setAuthenticatedUserId(String.valueOf(x.getEmpId()));
ProcessInstance processInstance = runtimeService
.startProcessInstanceByKey("Process_1a4y3g9",map);
- BackWait backWait=BackWaitService.addOne(
+ BackWait backWait = backWaitService.addOne(
Long.valueOf(form.getString("positionId"))
,x.getEmpId()
, "back_second_piece"
,processInstance
,"Process_1a4y3g9"
,form.getString("opinion2"));
- BackWaitService.save(backWait);
+ backWaitService.save(backWait);
});
}
@Override
public void reKpiSecondFifth(JSONObject form){
- Long roleId= RoleService.lambdaQuery()
+ Long roleId = roleService.lambdaQuery()
.eq(Role::getRoleName,"绩效专员")
.eq(Role::getState,1)
.one().getId();
- Long empId=EmployeeService.lambdaQuery()
+ Long empId = employeeService.lambdaQuery()
.eq(Employee::getRoleId,roleId)
.one().getId();
- List list= EmployeePositionService
+ List list = employeePositionService
.lambdaQuery()
.eq(EmployeePosition::getPositionId,form.getString("positionId"))
.list();
list.forEach(x->{
- Map map = new HashMap<>();
+ Map map = new HashMap<>(10);
map.put("wageEmp",empId.toString());
identityService.setAuthenticatedUserId(String.valueOf(x.getEmpId()));
ProcessInstance processInstance = runtimeService
.startProcessInstanceByKey("Process_065p3a1",map);
- BackWait backWait=BackWaitService.addOne(Long.valueOf(form.getString("positionId"))
+ BackWait backWait = backWaitService.addOne(Long.valueOf(form.getString("positionId"))
,x.getEmpId(),"back_second_kpi"
,processInstance
,"Process_065p3a1"
,form.getString("opinion3"));
- BackWaitService.save(backWait);
+ backWaitService.save(backWait);
});
}
@Override
public void reScoreSecondFifth(JSONObject form){
- List assessorList = new ArrayList<>();
+ List assessorList = new ArrayList<>(10);
- List num= PositionScoreService.lambdaQuery()
+ List num = positionScoreService.lambdaQuery()
.eq(PositionScore::getPositionId,form.getString("positionId"))
.list();
num.forEach(y->{
- List assessor= ScoreAssessorsService.lambdaQuery()
+ List assessor = scoreAssessorsService.lambdaQuery()
.eq(ScoreAssessors::getPositionScoreId,y.getId())
.list();
- assessor.forEach(z->{
- assessorList.add(String.valueOf(z.getAssessorId()));
- });
+ assessor.forEach(z -> assessorList.add(String.valueOf(z.getAssessorId())));
});
List assessors=assessorList.stream().distinct().collect(Collectors.toList());
- List list= EmployeePositionService
+ List list = employeePositionService
.lambdaQuery()
.eq(EmployeePosition::getPositionId,form.getString("positionId"))
.list();
-
+ System.out.println();
list.forEach(x->{
- Map map = new HashMap<>();
+ Map map = new HashMap<>(10);
map.put("ASList", assessors);
identityService.setAuthenticatedUserId(String.valueOf(x.getEmpId()));
ProcessInstance processInstance = runtimeService
.startProcessInstanceByKey("Process_0scky72",map);
- BackWait backWait=BackWaitService.addOne(Long.valueOf(form.getString("positionId"))
+ BackWait backWait = backWaitService.addOne(Long.valueOf(form.getString("positionId"))
,x.getEmpId(),"back_second_score"
,processInstance
,"Process_0scky72"
,form.getString("opinion1"));
- BackWaitService.save(backWait);
+ backWaitService.save(backWait);
});
}
@@ -172,101 +170,99 @@ public class ResultSecondExamineServiceImpl extends ServiceImpl assessorList = new ArrayList<>();
- List num= OkrKeyService.lambdaQuery()
+ List num = okrKeyService.lambdaQuery()
.eq(OkrKey::getPositionId,form.getString("positionId"))
.eq(OkrKey::getLiaEmpId,emp.getEmpId())
.list();
num.forEach(y->{
- List ruleList= OkrRuleService.lambdaQuery()
+ List ruleList = okrRuleService.lambdaQuery()
.eq(OkrRule::getId,y.getId())
.list();
- ruleList.forEach(z->{
- assessorList.add(String.valueOf(z.getAssessorId()));
- });
+ ruleList.forEach(z -> assessorList.add(String.valueOf(z.getAssessorId())));
});
List assessors=assessorList.stream().distinct().collect(Collectors.toList());
- Map map = new HashMap<>();
+ Map map = new HashMap<>(10);
map.put("AOList", assessors);
identityService.setAuthenticatedUserId(String.valueOf(emp.getEmpId()));
ProcessInstance processInstance = runtimeService
.startProcessInstanceByKey("Process_0jeppqc",map);
- BackWait backWait=BackWaitService.addOne(Long.valueOf(form.getString("positionId"))
+ BackWait backWait = backWaitService.addOne(Long.valueOf(form.getString("positionId"))
,emp.getEmpId(),"back_second_okr"
,processInstance
,"Process_0jeppqc"
,form.getString("opinion4"));
- BackWaitService.save(backWait);
+ backWaitService.save(backWait);
}
@Override
public void rePieceSecondFourth(JSONObject form){
- Long roleId= RoleService.lambdaQuery()
+ Long roleId = roleService.lambdaQuery()
.eq(Role::getRoleName,"绩效专员")
.eq(Role::getState,1)
.one().getId();
- Long empId=EmployeeService.lambdaQuery()
+ Long empId = employeeService.lambdaQuery()
.eq(Employee::getRoleId,roleId)
.one().getId();
- List list= EmployeePositionService
+ List list = employeePositionService
.lambdaQuery()
.eq(EmployeePosition::getPositionId,form.getString("positionId"))
.list();
list.forEach(x->{
- Map map = new HashMap<>();
+ Map map = new HashMap<>(10);
map.put("wageEmp",empId.toString());
identityService.setAuthenticatedUserId(String.valueOf(x.getEmpId()));
ProcessInstance processInstance = runtimeService
.startProcessInstanceByKey("Process_0a7afjy",map);
- BackWait backWait=BackWaitService.addOne(Long.valueOf(form.getString("positionId"))
+ BackWait backWait = backWaitService.addOne(Long.valueOf(form.getString("positionId"))
,x.getEmpId(),"back_second_piece"
,processInstance
,"Process_0a7afjy"
,form.getString("opinion2"));
- BackWaitService.save(backWait);
+ backWaitService.save(backWait);
});
}
@Override
public void reKpiSecondFourth(JSONObject form){
- Long roleId= RoleService.lambdaQuery()
+ Long roleId = roleService.lambdaQuery()
.eq(Role::getRoleName,"绩效专员")
.eq(Role::getState,1)
.one().getId();
- Long empId=EmployeeService.lambdaQuery()
+ Long empId = employeeService.lambdaQuery()
.eq(Employee::getRoleId,roleId)
.one().getId();
- List list= EmployeePositionService
+ List list = employeePositionService
.lambdaQuery()
.eq(EmployeePosition::getPositionId,form.getString("positionId"))
.list();
list.forEach(x->{
- Map map = new HashMap<>();
+ Map map = new HashMap<>(10);
map.put("wageEmp",empId.toString());
identityService.setAuthenticatedUserId(String.valueOf(x.getEmpId()));
ProcessInstance processInstance = runtimeService
.startProcessInstanceByKey("Process_0tcatx0",map);
- BackWait backWait=BackWaitService.addOne(Long.valueOf(form.getString("positionId"))
+ BackWait backWait = backWaitService.addOne(Long.valueOf(form.getString("positionId"))
,x.getEmpId(),"back_second_kpi"
,processInstance
,"Process_0tcatx0"
,form.getString("opinion3"));
- BackWaitService.save(backWait);
+ backWaitService.save(backWait);
});
}
@@ -275,39 +271,37 @@ public class ResultSecondExamineServiceImpl extends ServiceImpl assessorList = new ArrayList<>();
- List num= PositionScoreService.lambdaQuery()
+ List num = positionScoreService.lambdaQuery()
.eq(PositionScore::getPositionId,form.getString("positionId"))
.list();
num.forEach(y->{
- List assessor= ScoreAssessorsService.lambdaQuery()
+ List assessor = scoreAssessorsService.lambdaQuery()
.eq(ScoreAssessors::getPositionScoreId,y.getId())
.list();
- assessor.forEach(z->{
- assessorList.add(String.valueOf(z.getAssessorId()));
- });
+ assessor.forEach(z -> assessorList.add(String.valueOf(z.getAssessorId())));
});
List assessors=assessorList.stream().distinct().collect(Collectors.toList());
- List list= EmployeePositionService
+ List list = employeePositionService
.lambdaQuery()
.eq(EmployeePosition::getPositionId,form.getString("positionId"))
.list();
list.forEach(x->{
- Map map = new HashMap<>();
+ Map map = new HashMap<>(10);
map.put("ASList", assessors);
identityService.setAuthenticatedUserId(String.valueOf(x.getEmpId()));
ProcessInstance processInstance = runtimeService
.startProcessInstanceByKey("Process_17y117z",map);
- BackWait backWait=BackWaitService.addOne(Long.valueOf(form.getString("positionId"))
+ BackWait backWait = backWaitService.addOne(Long.valueOf(form.getString("positionId"))
,x.getEmpId(),"back_second_score"
,processInstance
,"Process_17y117z"
,form.getString("opinion1"));
- BackWaitService.save(backWait);
+ backWaitService.save(backWait);
});
}
@@ -316,101 +310,99 @@ public class ResultSecondExamineServiceImpl extends ServiceImpl assessorList = new ArrayList<>();
- List num= OkrKeyService.lambdaQuery()
+ List num = okrKeyService.lambdaQuery()
.eq(OkrKey::getPositionId,form.getString("positionId"))
.eq(OkrKey::getLiaEmpId,emp.getEmpId())
.list();
num.forEach(y->{
- List ruleList= OkrRuleService.lambdaQuery()
+ List ruleList = okrRuleService.lambdaQuery()
.eq(OkrRule::getId,y.getRuleId())
.list();
- ruleList.forEach(z->{
- assessorList.add(String.valueOf(z.getAssessorId()));
- });
+ ruleList.forEach(z -> assessorList.add(String.valueOf(z.getAssessorId())));
});
List assessors=assessorList.stream().distinct().collect(Collectors.toList());
- Map map = new HashMap<>();
+ Map map = new HashMap<>(10);
map.put("AOList", assessors);
identityService.setAuthenticatedUserId(String.valueOf(emp.getEmpId()));
ProcessInstance processInstance = runtimeService
.startProcessInstanceByKey("Process_0aqalb8",map);
- BackWait backWait=BackWaitService.addOne(Long.valueOf(form.getString("positionId"))
+ BackWait backWait = backWaitService.addOne(Long.valueOf(form.getString("positionId"))
,emp.getEmpId(),"back_second_okr"
,processInstance
,"Process_0aqalb8"
,form.getString("opinion4"));
- BackWaitService.save(backWait);
+ backWaitService.save(backWait);
}
@Override
public void rePieceSecondThird(JSONObject form){
- Long roleId= RoleService.lambdaQuery()
+ Long roleId = roleService.lambdaQuery()
.eq(Role::getRoleName,"绩效专员")
.eq(Role::getState,1)
.one().getId();
- Long empId=EmployeeService.lambdaQuery()
+ Long empId = employeeService.lambdaQuery()
.eq(Employee::getRoleId,roleId)
.one().getId();
- List list= EmployeePositionService
+ List list = employeePositionService
.lambdaQuery()
.eq(EmployeePosition::getPositionId,form.getString("positionId"))
.list();
list.forEach(x->{
- Map map = new HashMap<>();
+ Map map = new HashMap<>(16);
map.put("wageEmp",empId.toString());
identityService.setAuthenticatedUserId(String.valueOf(x.getEmpId()));
ProcessInstance processInstance = runtimeService
.startProcessInstanceByKey("Process_1rgr65b",map);
- BackWait backWait=BackWaitService.addOne(Long.valueOf(form.getString("positionId"))
+ BackWait backWait = backWaitService.addOne(Long.valueOf(form.getString("positionId"))
,x.getEmpId(),"back_second_piece"
,processInstance
,"Process_1rgr65b"
,form.getString("opinion2"));
- BackWaitService.save(backWait);
+ backWaitService.save(backWait);
});
}
@Override
public void reKpiSecondThird(JSONObject form){
- Long roleId= RoleService.lambdaQuery()
+ Long roleId = roleService.lambdaQuery()
.eq(Role::getRoleName,"绩效专员")
.eq(Role::getState,1)
.one().getId();
- Long empId=EmployeeService.lambdaQuery()
+ Long empId = employeeService.lambdaQuery()
.eq(Employee::getRoleId,roleId)
.one().getId();
- List list= EmployeePositionService
+ List list = employeePositionService
.lambdaQuery()
.eq(EmployeePosition::getPositionId,form.getString("positionId"))
.list();
list.forEach(x->{
- Map map = new HashMap<>();
+ Map map = new HashMap<>(32);
map.put("wageEmp",empId.toString());
identityService.setAuthenticatedUserId(String.valueOf(x.getEmpId()));
ProcessInstance processInstance = runtimeService
.startProcessInstanceByKey("Process_0m9w7vi",map);
- BackWait backWait=BackWaitService.addOne(Long.valueOf(form.getString("positionId"))
+ BackWait backWait = backWaitService.addOne(Long.valueOf(form.getString("positionId"))
,x.getEmpId(),"back_second_kpi"
,processInstance
,"Process_0m9w7vi"
,form.getString("opinion3"));
- BackWaitService.save(backWait);
+ backWaitService.save(backWait);
});
}
}
diff --git a/src/main/java/com/example/workflow/service/impl/ScoreRuleServiceImpl.java b/src/main/java/com/example/workflow/service/impl/ScoreRuleServiceImpl.java
index 2256457..d93e79e 100644
--- a/src/main/java/com/example/workflow/service/impl/ScoreRuleServiceImpl.java
+++ b/src/main/java/com/example/workflow/service/impl/ScoreRuleServiceImpl.java
@@ -10,9 +10,9 @@ import com.example.workflow.model.entity.ScoreRuleForm;
import com.example.workflow.service.PositionScoreService;
import com.example.workflow.service.ScoreAssessorsService;
import com.example.workflow.service.ScoreRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -20,11 +20,12 @@ import java.util.List;
@Service
public class ScoreRuleServiceImpl extends ServiceImpl implements ScoreRuleService {
+ @Resource
+ private ScoreAssessorsService scoreAssessorsService;
+ @Resource
+ private PositionScoreService positionScoreService;
+
- @Autowired
- private PositionScoreService PositionScoreService;
- @Autowired
- private ScoreAssessorsService ScoreAssessorsService;
@Override
@@ -42,8 +43,7 @@ public class ScoreRuleServiceImpl extends ServiceImpl{
-
- List