From 08a9e6a0891cc01f34344eff4a3b3bad4e6e84ef Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 26 Sep 2023 15:59:12 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index b2d902b..ed0239b 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -76,8 +76,6 @@
@Autowired
private AllocationMapper allocationMapper;
@Autowired
- private ApproveTableMapper approveTableMapper;
- @Autowired
private SysAreaService sysAreaService;
private ApproveTableService approveTableService;
@Autowired
@@ -141,7 +139,7 @@
i = Integer.parseInt(o.toString()) + 1;
}
//������
- String allocationNum = "JBD" + dateString + String.format("%04d", i);
+ String allocationNum = "JBD-" + dateString + String.format("%04d", i);
allocation.setAllocationNum(allocationNum);
if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
@@ -363,7 +361,7 @@
int complete=0;
int unComplete=0;
for (Allocation allocation : allocations) {
- String state = allocation.getState();
+ String state = allocation.getState()+"";
if (state.equals("40")||state.equals("50")){
complete++;
}else if(state.equals("10")||state.equals("20") ||state.equals("30")) {
@@ -408,7 +406,7 @@
Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay());
Date date = new Date();
- String state = allocation.getState();
+ String state = allocation.getState()+"";
boolean timeBefor = DateUtils.isTimeBefor(date, dateOfDay);
if (timeBefor && !state.equals("40") && !state.equals("50")){
//������������
--
Gitblit v1.8.0