1、流程bug修复

liyj

2024-09-11 b6fa58652c12f0c61409cc44dfd8ad78f821b6c6

 dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java

@@ -1,16 +1,16 @@
package cn.huge.module.sy.controller.client;

import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.module.sy.consts.TimeUnitConsts;
import cn.huge.module.sy.domain.po.SyTimeLimit;
import cn.huge.module.sy.service.SyTimeLimitService;
import cn.huge.module.sys.dto.SyTimeLimitDTO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -226,25 +226,11 @@
            QueryWrapper<SyTimeLimit> syTimeLimitQueryWrapper = new QueryWrapper<>();
            syTimeLimitQueryWrapper.eq("limit_type", limitType);
            SyTimeLimit syTimeLimit = service.getOne(syTimeLimitQueryWrapper);
            Date expireTime = null;
            if (ObjectUtils.isNotEmpty(syTimeLimit)){
                if (TimeUnitConsts.TIME_UNIT_1.equals(syTimeLimit.getTermUnit())){
                    expireTime = DateUtils.addYear(computeTime, syTimeLimit.getTimeTerm());
                }
                if (TimeUnitConsts.TIME_UNIT_2.equals(syTimeLimit.getTermUnit())){
                    expireTime = DateUtils.addMonth(computeTime, syTimeLimit.getTimeTerm());
                }
                if (TimeUnitConsts.TIME_UNIT_3.equals(syTimeLimit.getTermUnit())){
                    expireTime = DateUtils.addDay(computeTime, syTimeLimit.getTimeTerm());
                }
                if (TimeUnitConsts.TIME_UNIT_4.equals(syTimeLimit.getTermUnit())){
                    expireTime = DateUtils.addHour(computeTime, syTimeLimit.getTimeTerm());
                }
                if (TimeUnitConsts.TIME_UNIT_5.equals(syTimeLimit.getTermUnit())){
                    expireTime = DateUtils.addMonth(computeTime, syTimeLimit.getTimeTerm());
                }
            SyTimeLimitDTO syTimeLimitDTO = new SyTimeLimitDTO();
            if (ObjectUtils.isNotEmpty(syTimeLimit)) {
                BeanUtils.copyProperties(syTimeLimit, syTimeLimitDTO);
            }
            return ReturnSucUtils.getRepInfo(expireTime);
            return ReturnSucUtils.getRepInfo(syTimeLimitDTO);
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }