From 4133d836c5aa4ebbf11e3749528a4e484ef7ca9e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 13 Oct 2023 17:03:28 +0800
Subject: [PATCH] fix:补偿提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 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 b691536..977a479 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
@@ -68,6 +68,7 @@
@Slf4j
public class AllocationServiceImpl extends ServiceImpl<AllocationMapper, Allocation> implements AllocationService {
+ private final Integer NEW_BUILT = 10;
@Autowired
private SysDictTypeMapper sysDictTypeMapper;
@Autowired
@@ -145,19 +146,19 @@
if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
- if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationCond.getState())) {
+ if(NEW_BUILT.equals(allocationCond.getState())) {
allocation.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
}
//������������������
allocationMapper.insert(allocation);
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
- if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationCond.getState())) {
+ if(NEW_BUILT.equals(allocationCond.getState())) {
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
- approveTable.setState(AllocationApproveEnum.NEW_BUILT.value);
+ approveTable.setState(NEW_BUILT);
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
- approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
+ approveTable.setStateName("������");
approveTableService.saveResult(approveTable);
}
fileTableService.upDateResult(allocationCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
@@ -181,16 +182,16 @@
if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&&allocationUpdateCond.getEscalationUnitId().toString().length()==6) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
- if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationUpdateCond.getState())) {
+ if(NEW_BUILT.equals(allocationUpdateCond.getState())) {
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
- approveTable.setState(AllocationApproveEnum.NEW_BUILT.value);
+ approveTable.setState(NEW_BUILT);
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
- approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
+ approveTable.setStateName("������");
approveTableService.saveResult(approveTable);
}
- if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationUpdateCond.getState())) {
+ if(NEW_BUILT.equals(allocationUpdateCond.getState())) {
allocation.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
}
fileTableService.upDateResult(allocationUpdateCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
@@ -270,7 +271,7 @@
String state = allocation.getState()+"";
if (state.equals("40")||state.equals("50")){
complete++;
- }else if(state.equals("10")||state.equals("20") ||state.equals("30")) {
+ }else {
unComplete++;
}
}
@@ -327,7 +328,7 @@
Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay());
Date date = new Date();
boolean timeBefor = DateUtils.isTimeBefor(date, dateOfDay);
- if (timeBefor && !state.equals("40") && !state.equals("50")){
+ if (timeBefor && !state.equals("40") && !state.equals("50") && !state.equals("9")){
//������������
overdue++;
}
@@ -356,9 +357,9 @@
rsMap.put("unitView",allocationUnitViewDtos);
//������
rsMap.put("total",allocations.size());
- //���������
+ //���������
rsMap.put("complete",complete);
- //������������
+ //���������
rsMap.put("unComplete",unComplete);
//������
rsMap.put("overdue",overdue);
@@ -471,8 +472,19 @@
@Override
public Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond) {
List<Integer> unitList = unitResult();
+ Integer codeId = unitAreaCode();
allocationPageCond.setUnitList(unitList);
- return this.baseMapper.extPage(allocationPageCond.getPage().convertPage(), allocationPageCond);
+ Page<AllocationPageExt> page = this.baseMapper.extPage(allocationPageCond.getPage().convertPage(), allocationPageCond);
+ if(CollectionUtils.isNotEmpty(page.getRecords())){
+ page.getRecords().forEach(it->{
+ if((CollectionUtils.isEmpty(unitList)&&codeId.equals(1))||codeId.equals(2)){
+ it.setIsApprove(1);
+ }else {
+ it.setIsApprove(0);
+ }
+ });
+ }
+ return page;
}
@Override
@@ -590,6 +602,7 @@
}
AllocationExtension allocationExtension = allocationExtensionAddCond.convert();
allocationExtension.setState(AllocationExtensionApproveEnum.APPLYING.value);
+ allocationExtension.setExtensionOldNum(allocationExt.getChangeDay());
allocationExtensionService.save(allocationExtension);
fileTableService.upDateResult(allocationExtensionAddCond.getFileList(),allocationExtension.getId(), FileTableEnum.ALLOCATION_EXTENSION.value);
return true;
@@ -599,7 +612,7 @@
public List<Integer> unitResult() {
QxUser user = UserHelper.getCurrentUser();
Integer unitId = Objects.nonNull(user.getUnitId())?user.getUnitId():0;
- List<Integer> userList = responsibilityUnitMapper.selectCodeList("JBD",user.getUserId());
+ List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
if(CollectionUtils.isNotEmpty(userList)){
return new ArrayList<>();
}
@@ -609,4 +622,22 @@
}
return Arrays.asList(0);
}
+
+ @Override
+ public Integer unitAreaCode() {
+ QxUser user = UserHelper.getCurrentUser();
+ List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
+ if(CollectionUtils.isNotEmpty(userList)){
+ return 1;
+ }
+ if(Objects.nonNull(user.getUnitId())){
+ String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
+ if(code.length()>6){
+ return 0;
+ }else {
+ return 2;
+ }
+ }
+ return 1;
+ }
}
--
Gitblit v1.8.0