访客系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
rk
2 天以前 4a8ff39b0fab0627ef8f7459587d514cc01c3676 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java


@@ -179,6 +179,7 @@


                .selectAs(JkLine::getMaxCustomer,JkSketchLine::getMaxCustomer)


                .leftJoin(JkLine.class,JkLine::getId,JkOrders::getLineId )


                .eq(JkSketchLine::getSketchId,jkSketch.getId())


                .eq(JkSketchLine::getType, Constants.formatIntegerNum(model.getOptStatus()))


                .eq(JkSketchLine::getIsdeleted,Constants.ZERO));


        if(lineList ==null ||lineList.size() ==0){


            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前线路不满足优化方案调整条件！");


@@ -239,7 +240,6 @@


        }


        checkJketchCustomerLocation(model,true);


        model.setEditDate(new Date());


        model.setEditor(jkSketch.getLoginUserInfo().getId());


        model.setDistance(model.getOriginDistance());


        jkSketchMapper.updateById(model);


        return model;


@@ -442,6 +442,11 @@


        c.setCustomerList(customerList);


        return  c;


    }




    /**


     * 开始异步执行线路优化任务


     * @param model


     */


    @Override


    @Async


    public void startUpdateLineAsync(JkSketch model) {


@@ -493,6 +498,11 @@


    }


    @Override


    @Async


    public  void startInitOriginDistanceBatch( JkSketch  model) {


                initOriginDistance(model);


    }


    @Override


    @Async


    public  void startEditSketchLineAsync(JkSketch model) {


        boolean success = true;


        int totalDistance = 0;


@@ -508,6 +518,7 @@


                    .selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)


                    .selectAs(JkCustomer::getEndDistance,JkSketchCustomer::getEndDistance)


                    .leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )


                    .eq(JkSketchCustomer::getType, Constants.equalsInteger(model.getOptStatus(),Constants.ONE)?1:0)


                    .eq(JkSketchCustomer::getSketchId, model.getId())


                    .eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)


                    .orderByAsc(JkSketchCustomer::getSortnum);


@@ -754,6 +765,7 @@


                tModel.setTotalNum(new BigDecimal(0));


                tModel.setOrderNum(routes.size()-2);


                tModel.setDateInfo(model.getDateInfo());


                tModel.setType(Constants.ONE);


                tModel.setSortnum(sketchLineList.size()+1);


                tModel.setEditDate(tModel.getCreateDate());


                tModel.setEditor(tModel.getCreator());


@@ -772,6 +784,7 @@


                    cModel.setCreator(tModel.getCreator());


                    cModel.setOrderId(customer.getOrderId());


                    cModel.setCreateDate(tModel.getCreateDate());


                    cModel.setType(Constants.ONE);


                    cModel.setTotalNum(customer.getTotalNum());


                    cModel.setDateInfo(model.getDateInfo());


                    cModel.setSortnum(tModel.getCustomerList().size()+1);


@@ -789,10 +802,12 @@


            jkSketchLineMapper.update(null,new UpdateWrapper<JkSketchLine>().lambda()


                    .set(JkSketchLine::getIsdeleted,Constants.ONE)


                    .eq(JkSketchLine::getIsdeleted,Constants.ZERO)


                    .eq(JkSketchLine::getType,Constants.ONE)


                    .eq(JkSketchLine::getDateInfo,model.getDateInfo()));


            jkSketchCustomerMapper.update(null,new UpdateWrapper<JkSketchCustomer>().lambda()


                    .set(JkSketchCustomer::getIsdeleted,Constants.ONE)


                    .eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)


                    .eq(JkSketchCustomer::getType,Constants.ONE)


                    .eq(JkSketchCustomer::getDateInfo,model.getDateInfo()));


            if(sketchLineList.size()>0){


                jkSketchLineMapper.insert(sketchLineList);


@@ -812,6 +827,7 @@


                    .eq(JkSketch::getId,model.getId() )


                    .eq(JkSketch::getJobId,model.getJobId() )


                    .set(JkSketch::getLineNum,sketchLineList.size() )


                    .set(JkSketch::getOptStatus,Constants.ONE)//已生成优化线路


                    .set(JkSketch::getDistance,totalDistance)


                    .set(JkSketch::getPlanLineInfo,"最近一次线路优化成功，优化后总距离："+(totalDistance/1000)+"公里！")


                    .set(JkSketch::getStatus,Constants.TWO)


@@ -838,6 +854,7 @@


                .selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)


                .selectAs(JkCustomer::getEndDistance,JkSketchCustomer::getEndDistance)


                .leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )


                .eq(JkSketchCustomer::getType, Constants.formatIntegerNum(model.getOptStatus()))


                .eq(JkSketchCustomer::getSketchId, model.getId())


                .eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)


                .orderByAsc(JkSketchCustomer::getSortnum);


@@ -866,6 +883,7 @@


        queryWrapper1.selectAll(JkSketchLine.class )


                .eq(JkSketchLine::getSketchId, model.getId())


                .eq(JkSketchLine::getIsdeleted,Constants.ZERO)


                .eq(JkSketchLine::getType, Constants.formatIntegerNum(model.getOptStatus()))


                .orderByAsc(JkSketchLine::getSortnum);


        List<JkSketchLine> lineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper1);


        initCustomerDistance(lineList,model,updateLineDistance);


@@ -1079,6 +1097,7 @@


                tModel.setTotalNum(orders.getNum());


                tModel.setDateInfo(orders.getDateInfo());


                tModel.setSortnum(list.size()+1);


                tModel.setType(Constants.ZERO);


                tModel.setEditDate(tModel.getCreateDate());


                tModel.setEditor(tModel.getCreator());


                tModel.setIsdeleted(Constants.ZERO);


@@ -1101,6 +1120,7 @@


            initOrderAndTotalNum(tModel,line.getId(),newOrderList);


            tModel.setDateInfo(newList.get(0).getDateInfo());


            tModel.setSortnum(list.size()+1);


            tModel.setType(Constants.ZERO);


            tModel.setEditDate(tModel.getCreateDate());


            tModel.setEditor(tModel.getCreator());


            tModel.setIsdeleted(Constants.ZERO);


@@ -1156,6 +1176,7 @@


                tModel.setCreateDate(orders.getCreateDate());


                tModel.setCategoryId(orders.getCategoryId());


                tModel.setTotalNum(orders.getNum());


                tModel.setOptStatus(Constants.ZERO);


                tModel.setOrderNum(1);


                tModel.setDateInfo(orders.getDateInfo());


                tModel.setSortnum(list.size()+1);