钥匙柜信息处理

rk

10 小时以前 661aa526a63dd2118438d63031518d4d8b3f7bcd

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

@@ -975,7 +975,7 @@
            queryWrapper.eq(JkSketch::getSortnum, pageWrap.getModel().getSortnum());
        }
        if (pageWrap.getModel().getDateInfo() != null) {
            queryWrapper.eq(JkSketch::getDateInfo,  pageWrap.getModel().getDateInfo());
            queryWrapper.like(JkSketch::getDateInfo,  DateUtil.dateToString(pageWrap.getModel().getDateInfo(),"yyyy-MM-dd"));
        }
        if (pageWrap.getModel().getJobId() != null) {
            queryWrapper.eq(JkSketch::getJobId, pageWrap.getModel().getJobId());
@@ -1322,8 +1322,9 @@
                .leftJoin(JkLine.class,JkLine::getId,JkSketchLine::getLineId)
                .leftJoin(Category.class,Category::getId,JkLine::getCategoryId )
                .leftJoin(Cars.class,Cars::getId,JkLine::getCarId)
                .eq(JkSketch::getIsdeleted,Constants.ZERO)
                .and(StringUtils.isNotBlank(telecomLineInfoDTO.getSearchInfo()),i->i.like(Cars::getCode,telecomLineInfoDTO.getSearchInfo()).or().like(JkLine::getName,telecomLineInfoDTO.getSearchInfo()))
                .eq(StringUtils.isNotBlank(telecomLineInfoDTO.getDateInfo()),JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo())
                .like(StringUtils.isNotBlank(telecomLineInfoDTO.getDateInfo()),JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo())
                .eq(Objects.nonNull(telecomLineInfoDTO.getCategoryId()),JkLine::getCategoryId, telecomLineInfoDTO.getCategoryId())
                .eq(Objects.nonNull(telecomLineInfoDTO.getLineId()),JkLine::getId, telecomLineInfoDTO.getLineId());

@@ -1367,10 +1368,11 @@
        telecomLineCountVO.setCustomerNum(Constants.ZERO);
        MPJLambdaWrapper<JkSketch> sketchMPJLambdaWrapper = new MPJLambdaWrapper<JkSketch>().selectAll(JkSketch.class )
                .selectAs(Category::getName,JkSketch::getCategoryName)
                .select(" ifnull((select count(1) from jk_sketch_customer jc where jc.ISDELETED= 0 and  jc.SKETCH_ID = t.id),0)" ,JkSketch::getCustomerNum)
                .select(" ifnull((select count(1) from jk_sketch_customer jc where jc.ISDELETED = 0 and  jc.SKETCH_ID = t.id),0)" ,JkSketch::getCustomerNum)
                .select(" ifnull((select count(1) from jk_sketch_line jc where   jc.TYPE = 0  and  jc.SKETCH_ID = t.id),0)" ,JkSketch::getBeforeLineNum)
                .leftJoin(Category.class,Category::getId,JkSketch::getCategoryId )
                .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
                .eq(JkSketch::getIsdeleted,Constants.ZERO)
                .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
        List<JkSketch> sketchList = jkSketchMapper.selectJoinList(JkSketch.class,sketchMPJLambdaWrapper);
        if(CollectionUtils.isEmpty(sketchList)){
            return telecomLineCountVO;
@@ -1396,10 +1398,10 @@
            TelecomCategoryDataVO telecomCategoryDataVO = new TelecomCategoryDataVO();
            telecomCategoryDataVO.setId(jkSketch.getCategoryId());
            telecomCategoryDataVO.setName(jkSketch.getCategoryName());
            telecomCategoryDataVO.setCustomerNum(jkSketch.getCustomerNum());
            telecomCategoryDataVO.setCustomerNum(Constants.ZERO);
            List<JkSketchLine> childLineList = jkSketchLineList.stream().filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())).collect(Collectors.toList());
            //优化前数据
            List<JkSketchLine> beforeList = childLineList.stream()
            List<JkSketchLine> beforeList = jkSketchLineList.stream()
                    .filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
            //优化后数据
            List<JkSketchLine> afterList = childLineList.stream()
@@ -1408,15 +1410,11 @@
            lineNum = lineNum + (Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)?beforeList.size():afterList.size());
            List<TelecomLineDataVO> telecomLineDataVOList = new ArrayList<>();
            for (JkSketchLine sketchLine: Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)?beforeList:afterList) {
//                JkSketchLine finalSketchLine = sketchLine;
//                List<JkSketchLine> afterSelectList = afterList.stream().filter(i->Constants.equalsInteger(i.getLineId(), finalSketchLine.getLineId())).collect(Collectors.toList());
//                if(afterSelectList.size()>Constants.ZERO){
//                    sketchLine = afterSelectList.get(Constants.ZERO);
//                }
                TelecomLineDataVO telecomLineDataVO = new TelecomLineDataVO();
                telecomLineDataVO.setId(sketchLine.getId());
                telecomLineDataVO.setName(sketchLine.getLineName());
                telecomLineDataVOList.add(telecomLineDataVO);
                telecomCategoryDataVO.setCustomerNum(telecomCategoryDataVO.getCustomerNum() +  sketchLine.getMaxCustomer());
                telecomLineCountVO.setCustomerNum(
                        telecomLineCountVO.getCustomerNum() + sketchLine.getMaxCustomer()
                );
@@ -1439,7 +1437,8 @@
        MPJLambdaWrapper<JkSketch> sketchMPJLambdaWrapper = new MPJLambdaWrapper<JkSketch>().selectAll(JkSketch.class )
                .selectAs(Category::getName,JkSketch::getCategoryName)
                .leftJoin(Category.class,Category::getId,JkSketch::getCategoryId )
                .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
                .eq(JkSketch::getIsdeleted,Constants.ZERO)
                .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
        List<JkSketch> sketchList = jkSketchMapper.selectJoinList(JkSketch.class,sketchMPJLambdaWrapper);
        if(CollectionUtils.isEmpty(sketchList)){
            return new ArrayList<TelecomCategoryDataVO>();
@@ -1503,7 +1502,7 @@
                .eq(Objects.nonNull(telecomLineInfoDTO.getCategoryId()),JkSketchLine::getCategoryId,telecomLineInfoDTO.getCategoryId())
                .eq(Objects.nonNull(telecomLineInfoDTO.getLineId()),JkSketchLine::getLineId,telecomLineInfoDTO.getLineId())
                .apply(" ( t.TYPE = t1.OPT_STATUS ) ")
                .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
                .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
        List<JkSketchLine> returnLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);

//        //优化前数据