From 7fdc6aba000c90adcb1e70d170252f016a4f9694 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 26 Sep 2023 15:44:11 +0800
Subject: [PATCH] chore:责任交办单提交
---
screen-api/src/main/java/com/moral/api/service/ResponsibilityUnitService.java | 27 +++
screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java | 53 +++++++
screen-api/src/main/java/com/moral/api/pojo/dto/allocation/AllocationUnitViewDto.java | 46 ++++++
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 11 +
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 5
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 78 +++++++++++
screen-api/src/main/java/com/moral/api/entity/User.java | 7 +
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 182 ++++++++++++++++++++++++++
screen-api/src/main/java/com/moral/api/entity/ResponsibilityUnit.java | 3
9 files changed, 412 insertions(+), 0 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 7fc6b52..97e6100 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
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
import org.aspectj.apache.bcel.generic.RET;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -14,14 +15,24 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import com.moral.api.entity.Allocation;
import com.moral.api.entity.ResponsibilityUnit;
+import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;
import com.moral.api.service.AllocationService;
+import com.moral.api.utils.EasyExcelUtils;
+import com.moral.api.utils.NoModelWriteData;
import com.moral.constant.Constants;
import com.moral.constant.ResultMessage;
+import com.moral.util.WebUtils;
@Api(tags = {"������������"})
@@ -99,4 +110,71 @@
return ResultMessage.ok();
}
+
+ /**
+ * ������������������
+ * @return
+ */
+ @GetMapping("selectUnitView")
+ public ResultMessage selectUnitView(HttpServletRequest request){
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ Map<String, Object> map1 = allocationService.selectUnitView(params);
+ return ResultMessage.ok(map1);
+ }
+
+
+ @GetMapping("unitExel")
+ 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);
+ }
+ if (CollectionUtils.isEmpty(mapArrayList)) {
+ return;
+ }
+ Map<String, Object> map = mapArrayList.get(0);
+ List<String> list = new ArrayList<>();
+ for (String key : map.keySet()) {
+ list.add(key);
+ }
+ String[] s2 = new String[list.size()];
+ list.toArray(s2);
+ NoModelWriteData d = new NoModelWriteData();
+ d.setFileName("������������");
+ d.setHeadMap(s2);
+ d.setDataStrMap(s2);
+ d.setDataList(mapArrayList);
+ try {
+ EasyExcelUtils easyExcelUtils = new EasyExcelUtils();
+ easyExcelUtils.noModleWrite(d, response);
+ } catch (Exception e) {
+ int i = 0;
+ }
+ }
+
+ /**
+ ������������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/entity/ResponsibilityUnit.java b/screen-api/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
index d733fbd..561bb84 100644
--- a/screen-api/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
+++ b/screen-api/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
@@ -6,7 +6,9 @@
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -15,6 +17,7 @@
public class ResponsibilityUnit extends Model<ResponsibilityUnit> {
//������������id
+ @TableId(value = "unit_id", type = IdType.AUTO)
private Integer unitId;
private String unitName;
diff --git a/screen-api/src/main/java/com/moral/api/entity/User.java b/screen-api/src/main/java/com/moral/api/entity/User.java
index 1ee5ef9..0ae2a49 100644
--- a/screen-api/src/main/java/com/moral/api/entity/User.java
+++ b/screen-api/src/main/java/com/moral/api/entity/User.java
@@ -1,6 +1,7 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -76,6 +77,9 @@
*/
private String wechat;
+
+ private Integer unitId;
+
/**
* ������������
*/
@@ -100,5 +104,8 @@
*/
private String isDelete;
+ @TableField(exist = false)
+ private Integer unitCode;
+
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/allocation/AllocationUnitViewDto.java b/screen-api/src/main/java/com/moral/api/pojo/dto/allocation/AllocationUnitViewDto.java
new file mode 100644
index 0000000..74b5cb1
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/allocation/AllocationUnitViewDto.java
@@ -0,0 +1,46 @@
+package com.moral.api.pojo.dto.allocation;
+
+
+import lombok.Data;
+
+@Data
+public class AllocationUnitViewDto {
+
+
+
+ private String unitName;
+
+ /**
+ * ������
+ */
+ private Integer total;
+
+ /**
+ * ���������
+ */
+ private Integer number;
+ /**
+ *������������
+ */
+ private Integer unNumber;
+
+ /**
+ * ���������
+ */
+ private String rate;
+
+
+ /**
+ * ������
+ */
+ private Integer deduction;
+
+ /**
+ * ������
+ */
+ private Integer marks;
+ /**
+ * ������
+ */
+ private Integer totalPoints;
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/AllocationService.java b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
index 934a467..9baf339 100644
--- a/screen-api/src/main/java/com/moral/api/service/AllocationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
@@ -24,4 +24,9 @@
List<Allocation> selectAll(Map<String,Object> map);
+
+ Map<String, Object> selectUnitView(Map<String,Object> map);
+
+ List<Map<String,Object>> unitExel(Map<String,Object> 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
new file mode 100644
index 0000000..9c525f4
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/ResponsibilityUnitService.java
@@ -0,0 +1,27 @@
+package com.moral.api.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.entity.ResponsibilityUnit;
+
+public interface ResponsibilityUnitService extends IService<ResponsibilityUnit> {
+
+ /**
+ * ������������������������������������
+ * @param code
+ * @return
+ */
+ List<ResponsibilityUnit> selectUnit(Integer code);
+
+ /**
+ * ������������������������������������������
+ * @param code
+ * @return
+ */
+ ResponsibilityUnit selectAreaUnit(Integer code);
+
+
+
+}
\ No newline at end of file
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 33f7f1e..c96615c 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
@@ -10,8 +10,12 @@
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +23,7 @@
import com.moral.api.entity.Allocation;
import com.moral.api.entity.ApproveTable;
import com.moral.api.entity.ResponsibilityUnit;
+import com.moral.api.entity.SysArea;
import com.moral.api.entity.SysDictData;
import com.moral.api.entity.SysDictType;
import com.moral.api.mapper.AllocationMapper;
@@ -28,9 +33,13 @@
import com.moral.api.mapper.SysDictDataMapper;
import com.moral.api.mapper.SysDictTypeMapper;
import com.moral.api.pojo.dto.allocation.AllocationUnitDto;
+import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;
+import com.moral.api.pojo.enums.AllocationApproveEnum;
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.SysAreaService;
+import com.moral.api.service.SysDictDataService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@@ -53,6 +62,8 @@
private AllocationMapper allocationMapper;
@Autowired
private ApproveTableMapper approveTableMapper;
+ @Autowired
+ private SysAreaService sysAreaService;
/**
* ������������������������������������
@@ -252,4 +263,175 @@
}
return null;
}
+
+
+ /**
+ * ������������
+ * @param map
+ * @return
+ */
+ @Override
+ 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");
+
+ 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(responsibilityUnits)){
+ return null;
+ }
+ 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<>();
+ ArrayList<AllocationUnitViewDto> allocationUnitViewDtos = 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.toString();
+ //���������������
+ 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;
+ }
+ int complete=0;
+ int unComplete=0;
+ for (Allocation allocation : allocations) {
+ String state = allocation.getState();
+ if (state.equals("40")||state.equals("50")){
+ complete++;
+ }else if(state.equals("10")||state.equals("20") ||state.equals("30")) {
+ unComplete++;
+ }
+ }
+ //������������������������
+ 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<>();
+ sysDictDataQueryWrapper.eq("dict_type_id",31);
+ sysDictDataQueryWrapper.eq("dataKey",polluteType);
+ SysDictData sysDictData = sysDictDataMapper.selectOne(sysDictDataQueryWrapper);
+ typeMap.put("name",sysDictData.getDataValue());
+ typeMap.put("value",allocations1.size());
+ polluteMap.put("polluteType",typeMap);
+ }
+ //������������������������
+ Map<Integer, List<Allocation>> unitMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+ Set<Integer> unitList = unitMap.keySet();
+ //������������
+ int overdue=0;
+ 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);
+
+ //������
+ int marks=0;
+ //������
+ 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++;
+ }
+ 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();
+ allocationUnitViewDto.setDeduction(deduction);
+ allocationUnitViewDto.setMarks(marks);
+ allocationUnitViewDto.setTotal(total);
+ allocationUnitViewDto.setTotalPoints(marks+deduction);
+ allocationUnitViewDto.setNumber(number);
+ String rate = (number * 100 /total)+"%";
+ allocationUnitViewDto.setRate(rate);
+ allocationUnitViewDto.setUnNumber(total-number);
+ allocationUnitViewDto.setUnitName(areaByCode.getAreaName());
+ 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);
+ return rsMap;
+ }
+
+
+ /**
+ * ������
+ * @param map
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> unitExel(Map<String, Object> map) {
+ return null;
+ }
}
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
new file mode 100644
index 0000000..c631c98
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
@@ -0,0 +1,53 @@
+package com.moral.api.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.entity.ResponsibilityUnit;
+import com.moral.api.mapper.ResponsibilityUnitMapper;
+import com.moral.api.service.ResponsibilityUnitService;
+
+
+@Service
+public class ResponsibilityUnitServiceImpl extends ServiceImpl<ResponsibilityUnitMapper, ResponsibilityUnit> implements ResponsibilityUnitService {
+
+ @Autowired
+ private ResponsibilityUnitMapper responsibilityUnitMapper;
+ /**
+ * ������������������������������������
+ *
+ * @param code
+ * @return
+ */
+ @Override
+ public List<ResponsibilityUnit> selectUnit(Integer code) {
+ QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>();
+ wrapper.eq("parent_code",code);
+ wrapper.eq("is_del",0);
+ wrapper.eq("state",0);
+ wrapper.eq("is_invalid",0);
+ List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
+ return responsibilityUnits;
+ }
+
+ /**
+ * ������������������������������������������
+ *
+ * @param code
+ * @return
+ */
+ @Override
+ public 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;
+ }
+}
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 a47ccf5..569562c 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
@@ -30,14 +30,17 @@
import com.moral.api.entity.Group;
import com.moral.api.entity.Menu;
import com.moral.api.entity.Organization;
+import com.moral.api.entity.ResponsibilityUnit;
import com.moral.api.entity.User;
import com.moral.api.entity.UserGroup;
import com.moral.api.entity.UserLog;
import com.moral.api.mapper.MenuMapper;
+import com.moral.api.mapper.ResponsibilityUnitMapper;
import com.moral.api.mapper.UserGroupMapper;
import com.moral.api.mapper.UserLogMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.bo.UserBO;
+import com.moral.api.service.ResponsibilityUnitService;
import com.moral.api.service.UserService;
import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.Constants;
@@ -76,6 +79,9 @@
@Autowired
private OperationLogUtils operationLogUtils;
+
+ @Autowired
+ private ResponsibilityUnitService responsibilityUnitService;
@Value("${AES.KEY}")
private String AESKey;
@@ -125,6 +131,7 @@
userInfo.put("userName", userBo.getUserName());
userInfo.put("email", userBo.getEmail());
userInfo.put("mobile", userBo.getMobile());
+ userInfo.put("unitId",userBo.getUnitId());
userInfo.put("wechat", userBo.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));
userInfo.put("isAdmin", userBo.getIsAdmin());
@@ -281,6 +288,8 @@
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");
@@ -400,6 +409,8 @@
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