From bec26ab287b22ed9ba6eaa4da64d91a374fdc14d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:49:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 169 ++++++--------------------------------------------------
1 files changed, 18 insertions(+), 151 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 467cc88..b691536 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
@@ -115,11 +115,11 @@
wrapper.eq("is_del",Constants.NOT_DELETE);
wrapper.eq("state",0);
wrapper.eq("is_invalid",0);
+
//������������������
- Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
- Object code = userInfo.get("code");
- if (!ObjectUtils.isEmpty(code)){
- wrapper.eq("area_code",code);
+ List<Integer> unitList = unitResult();
+ if (CollectionUtils.isNotEmpty(unitList)){
+ wrapper.in("unit_id",unitList);
}
List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
return responsibilityUnits;
@@ -138,12 +138,7 @@
allocation.setEscalationType(AllocationEscalationTypeEnum.SELF.getValue());
String dateString = DateUtils.dateToDateString(new Date(), DateUtils.yyyyMMdd_EN);
Object o = redisTemplate.opsForValue().get(RedisConstants.JBD_DATA);
- int i;
- if (ObjectUtils.isEmpty(o)){
- i = 1;
- }else {
- i = Integer.parseInt(o.toString()) + 1;
- }
+ int i = ObjectUtils.isEmpty(o)?1:Integer.parseInt(o.toString()) + 1;
//������
String allocationNum = "JBD-" + dateString + String.format("%04d", i);
allocation.setAllocationNum(allocationNum);
@@ -169,32 +164,6 @@
return allocation.getAllocationId();
}
- /**
- * ������������
- * @param id
- * @return
- */
- @Override
- public AllocationUnitDto check(Integer id) {
- AllocationUnitDto allocationUnitDto = new AllocationUnitDto();
- Allocation allocation = allocationMapper.selectById(id);
- BeanUtils.copyProperties(allocation,allocationUnitDto);
- ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(allocation.getUnitId());
- allocationUnitDto.setUnitName(responsibilityUnit.getUnitName());
- allocationUnitDto.setEscalationUnitName(responsibilityUnit.getUnitName());
- Map<String, List<SysDictData>> map = (Map<String, List<SysDictData>>) redisTemplate.opsForValue().get(RedisConstants.DICT_DATA_KEY);
- List<SysDictData> contaminate = map.get("contaminate");
- for (SysDictData sysDictData : contaminate) {
- if (sysDictData.getDataKey().equals(allocation.getPolluteType().toString())){
- allocationUnitDto.setPolluteTypeName(sysDictData.getDataValue());
- break;
- }
- }
- allocationUnitDto.setChangeTypeName(allocation.getChangeType()==0?"������������":"������������");
- allocationUnitDto.setInvestigationTypeName(allocation.getChangeType()==0?"������":"���������");
- //������������
- return allocationUnitDto;
- }
/**
* ���������������
@@ -221,72 +190,15 @@
approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
approveTableService.saveResult(approveTable);
}
+ if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationUpdateCond.getState())) {
+ allocation.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ }
fileTableService.upDateResult(allocationUpdateCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
allocationMapper.updateById(allocation);
}
- /**
- * ������������������
- * @param map
- * @return
- */
- @Override
- public List<Allocation> selectAll(Map<String, Object> map) {
- Object unitId = map.get("unitId");
- Object state = map.get("state");
- Object polluteType = map.get("polluteType");
- Object investigationType = map.get("investigationType");
- Object changeType = map.get("changeType");
- Object escalationTime = map.get("escalationTime");
- Object isInvalid = map.get("isInvalid");
-// int page = Integer.parseInt(map.get("page").toString());
-// int size = Integer.parseInt(map.get("size").toString());
- QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
-
- //������������
- if (!ObjectUtils.isEmpty(unitId)){
- wrapper.eq("unit_id",Integer.parseInt(unitId.toString()));
- }
- //������������
- if (!ObjectUtils.isEmpty(state)){
- wrapper.eq("state",Integer.parseInt(state.toString()));
- }
- //������������
- if (!ObjectUtils.isEmpty(polluteType)){
- wrapper.eq("pollute_type",Integer.parseInt(polluteType.toString()));
- }
- //������������
- if (!ObjectUtils.isEmpty(investigationType)){
- wrapper.eq("investigation_type",Integer.parseInt(investigationType.toString()));
- }
- //������������
- if (!ObjectUtils.isEmpty(changeType)){
- wrapper.eq("change_type",Integer.parseInt(changeType.toString()));
- }
- //������������
- if (!ObjectUtils.isEmpty(isInvalid)){
- wrapper.eq("is_invalid",Integer.parseInt(isInvalid.toString()));
- }
- if (!ObjectUtils.isEmpty(escalationTime)){
-// wrapper.eq("is_invalid",Integer.parseInt(isInvalid.toString()));
- }
- List<Allocation> allocations = allocationMapper.selectList(wrapper);
- ArrayList<AllocationUnitDto> rsList = new ArrayList<>();
- for (Allocation allocation : allocations) {
- AllocationUnitDto allocationUnitDto = new AllocationUnitDto();
- BeanUtils.copyProperties(allocation,allocationUnitDto);
- allocation.getEscalationTime();
- Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay());
- Date date = new Date();
- //���������������������������
- int days = DateUtils.getDays(dateOfDay, date);
- allocationUnitDto.setChangeDay(days);
- rsList.add(allocationUnitDto);
- }
- return null;
- }
/**
@@ -302,15 +214,13 @@
Object unitId = userInfo.get("unitId");
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
-// Integer unitId= 17;
- if (ObjectUtils.isEmpty(unitId)){
- return null;
- }
-
if (!ObjectUtils.isEmpty(map.get("unitId"))){
wrapper.in("unit_id",map.get("unitId").toString());
}else {
if (orgId!=24){
+ if (ObjectUtils.isEmpty(unitId)){
+ return null;
+ }
ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
Integer areaCode = responsibilityUnit1.getAreaCode();
List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
@@ -328,11 +238,8 @@
}
HashMap<String, Object> rsMap = new HashMap<>();
-// HashMap<String, Object> polluteMap = new HashMap<>();
ArrayList<Map<String, Object>> polluteArrayList = new ArrayList<>();
ArrayList<Map<String, Object>> escalationTypeList = new ArrayList<>();
-
-
ArrayList<AllocationUnitViewDto> allocationUnitViewDtos = new ArrayList<>();
Object number1 = map.get("number");
@@ -345,26 +252,9 @@
}
if (!ObjectUtils.isEmpty(number1)){
String s = "-"+number1;
- //���������������
+ //������������������
endTime = DateUtils.getCurDateTime();
- if (s.equals("-1")){
- //���������������
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- }
- if (s.equals("-2")){
- //���������������
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- }
- if (s.equals("-3")){
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- }
- if (s.equals("-6")){
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- }
- if (s.equals("-12")){
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- }
-
+ startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
}
wrapper.between("escalation_time",startTime,endTime);
@@ -403,7 +293,6 @@
Map<Integer, List<Allocation>> polluteTypeMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getPolluteType()));
Set<Integer> polluteTypes = polluteTypeMap.keySet();
for (Integer polluteType : polluteTypes) {
-
HashMap<String, Object> typeMap = new HashMap<>();
List<Allocation> allocations1 = polluteTypeMap.get(polluteType);
QueryWrapper<SysDictData> sysDictDataQueryWrapper = new QueryWrapper<>();
@@ -412,7 +301,6 @@
SysDictData sysDictData = sysDictDataMapper.selectOne(sysDictDataQueryWrapper);
typeMap.put("name",sysDictData.getDataValue());
typeMap.put("value",allocations1.size());
-// polluteMap.put("polluteType",typeMap);
polluteArrayList.add(typeMap);
}
//������������������������
@@ -423,9 +311,7 @@
for (Integer integer : unitList) {
//������������
ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(integer);
-
SysArea areaByCode = sysAreaService.getAreaByCode(responsibilityUnit.getAreaCode());
-
AllocationUnitViewDto allocationUnitViewDto = new AllocationUnitViewDto();
List<Allocation> allocations1 = unitMap.get(integer);
//������
@@ -528,26 +414,9 @@
}
if (!ObjectUtils.isEmpty(number1)){
String s = "-"+number1;
- //���������������
+ //������������������
endTime = DateUtils.getCurDateTime();
- if (s.equals("-1")){
- //���������������
-
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- }
- if (s.equals("-2")){
- //���������������
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- }
- if (s.equals("-3")){
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- }
- if (s.equals("-6")){
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- }
- if (s.equals("-12")){
- startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- }
+ startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
}
wrapper.between("escalation_time",startTime,endTime);
@@ -565,11 +434,8 @@
LinkedHashMap<String, Object> map1 = new LinkedHashMap<>();
//������������
ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(integer);
-
SysArea areaByCode = sysAreaService.getAreaByCode(responsibilityUnit.getAreaCode());
-
List<Allocation> allocations1 = unitMap.get(integer);
-
//������
int marks=0;
//������
@@ -646,7 +512,7 @@
approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
approveTableService.saveResult(approveTable);
- fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
+ fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_RECTIFICATION.value);
}
@Override
@@ -659,6 +525,7 @@
QxUser qxUser = UserHelper.getCurrentUser();
Allocation allocation = new Allocation();
allocation.setCheckScore(checkCond.getCheckScore());
+ allocation.setAllocationId(checkCond.getAllocationId());
allocation.setCheckDescribe(checkCond.getCheckDescribe());
allocation.setCheckName(qxUser.getUserName());
allocation.setCheckTime(new Date());
@@ -676,7 +543,7 @@
}
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
approveTableService.saveResult(approveTable);
- fileTableService.upDateResult(checkCond.getFileApproveList(),checkCond.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
+ fileTableService.upDateResult(checkCond.getFileApproveList(),checkCond.getAllocationId(), FileTableEnum.ALLOCATION_APPROVE.value);
}
@Override
--
Gitblit v1.8.0