From dc1c8c974d9469591ead4dd1d774bbfb97a33331 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 17:51:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/java/com/moral/api/service/ResponsibilityUnitService.java | 2
screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java | 6
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 6 -
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 30 -----
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 204 +++++++++++++++++++++++++++++++++++-----
5 files changed, 183 insertions(+), 65 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
index 67e7547..f6b223a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -14,6 +14,7 @@
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
import com.moral.api.pojo.vo.allocation.AllocationPageVo;
import com.moral.api.pojo.vo.allocation.AllocationVo;
+import com.moral.api.utils.BeanConverts;
import com.moral.constant.PageResult;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -175,6 +176,7 @@
* @return
*/
@GetMapping("selectUnitView")
+ @ApiOperation("������������")
public ResultMessage selectUnitView(HttpServletRequest request){
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
Map<String, Object> map1 = allocationService.selectUnitView(params);
@@ -186,15 +188,7 @@
public void unitExel(HttpServletResponse response,HttpServletRequest request){
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
//������������
- Map<String, Object> map1 = allocationService.selectUnitView(params);
- List<AllocationUnitViewDto> unitView = (List<AllocationUnitViewDto>) map1.get("unitView");
-
-
- ArrayList<Map<String, Object>> mapArrayList = new ArrayList<>();
- for (AllocationUnitViewDto allocationUnitViewDto : unitView) {
- Map<String, Object> map = entityToMap(allocationUnitViewDto);
- mapArrayList.add(map);
- }
+ List<Map<String, Object>> mapArrayList = allocationService.unitExel(params);
if (CollectionUtils.isEmpty(mapArrayList)) {
return;
}
@@ -218,22 +212,4 @@
}
}
- /**
- ������������Map
- */
- public static Map<String, Object> entityToMap(Object object) {
- Map<String, Object> map = new HashMap<>();
- for (Field field : object.getClass().getDeclaredFields()) {
- try {
- boolean flag = field.isAccessible();
- field.setAccessible(true);
- Object o = field.get(object);
- map.put(field.getName(), o);
- field.setAccessible(flag);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return map;
- }
}
diff --git a/screen-api/src/main/java/com/moral/api/service/ResponsibilityUnitService.java b/screen-api/src/main/java/com/moral/api/service/ResponsibilityUnitService.java
index 9c525f4..b43c7e8 100644
--- a/screen-api/src/main/java/com/moral/api/service/ResponsibilityUnitService.java
+++ b/screen-api/src/main/java/com/moral/api/service/ResponsibilityUnitService.java
@@ -20,7 +20,7 @@
* @param code
* @return
*/
- ResponsibilityUnit selectAreaUnit(Integer code);
+ List<ResponsibilityUnit> selectAreaUnit(Integer code);
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 66a37f5..6b9e2aa 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
@@ -55,6 +55,7 @@
import com.moral.api.pojo.vo.file.FileVo;
import com.moral.api.service.AllocationService;
import com.moral.api.service.FileTableService;
+import com.moral.api.service.ResponsibilityUnitService;
import com.moral.api.service.SysAreaService;
import com.moral.api.service.SysDictDataService;
import com.moral.constant.Constants;
@@ -85,6 +86,8 @@
private FileTableService fileTableService;
@Autowired
private AllocationExtensionService allocationExtensionService;
+ @Autowired
+ private ResponsibilityUnitService responsibilityUnitService;
/**
* ������������������������������������
@@ -298,30 +301,41 @@
public Map<String, Object> selectUnitView(Map<String, Object> map) {
QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
//������������������
-// Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
-// Object unitId = userInfo.get("unitId");
+ Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ 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;
+ }
- Integer unitId= 17;
- if (!ObjectUtils.isEmpty(unitId)){
- ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(unitId);
- Integer areaCode = responsibilityUnit1.getAreaCode();
- if (areaCode<999999){
- QueryWrapper<ResponsibilityUnit> wrapper1 = new QueryWrapper<>();
- wrapper1.eq("parent_code",areaCode);
- List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper1);
+ if (!ObjectUtils.isEmpty(map.get("unitId"))){
+ wrapper.in("unit_id",map.get("unitId").toString());
+ }else {
+ if (orgId!=24){
+ ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
+ Integer areaCode = responsibilityUnit1.getAreaCode();
+ List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
if (ObjectUtils.isEmpty(responsibilityUnits)){
- return null;
+ List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
+ Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+ List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+ wrapper.in("unit_id",collect1);
+ }else {
+ Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+ List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+ wrapper.in("unit_id",collect1);
}
- Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
- List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
- wrapper.in("unit_id",collect1);
- }else {
- wrapper.eq("unit_id",unitId);
}
}
HashMap<String, Object> rsMap = new HashMap<>();
- HashMap<String, Object> polluteMap = 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");
@@ -333,7 +347,7 @@
}
if (!ObjectUtils.isEmpty(number1)){
- String s = number1.toString();
+ String s = "-"+number1;
//���������������
endTime = DateUtils.getCurDateTime();
if (s.equals("-1")){
@@ -373,6 +387,21 @@
unComplete++;
}
}
+ //������������������������
+ Map<Integer, List<Allocation>> escalationTypeMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getEscalationType()));
+ Set<Integer> escalationTypes = escalationTypeMap.keySet();
+ for (Integer escalationType : escalationTypes) {
+ List<Allocation> allocations1 = escalationTypeMap.get(escalationType);
+ String value = AllocationEscalationTypeEnum.SELF.value.toString();
+ HashMap<String, Object> typeMap = new HashMap<>();
+ if (value.equals(escalationType+"")){
+ typeMap.put("name",AllocationEscalationTypeEnum.SELF.name);
+ }else {
+ typeMap.put("name",AllocationEscalationTypeEnum.CHECK.name);
+ }
+ typeMap.put("value",allocations1.size());
+ escalationTypeList.add(typeMap);
+ }
//������������������������
Map<Integer, List<Allocation>> polluteTypeMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getPolluteType()));
Set<Integer> polluteTypes = polluteTypeMap.keySet();
@@ -386,7 +415,8 @@
SysDictData sysDictData = sysDictDataMapper.selectOne(sysDictDataQueryWrapper);
typeMap.put("name",sysDictData.getDataValue());
typeMap.put("value",allocations1.size());
- polluteMap.put("polluteType",typeMap);
+// polluteMap.put("polluteType",typeMap);
+ polluteArrayList.add(typeMap);
}
//������������������������
Map<Integer, List<Allocation>> unitMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
@@ -407,14 +437,17 @@
int deduction=0;
int number=0;
for (Allocation allocation : allocations1) {
-
- Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay());
- Date date = new Date();
String state = allocation.getState()+"";
- boolean timeBefor = DateUtils.isTimeBefor(date, dateOfDay);
- if (timeBefor && !state.equals("40") && !state.equals("50")){
- //������������
- overdue++;
+ Integer changeType = allocation.getChangeType();
+ String value = ChangeEnum.DEADLINE.value.toString();
+ if (value.equals(changeType+"")){
+ 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")){
+ //������������
+ overdue++;
+ }
}
if (state.equals("40")||state.equals("50")){
if (allocation.getCheckScore()>0){
@@ -438,11 +471,18 @@
allocationUnitViewDtos.add(allocationUnitViewDto);
}
rsMap.put("unitView",allocationUnitViewDtos);
+ //������
rsMap.put("total",allocations.size());
+ //���������
rsMap.put("complete",complete);
+ //������������
rsMap.put("unComplete",unComplete);
+ //������
rsMap.put("overdue",overdue);
- rsMap.put("polluteType",polluteMap);
+ //������������
+ rsMap.put("polluteType",polluteArrayList);
+ //������������
+ rsMap.put("escalationType",escalationTypeList);
return rsMap;
}
@@ -454,7 +494,115 @@
*/
@Override
public List<Map<String, Object>> unitExel(Map<String, Object> map) {
- return null;
+ QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
+ //������������������
+ Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ Object unitId = userInfo.get("unitId");
+ Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
+
+ if (ObjectUtils.isEmpty(unitId)){
+ return null;
+ }
+ if (orgId!=24){
+ ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
+ Integer areaCode = responsibilityUnit1.getAreaCode();
+ List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
+ if (ObjectUtils.isEmpty(responsibilityUnits)){
+ List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
+ Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+ List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+ wrapper.in("unit_id",collect1);
+ }else {
+ Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+ List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+ wrapper.in("unit_id",collect1);
+ }
+ }
+
+ ArrayList<Map<String, Object>> rsMap = new ArrayList<>();
+ Object number1 = map.get("number");
+ String startTime=null;
+ String endTime=null;
+ if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("startTime"))){
+ startTime = map.get("startTime").toString();
+ endTime = map.get("endTime").toString();
+
+ }
+ 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);
+ }
+
+ }
+ wrapper.between("escalation_time",startTime,endTime);
+ wrapper.eq("is_del",0);
+ wrapper.eq("is_invalid",0);
+ List<Allocation> allocations = allocationMapper.selectList(wrapper);
+ if (ObjectUtils.isEmpty(allocations)){
+ return null;
+ }
+ //������������������������
+ Map<Integer, List<Allocation>> unitMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+ Set<Integer> unitList = unitMap.keySet();
+ for (Integer integer : unitList) {
+// HashMap<String, Object> map1 = new HashMap<>();
+ 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;
+ //������
+ int deduction=0;
+ int number=0;
+ for (Allocation allocation : allocations1) {
+ String state = allocation.getState()+"";
+ if (state.equals("40")||state.equals("50")){
+ if (allocation.getCheckScore()>0){
+ marks = marks + allocation.getCheckScore();
+ }else {
+ deduction = deduction + allocation.getCheckScore();
+ }
+ number++;
+ }
+ }
+ int total = allocations1.size();
+ String rate = (number * 100 /total)+"%";
+
+ map1.put("������������",areaByCode.getAreaName());
+ map1.put("���������",total);
+ map1.put("���������",number);
+ map1.put("������������",total-number);
+ map1.put("���������",rate);
+ map1.put("������",deduction);
+ map1.put("������",marks);
+ map1.put("���������",marks+deduction);
+ rsMap.add(map1);
+ }
+ return rsMap;
}
@Override
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
index c631c98..f03423f 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
@@ -41,13 +41,13 @@
* @return
*/
@Override
- public ResponsibilityUnit selectAreaUnit(Integer code) {
+ public List<ResponsibilityUnit> selectAreaUnit(Integer code) {
QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>();
wrapper.eq("area_code",code);
wrapper.eq("is_del",0);
wrapper.eq("state",0);
wrapper.eq("is_invalid",0);
- ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectOne(wrapper);
- return responsibilityUnit;
+ List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
+ return responsibilityUnits;
}
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 569562c..9f09510 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -80,8 +80,6 @@
@Autowired
private OperationLogUtils operationLogUtils;
- @Autowired
- private ResponsibilityUnitService responsibilityUnitService;
@Value("${AES.KEY}")
private String AESKey;
@@ -288,8 +286,6 @@
result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
return result;
}
- ResponsibilityUnit responsibilityUnit = responsibilityUnitService.selectAreaUnit(user.getUnitCode());
- user.setUnitId(responsibilityUnit.getUnitId());
//������������
user.setPassword(MD5Utils.saltMD5(password));
Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
@@ -409,8 +405,6 @@
String deleteToken = TokenUtils.hget(userId).toString();
TokenUtils.destoryToken(userId, deleteToken);
}
- ResponsibilityUnit responsibilityUnit = responsibilityUnitService.selectAreaUnit(user.getUnitCode());
- user.setUnitId(responsibilityUnit.getUnitId());
userMapper.updateById(user);
//������
--
Gitblit v1.8.0