diff --git a/mailbox-lan/src/main/java/com/biutag/lan/controller/datascreen/DataScreenController.java b/mailbox-lan/src/main/java/com/biutag/lan/controller/datascreen/DataScreenController.java index f0a8d97..83f2a14 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/controller/datascreen/DataScreenController.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/controller/datascreen/DataScreenController.java @@ -8,6 +8,7 @@ import com.biutag.lan.domain.vo.MailDetail; import com.biutag.lan.service.DataScreenService; import com.biutag.lan.service.IDutyService; import com.biutag.lan.service.MailService; +import com.biutag.lan.service.MailSourceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jakarta.annotation.Resource; @@ -23,6 +24,7 @@ import java.util.*; public class DataScreenController { @Resource DataScreenService dataScreenService; + @Resource IDutyService iDutyService; @Resource diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/DataScreenService.java b/mailbox-lan/src/main/java/com/biutag/lan/service/DataScreenService.java index ea5c97e..9417a41 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/service/DataScreenService.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/service/DataScreenService.java @@ -12,6 +12,8 @@ import com.biutag.lan.domain.MailFlow; 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; @@ -30,7 +32,7 @@ import java.util.concurrent.atomic.AtomicReference; @Service public class DataScreenService extends ServiceImpl { - + private final MailMapper mailMapper; private final MailFlowService mailFlowService; public List> mapData(String deptId){ @@ -113,7 +115,9 @@ public class DataScreenService extends ServiceImpl { Map mapCompleted = baseMapper.getAllCompletedRate(null);//获取长沙市局 办结率 Map mapResolved = baseMapper.getAllResolvedRate(null);//获取长沙市局 解决率 Map mapSatisfied = baseMapper.getAllSatisfiedRate(null);//获取长沙市局 满意率 - Integer allSum = baseMapper.getAllMailCount(null); +// Integer allSum = baseMapper.getAllMailCount(null); + Long allSum = mailMapper.selectCount(null); + Integer toDayCount = baseMapper.getTodayMailCount(null); mapCompleted.putAll(mapResolved); mapCompleted.putAll(mapSatisfied); @@ -125,7 +129,8 @@ public class DataScreenService extends ServiceImpl { Map mapCompleted = baseMapper.getAllCompletedRate(deptId);//获取长沙市局 办结率 Map mapResolved = baseMapper.getAllResolvedRate(deptId);//获取长沙市局 解决率 Map mapSatisfied = baseMapper.getAllSatisfiedRate(deptId);//获取长沙市局 满意率 - Integer allSum = baseMapper.getAllMailCount(deptId); +// Integer allSum = baseMapper.getAllMailCount(deptId); + Long allSum = mailMapper.selectCount(new LambdaQueryWrapper().eq(Mail::getSecondDeptId,deptId)); Integer toDayCount = baseMapper.getTodayMailCount(deptId); mapCompleted.putAll(mapResolved); mapCompleted.putAll(mapSatisfied);