最新版本541200007

doum

6 天以前 46124fe454f90d24171ebc5be0d9cfe2ab22cbc5

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkLineServiceImpl.java

@@ -34,6 +34,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;

/**
 * 交控-线路信息表Service实现
@@ -146,10 +147,32 @@

    @Override
    public List<JkLine> findList(JkLine jkLine) {

        MPJLambdaWrapper<JkLine> queryWrapper = new MPJLambdaWrapper<>();
        jkLine.setIsdeleted(Constants.ZERO);
        QueryWrapper<JkLine> wrapper = new QueryWrapper<>(jkLine);
        wrapper.lambda().orderByAsc(JkLine::getCode);
        return jkLineMapper.selectList(wrapper);
        queryWrapper.selectAll(JkLine.class )
                .selectAs(Member::getName,JkLine::getMemberName)
                .selectAs(Cars::getCode,JkLine::getCarCode)
                .leftJoin(Cars.class,Cars::getId,JkLine::getCarId )
                .leftJoin(Member.class,Member::getId,Cars::getMemberId );
        jkLine.setIsdeleted(Constants.ZERO);
        if (jkLine.getIsdeleted() != null) {
            queryWrapper.eq(JkLine::getIsdeleted, jkLine.getIsdeleted());
        }
        if (jkLine.getCategoryId() != null) {
            queryWrapper.eq(JkLine::getCategoryId, jkLine.getCategoryId());
        }
        if (jkLine.getCarId() != null) {
            queryWrapper.eq(JkLine::getCarId, jkLine.getCarId());
        }
        if (jkLine.getStatus() != null) {
            queryWrapper.eq(JkLine::getStatus, jkLine.getStatus());
        }
        if (jkLine.getSortnum() != null) {
            queryWrapper.eq(JkLine::getSortnum, jkLine.getSortnum());
        }
        queryWrapper.orderByAsc(JkLine::getCode);
        return jkLineMapper.selectJoinList(JkLine.class,queryWrapper);
    }
  
    @Override
@@ -230,7 +253,7 @@
        if(importing!=null && importing){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，已存在导入任务正在执行中，请稍后再试！");
        }
        redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_JKLINE,true);
        redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_JKLINE,true,30, TimeUnit.MINUTES);
        try {
            ExcelImporter ie = null;
            List<JkLineImport> dataList =null;