危化品简化版修改

“djh”

2025-07-29 48de12e1635b99d593048398af45d186c8f39234

 hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzStatisticServiceImpl.java

@@ -19,6 +19,7 @@
import com.gkhy.hazmat.common.utils.SecurityUtils;
import com.gkhy.hazmat.common.utils.StringUtils;
import com.gkhy.hazmat.system.domain.*;
import com.gkhy.hazmat.system.domain.dto.HazmatUseStatisticDTO;
import com.gkhy.hazmat.system.domain.vo.HzCompanyMessage;
import com.gkhy.hazmat.system.domain.vo.HzEntryRecordVO;
import com.gkhy.hazmat.system.domain.vo.HzHazmatUseVO;
@@ -196,31 +197,31 @@


    @Override
    public CommonPage useStatic(String startTime, String endTime,Long companyId) {
    public CommonPage useStatic(HazmatUseStatisticDTO useStatisticDTO) {
        SysUser currentUser= SecurityUtils.getLoginUser().getUser();
        checkUserAllowed(currentUser);

        String startDate="";
        String endDate="";
        if(StringUtils.isBlank(startTime)&&StringUtils.isBlank(endTime)){
        if(StringUtils.isBlank(useStatisticDTO.getStartTime())&&StringUtils.isBlank(useStatisticDTO.getEndTime())){
            Date currentDate=new Date();
            startDate= DateUtil.format(DateUtil.beginOfDay(DateUtil.offsetDay(DateUtil.endOfDay(currentDate), -6)), DatePattern.NORM_DATETIME_FORMAT);
            endDate=DateUtil.format(DateUtil.endOfDay(currentDate),DatePattern.NORM_DATETIME_FORMAT);
        } else if (StringUtils.isBlank(startTime)&&StringUtils.isNotBlank(endTime)) {
            startDate= DateUtil.format(DateUtil.beginOfDay(DateUtil.offsetDay(DateUtil.endOfDay(new Date(endTime)), -6)), DatePattern.NORM_DATETIME_FORMAT);
            endDate=endTime;
        }else if (StringUtils.isNotBlank(startTime)&&StringUtils.isBlank(endTime)){
            startDate=startTime;
            endDate=DateUtil.format(DateUtil.beginOfDay(DateUtil.offsetDay(DateUtil.endOfDay(new Date(endTime)), 6)), DatePattern.NORM_DATETIME_FORMAT);
        } else if (StringUtils.isBlank(useStatisticDTO.getStartTime())&&StringUtils.isNotBlank(useStatisticDTO.getEndTime())) {
            startDate= DateUtil.format(DateUtil.beginOfDay(DateUtil.offsetDay(DateUtil.endOfDay(new Date(useStatisticDTO.getEndTime())), -6)), DatePattern.NORM_DATETIME_FORMAT);
            endDate=useStatisticDTO.getEndTime();
        }else if (StringUtils.isNotBlank(useStatisticDTO.getStartTime())&&StringUtils.isBlank(useStatisticDTO.getEndTime())){
            startDate=useStatisticDTO.getStartTime();
            endDate=DateUtil.format(DateUtil.beginOfDay(DateUtil.offsetDay(DateUtil.endOfDay(new Date(useStatisticDTO.getEndTime())), 6)), DatePattern.NORM_DATETIME_FORMAT);
        }else{
            startDate=startTime;
            endDate=endTime;
            if(DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(startTime), DateUnit.DAY)>90){
            startDate=useStatisticDTO.getStartTime();
            endDate=useStatisticDTO.getEndTime();
            if(DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(useStatisticDTO.getStartTime()), DateUnit.DAY)>90){
                throw new ApiException("只能查询90天以内数据");
            }
        }
        if (currentUser.getUserType().equals(UserTypeEnum.CHECK_USER.getCode())){
            IdTableNameHandler.setCurrentId(companyId);
            IdTableNameHandler.setCurrentId(useStatisticDTO.getCompanyId());

        }else {
            //设置分表id
@@ -228,7 +229,10 @@
            IdTableNameHandler.setCurrentId(currentUser.getCompanyId());
        }
        PageUtils.startPage();
        List<HzHazmatUseVO> hazmatUseVOList= hazmatMapper.useCountStatic(startDate, endDate,currentUser.getUserType().equals(UserTypeEnum.CHECK_USER.getCode()) ? companyId:currentUser.getCompanyId());
        if (!currentUser.getUserType().equals(UserTypeEnum.CHECK_USER.getCode())){
            useStatisticDTO.setCompanyId(currentUser.getCompanyId());
        }
        List<HzHazmatUseVO> hazmatUseVOList= hazmatMapper.useCountStatic(useStatisticDTO);
        IdTableNameHandler.removeCurrentId();
        if(!hazmatUseVOList.isEmpty()) {
            List<Long> basicIds = hazmatUseVOList.stream().map(HzHazmatUseVO::getBasicId).collect(Collectors.toList());
@@ -273,7 +277,11 @@
            //设置分表id
            IdTableNameHandler.setCurrentId(currentUser.getCompanyId());
//            PageUtils.startPage();
            List<HzHazmatUseVO> hazmatUseVOList= hazmatMapper.useCountStatic(startDate, endDate,currentUser.getCompanyId());
            HazmatUseStatisticDTO hazmatUseStatisticDTO = new HazmatUseStatisticDTO();
            hazmatUseStatisticDTO.setStartTime(startDate);
            hazmatUseStatisticDTO.setEndTime(endDate);
            hazmatUseStatisticDTO.setCompanyId(currentUser.getCompanyId());
            List<HzHazmatUseVO> hazmatUseVOList= hazmatMapper.useCountStatic(hazmatUseStatisticDTO);
            IdTableNameHandler.removeCurrentId();
            List<HazmatBasicUseExcelData> hazmatBasicUseExcelDatas = new ArrayList<>();
            if(!hazmatUseVOList.isEmpty()) {