大屏数据计算方式更改

mailbox-lan/src/main/java/com/biutag/lan/controller/datascreen/DataScreenController.java

@@ -39,8 +39,6 @@ public class DataScreenController {
             String deptId= params.get("id").toString();
             return AjaxResult.success(dataScreenService.mapCountyData(deptId));
         }
-
-
     }
 
     @NotLogin

mailbox-lan/src/main/java/com/biutag/lan/service/DataScreenService.java

@@ -8,23 +8,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.biutag.entity.system.Duty;
 import com.biutag.enums.DeptTypeEnum;
 import com.biutag.lan.domain.Mail;
-import com.biutag.lan.domain.MailFlow;
+import com.biutag.lan.domain.MailMark;
 import com.biutag.lan.domain.vo.MailDetail;
 import com.biutag.lan.flow.FlowNodeEnum;
 import com.biutag.lan.mapper.DataScreenMapper;
-import com.biutag.lan.mapper.MailMapper;
-import com.biutag.lan.mapper.MailSourceMapper;
 import com.biutag.util.DateUtils;
 import com.biutag.util.StringUtils;
 import com.biutag.util.TimeUtils;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
@@ -33,10 +25,10 @@ import java.util.concurrent.atomic.AtomicReference;
 @Service
 public class DataScreenService extends ServiceImpl<DataScreenMapper, Mail> {
 
-    private final MailMapper mailMapper;
-
     private final MailFlowService mailFlowService;
 
+    private final MailMarkService mailMarkService;
+
     public List<Map<String, Object>> mapData(String deptId) {
         return baseMapper.mapData(deptId);
     }
@@ -123,9 +115,7 @@ public class DataScreenService extends ServiceImpl<DataScreenMapper, Mail> {
             Map<String, Object> mapCompleted = baseMapper.getAllCompletedRate(null);//获取长沙市局 办结率
             Map<String, Object> mapResolved = baseMapper.getAllResolvedRate(null);//获取长沙市局 解决率
             Map<String, Object> mapSatisfied = baseMapper.getAllSatisfiedRate(null);//获取长沙市局 满意率
-//            Integer allSum = baseMapper.getAllMailCount(null);
-            Long allSum = mailMapper.selectCount(new LambdaQueryWrapper<Mail>().ne(Mail::getMailFirstCategory, "无效类").ne(Mail::getMailFirstCategory, "终止类")
-                    .ne(Mail::getMailFirstCategory, "感谢信类"));
+            Long allSum = mailMarkService.count();
 
             Integer toDayCount = baseMapper.getTodayMailCount(null);
             mapCompleted.putAll(mapResolved);
@@ -138,9 +128,7 @@ public class DataScreenService extends ServiceImpl<DataScreenMapper, Mail> {
             Map<String, Object> mapCompleted = baseMapper.getAllCompletedRate(deptId);//获取长沙市局 办结率
             Map<String, Object> mapResolved = baseMapper.getAllResolvedRate(deptId);//获取长沙市局 解决率
             Map<String, Object> mapSatisfied = baseMapper.getAllSatisfiedRate(deptId);//获取长沙市局 满意率
-//            Integer allSum = baseMapper.getAllMailCount(deptId);
-            Long allSum = mailMapper.selectCount(new LambdaQueryWrapper<Mail>().ne(Mail::getMailFirstCategory, "无效类").ne(Mail::getMailFirstCategory, "终止类")
-                    .ne(Mail::getMailFirstCategory, "感谢信类"));
+            Long allSum = mailMarkService.count(new LambdaQueryWrapper<MailMark>().eq(MailMark::getSecondDeptId, deptId));
 
             Integer toDayCount = baseMapper.getTodayMailCount(deptId);
             mapCompleted.putAll(mapResolved);
@@ -255,7 +243,7 @@ public class DataScreenService extends ServiceImpl<DataScreenMapper, Mail> {
             map.put("dutyZdList", dutyZdList);
             map.put("dutyBwList", dutyBwList);
         } else {
-            String deptId = StringUtils.isNull(params.get("id")) ? null : params.get("id").toString();
+            String deptId = StringUtils.isNull(params.get("id")) ? null : params.get("id");
             List<Duty> dutySjList = baseMapper.getToDayDuty(DeptTypeEnum.SJ_TYPE.getType(), null);
             List<Duty> dutyFjList = baseMapper.getToDayDuty(DeptTypeEnum.FJ_TYPE.getType(), deptId);
             List<Duty> dutyPcsList = baseMapper.getToDayDuty(DeptTypeEnum.PCS_TYPE.getType(), deptId);